#ONB-55 Keychain 기능, 온보딩 진행정도에 따른 화면전환, 약관동의 API 연결

Enums/OnboardingStage.swift

@@ -0,0 +1,15 @@
+//
+//  OnboardingStage.swift
+//  onboard-iOS
+//
+//  Created by 윤다예 on 12/2/23.
+//
+
+import Foundation
+
+enum OnboardingStage: String {
+    case terms = "TERMS"
+    case updateTerms = "UPDATE_TERMS"
+    case nickname = "NICKNAME"
+    case joinGroup = "JOIN_GROUP"
+}

onboard-iOS/Coordinator/Coordinator.swift

@@ -21,7 +21,9 @@ final class AppCoordinator: Coordinator {
     }
 
     func start() {
-        self.showLoginViewController()
+        DispatchQueue.main.async {
+            self.showLoginViewController()
+        }
     }
 
     private func showLoginViewController() {

onboard-iOS/Coordinator/GroupSearchCoordinator.swift

@@ -0,0 +1,31 @@
+//
+//  GroupSearchCoordinator.swift
+//  onboard-iOS
+//
+//  Created by 윤다예 on 12/2/23.
+//
+
+import UIKit
+
+final class GroupSearchCoordinator: Coordinator {
+
+    var childCoordinators: [Coordinator] = []
+
+    private var navigationController: UINavigationController?
+
+    init(navigationController: UINavigationController?) {
+        self.navigationController = navigationController
+    }
+
+    func start() {
+        DispatchQueue.main.async {
+            let repository = GroupRepositoryImpl()
+            let useCase = GroupSearchUseCaseImpl(groupRepository: repository)
+            let reactor = GroupSearchReactor(useCase: useCase)
+            let viewController = GroupSearchViewController(reactor: reactor)
+
+
+            self.navigationController?.pushViewController(viewController, animated: true)
+        }
+    }
+}

onboard-iOS/Coordinator/LoginCoordinator.swift

@@ -9,6 +9,8 @@ import UIKit
 
 protocol LoginCoordinatorNavigateDelegate: AnyObject {
     func showTermsAgreementView()
+    func showNicknameSetting()
+    func showGroupSearch()
 }
 
 final class LoginCoordinator: Coordinator {
@@ -22,26 +24,37 @@ final class LoginCoordinator: Coordinator {
     }
 
     func start() {
-        let appleLoginManager = AppleLoginManagerImpl()
-        let authRepository = AuthRepositoryImpl()
-        let appleLoginUseCase = AppleLoginUseCaseImpl(
-            appleLoginManager: appleLoginManager,
-            authRepository: authRepository
-        )
-
-        let kakaoLoginManager = KakaoLoginManagerImpl()
-        let kakaoLoginUseCase = KakaoLoginUseCaseImpl(
-            kakaoLoginManager: kakaoLoginManager,
-            authRepository: authRepository
-        )
-        let reactor = LoginReactor(
-            appleUseCase: appleLoginUseCase,
-            kakaoUseCase: kakaoLoginUseCase,
-            coordinator: self
-        )
-        let viewController = LoginViewController(reactor: reactor)
-
-        self.navigationController?.pushViewController(viewController, animated: true)
+        DispatchQueue.main.async {
+            let appleLoginManager = AppleLoginManagerImpl()
+            let authRepository = AuthRepositoryImpl()
+            let keychainService = KeychainServiceImpl()
+            let appleLoginUseCase = AppleLoginUseCaseImpl(
+                appleLoginManager: appleLoginManager,
+                authRepository: authRepository,
+                keychainService: keychainService
+            )
+
+            let kakaoLoginManager = KakaoLoginManagerImpl()
+            let kakaoLoginUseCase = KakaoLoginUseCaseImpl(
+                kakaoLoginManager: kakaoLoginManager,
+                authRepository: authRepository
+            )
+
+            let googleLoginUseCase = GoogleLoginUseCaseImpl(
+                authRepository: authRepository,
+                keychainService: keychainService
+            )
+
+            let reactor = LoginReactor(
+                appleUseCase: appleLoginUseCase,
+                kakaoUseCase: kakaoLoginUseCase,
+                googleUseCase: googleLoginUseCase,
+                coordinator: self
+            )
+            let viewController = LoginViewController(reactor: reactor)
+
+            self.navigationController?.pushViewController(viewController, animated: true)
+        }
     }
 }
 
@@ -53,4 +66,18 @@ extension LoginCoordinator: LoginCoordinatorNavigateDelegate {
         )
         coordinator.start()
     }
+
+    func showNicknameSetting() {
+        let coordinator = NicknameCoordinator(
+            navigationController: self.navigationController
+        )
+        coordinator.start()
+    }
+
+    func showGroupSearch() {
+        let coordinator = GroupSearchCoordinator(
+            navigationController: self.navigationController
+        )
+        coordinator.start()
+    }
 }

onboard-iOS/Coordinator/NicknameCoordinator.swift

@@ -7,6 +7,10 @@
 
 import UIKit
 
+protocol NicknameCoordinatorNavigateDelegate: AnyObject {
+    func showGroupSearch()
+}
+
 final class NicknameCoordinator: Coordinator {
 
     var childCoordinators: [Coordinator] = []
@@ -18,9 +22,21 @@ final class NicknameCoordinator: Coordinator {
     }
 
     func start() {
-        let reactor = NicknameReactor(coordinator: self)
-        let viewController = NicknameViewController(reactor: reactor)
+        DispatchQueue.main.async {
+            let reactor = NicknameReactor(coordinator: self)
+            let viewController = NicknameViewController(reactor: reactor)
+
+            self.navigationController?.pushViewController(viewController, animated: true)
+        }
+    }
+}
+
+extension NicknameCoordinator: NicknameCoordinatorNavigateDelegate {
+    func showGroupSearch() {
+        let coordinator = GroupSearchCoordinator(
+            navigationController: self.navigationController
+        )
 
-        self.navigationController?.pushViewController(viewController, animated: true)
+        coordinator.start()
     }
 }

onboard-iOS/Coordinator/TermsAgreementCoordinator.swift

@@ -22,16 +22,17 @@ final class TermsAgreementCoordinator: Coordinator {
     }
 
     func start() {
-        let repository = TermsAgreementRepositoryImpl()
-        let useCase = TermsAgreementUseCaseImpl(repository: repository)
-        let reactor = TermsAgreementReactor(coordinator: self, useCase: useCase)
-        let viewController = UINavigationController(
-            rootViewController: TermsAgreementViewController(reactor: reactor)
-        )
-        viewController.modalPresentationStyle = .overFullScreen
-
-        self.navigationController?.present(viewController, animated: false)
-        self.navigationController = viewController
+        DispatchQueue.main.async {
+            let repository = TermsAgreementRepositoryImpl()
+            let useCase = TermsAgreementUseCaseImpl(repository: repository)
+            let reactor = TermsAgreementReactor(coordinator: self, useCase: useCase)
+            let viewController = UINavigationController(
+                rootViewController: TermsAgreementViewController(reactor: reactor)
+            )
+            viewController.modalPresentationStyle = .overFullScreen
+            self.navigationController?.present(viewController, animated: false)
+            self.navigationController = viewController
+        }
     }
 
     func showTerms(url: String) {

onboard-iOS/DesignSystem/Values/BaseButton.swift

@@ -53,10 +53,14 @@ class BaseButton: UIButton {
             self.bgColor = Colors.Orange_10
             self.textColor = Colors.Gray_2
             self.typo = Font.Typography.label3_B
+            self.isEnabled = true
+
         case .disabled:
             self.bgColor = Colors.Gray_4
             self.textColor = Colors.Gray_7
             self.typo = Font.Typography.label3_M
+            self.isEnabled = false
+
         case .pressed:
             self.bgColor = Colors.Gray_15
             self.textColor = Colors.Gray_1

onboard-iOS/Domain/Entity/OnboardingEntity.swift

@@ -0,0 +1,13 @@
+//
+//  OnboardingEntity.swift
+//  onboard-iOS
+//
+//  Created by 윤다예 on 12/2/23.
+//
+
+import Foundation
+
+struct OnboardingEntity {
+    let stages: [String]
+    let groupId: Int?
+}

onboard-iOS/Domain/Entity/TermsAgreementEntity.swift → onboard-iOS/Domain/Entity/TermsEntity.swift

@@ -1,13 +1,13 @@
 //
-//  TermsAgreementEntity.swift
+//  TermsEntity.swift
 //  onboard-iOS
 //
 //  Created by 윤다예 on 11/28/23.
 //
 
 import Foundation
 
-struct TermsAgreementEntity {
+struct TermsEntity {
     let terms: [Term]
 
     struct Term {
@@ -17,3 +17,10 @@ struct TermsAgreementEntity {
         let isReuired: Bool
     }
 }
+
+enum TermsAgreementEntity {
+    struct Req {
+        let agreeList: [String]
+        let disagreeList: [String]
+    }
+}

onboard-iOS/Domain/Login/AppleLoginUseCase.swift

@@ -10,7 +10,7 @@ import Foundation
 import RxSwift
 
 protocol AppleLoginUseCase {
-    var result: Observable<Bool> { get }
+    var result: Observable<OnboardingEntity> { get }
     func signIn() async
 }
 
@@ -22,28 +22,38 @@ protocol AppleLoginDelegate: AnyObject {
 protocol AuthRepository {
     // api 호출 및 토큰 가져오기
     func signIn(req: AuthEntity.Req) async throws -> AuthEntity.Res
+    func onboarding() async throws -> OnboardingEntity
 }
 
 final class AppleLoginUseCaseImpl: AppleLoginUseCase {
 
     private let appleLoginManager: AppleLoginManager
     private let authRepository: AuthRepository
+    private let keychainService: KeychainService
 
-    var result: Observable<Bool>
-    private let _result: PublishSubject<Bool> = .init()
+    var result: Observable<OnboardingEntity>
+    private let _result: PublishSubject<OnboardingEntity> = .init()
 
     init(
         appleLoginManager: AppleLoginManager,
-        authRepository: AuthRepository
+        authRepository: AuthRepository,
+        keychainService: KeychainService
     ) {
         self.appleLoginManager = appleLoginManager
         self.authRepository = authRepository
+        self.keychainService = keychainService
         self.result = self._result
     }
 
     func signIn() async {
+        self.removeKeychainData()
         self.appleLoginManager.excute(delegate: self)
     }
+
+    private func removeKeychainData() {
+        self.keychainService.remove(forKey: .accessToken)
+        self.keychainService.remove(forKey: .refreshToken)
+    }
 }
 
 // MARK: - Apple login delegate
@@ -52,18 +62,15 @@ extension AppleLoginUseCaseImpl: AppleLoginDelegate {
 
     func success(token: String) {
         Task {
-            let result = try await self.authRepository.signIn(
+            let authResult = try await self.authRepository.signIn(
                 req: AuthEntity.Req(type: .apple, token: token)
             )
-
-            // TODO: 온보딩 진행정보 받아오기 호출 구현
-            // 임시로 false 처리
-            let isExisted = false
-            print(result.accessToken)
-            print("-=-----==========")
-            print(result.refreshToken)
-
-            self._result.onNext(isExisted)
+            self.keychainService.set(authResult.accessToken, forKey: .accessToken)
+            self.keychainService.set(authResult.refreshToken, forKey: .refreshToken)
+
+            let onboardingResult = try await self.authRepository.onboarding()
+
+            self._result.onNext(onboardingResult)
         }
     }
 }

onboard-iOS/Domain/Login/GoogleLoginUseCase.swift

@@ -0,0 +1,57 @@
+//
+//  GoogleLoginUseCase.swift
+//  onboard-iOS
+//
+//  Created by 윤다예 on 12/3/23.
+//
+
+import Foundation
+
+import RxSwift
+
+protocol GoogleLoginUseCase {
+    var result: Observable<OnboardingEntity> { get }
+    func signIn(token: String) async throws
+}
+
+protocol GoogleLoginDelegate: AnyObject {
+    // 구글로그인 토큰 전달
+    func success(token: String) 
+}
+
+final class GoogleLoginUseCaseImpl: GoogleLoginUseCase {
+
+    private let authRepository: AuthRepository
+    private let keychainService: KeychainService
+
+    var result: Observable<OnboardingEntity>
+    private let _result: PublishSubject<OnboardingEntity> = .init()
+
+    init(
+        authRepository: AuthRepository,
+        keychainService: KeychainService
+    ) {
+        self.authRepository = authRepository
+        self.keychainService = keychainService
+        self.result = self._result
+    }
+
+    func signIn(token: String) async throws {
+        self.removeKeychainData()
+
+        let authResult = try await self.authRepository.signIn(
+            req: AuthEntity.Req(type: .google, token: token)
+        )
+        self.keychainService.set(authResult.accessToken, forKey: .accessToken)
+        self.keychainService.set(authResult.refreshToken, forKey: .refreshToken)
+
+        let onboardingResult = try await self.authRepository.onboarding()
+
+        self._result.onNext(onboardingResult)
+    }
+
+    private func removeKeychainData() {
+        self.keychainService.remove(forKey: .accessToken)
+        self.keychainService.remove(forKey: .refreshToken)
+    }
+}