Merge pull request #351 from MaeumGaGym/refactoring/#350-auth

auth - 리펙토링
MaeumGaGym · Jun 26, 2024 · 50ad4e1 · 50ad4e1
2 parents 66df422 + 7a909c6
commit 50ad4e1
Show file tree

Hide file tree

Showing 9 changed files with 398 additions and 418 deletions.
diff --git a/Projects/Features/AuthFeature/Demo/Sources/Application/AppDelegate.swift b/Projects/Features/AuthFeature/Demo/Sources/Application/AppDelegate.swift
@@ -8,13 +8,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-//    func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
-//        if (AuthApi.isKakaoTalkLoginUrl(url)) {
-//            return AuthController.handleOpenUrl(url: url)
-//        }
-//        return false
-//    }
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         KakaoSDK.initSDK(appKey: "dcfcd3ab4a997c5a53e2ab26a8ec2a63")
         return true

diff --git a/Projects/Features/AuthFeature/Demo/Sources/Application/SceneDelegate.swift b/Projects/Features/AuthFeature/Demo/Sources/Application/SceneDelegate.swift
@@ -17,44 +17,35 @@ import AuthFeatureInterface
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
+    var coordinator = FlowCoordinator()
+    var mainFlow: AuthFlow!
 
     func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
         if let url = URLContexts.first?.url {
-            if (AuthApi.isKakaoTalkLoginUrl(url)) {
-                _ = AuthController.handleOpenUrl(url: url)
-            }
+            handleURL(url)
         }
     }
 
-    var coordinator = FlowCoordinator()
-    var mainFlow: AuthFlow!
-
-    func scene(_ scene: UIScene,
-               willConnectTo session: UISceneSession,
-               options connectionOptions: UIScene.ConnectionOptions) {
-        guard let scene = (scene as? UIWindowScene) else { return }
+    func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
+        guard let scene = scene as? UIWindowScene else { return }
 
         window = UIWindow(frame: scene.coordinateSpace.bounds)
         window?.windowScene = scene
+        configureMainFlow()
+        window?.makeKeyAndVisible()
+    }
 
-        mainFlow = AuthFlow()
+    private func handleURL(_ url: URL) {
+        if AuthApi.isKakaoTalkLoginUrl(url) {
+            _ = AuthController.handleOpenUrl(url: url)
+        }
+    }
 
+    private func configureMainFlow() {
+        mainFlow = AuthFlow()
         coordinator.coordinate(flow: mainFlow, with: OneStepper(withSingleStep: MGStep.authSplashIsRequired))
-        Flows.use(mainFlow, when: .created) { root in
-            self.window?.rootViewController = root
-            self.window?.makeKey()
+        Flows.use(mainFlow, when: .created) { [weak self] root in
+            self?.window?.rootViewController = root
         }
-        window?.makeKeyAndVisible()
     }
-
-//    private func coordinatorLogStart() {
-//        coordinator.rx.willNavigate
-//            .subscribe(onNext: { flow, step in
-//                let currentFlow = "\(flow)".split(separator: ".").last ?? "no flow"
-//                print("➡️ will navigate to flow = \(currentFlow) and step = \(step)")
-//            })
-//            .disposed(by: disposeBag)
-//        
-//        // didNavigate
-//    }
 }
diff --git a/Projects/Features/AuthFeature/Interface/Sources/AuthPresentable.swift b/Projects/Features/AuthFeature/Interface/Sources/AuthPresentable.swift
@@ -7,12 +7,7 @@ import RxCocoa
 import BaseFeatureDependency
 import Core
 
-//public protocol AuthViewControllable: ViewControllable {}
 public protocol AuthCoordintable {
-//    var goolgeButtonTap: (() -> Void)? { get set }
-//    var appleButtonTap: (() -> Void)? { get set }
-//    var kakaoButtonTap: (() -> Bool)? { get set }
-
     var disposeBag: DisposeBag { get set }
 }
 

diff --git a/Projects/Features/AuthFeature/Sources/IntroScene/ViewModel/IntroViewModel.swift b/Projects/Features/AuthFeature/Sources/IntroScene/ViewModel/IntroViewModel.swift
@@ -48,45 +48,33 @@ public class IntroViewModel: AuthViewModelType {
 
     public func transform(_ input: Input, action: (Output) -> Void) -> Output {
 
-        let output = Output(introDatas: introModelSubject.asObservable(), showGoogleAlert: showGoogleAlertSubject.asObservable())
+        let output = Output(
+            introDatas: introModelSubject.asObservable(),
+            showGoogleAlert: showGoogleAlertSubject.asObservable()
+        )
 
         action(output)
-
+        bindInputs(input)
         bindOutput(output: output)
 
-        input.goolgeButtonTapped
-            .asObservable()
-            .withUnretained(self)
-            .subscribe(onNext: { owner, _ in
-                owner.showGoogleAlertSubject.onNext(())
-            })
-            .disposed(by: disposeBag)
-
-        input.kakaoButtonTapped
-            .asObservable()
-            .withUnretained(self)
-            .subscribe(onNext: { owner, _ in
-                owner.useCase.kakaoButtonTap()
-            })
-            .disposed(by: disposeBag)
-
-        input.appleButtonTapped
-            .asObservable()
-            .withUnretained(self)
-            .subscribe(onNext: { owner, _ in
-                owner.useCase.appleButtonTap()
-            })
-            .disposed(by: disposeBag)
-
-        input.getIntroData
+        return output
+    }
+
+    private func bindButtonTap(_ driver: Driver<Void>, handler: @escaping () -> Void) {
+        driver
             .asObservable()
             .withUnretained(self)
             .subscribe(onNext: { owner, _ in
-                owner.useCase.getIntroData()
+                handler()
             })
             .disposed(by: disposeBag)
-
-        return output
+    }
+
+    private func bindInputs(_ input: Input) {
+        bindButtonTap(input.goolgeButtonTapped, handler: { self.showGoogleAlertSubject.onNext(()) })
+        bindButtonTap(input.appleButtonTapped, handler: { self.useCase.appleButtonTap() })
+        bindButtonTap(input.kakaoButtonTapped, handler: { self.useCase.kakaoButtonTap() })
+        bindButtonTap(input.getIntroData, handler: { self.useCase.getIntroData() })
     }
 
     private func bindOutput(output: Output) {
@@ -104,19 +92,3 @@ public class IntroViewModel: AuthViewModelType {
             .disposed(by: disposeBag)
     }
 }
-
-private extension IntroViewModel {
-    //    func kakaoGetUserInfo() {
-    //        UserApi.shared.me() { (user, error) in
-    //            if let error = error {
-    //                print(error)
-    //            }
-    //
-    //            let userName = user?.kakaoAccount?.name
-    //
-    //            _ = "user name : \(String(describing: userName))"
-    //
-    //            print("user - \(String(describing: user))")
-    //        }
-    //    }
-}
diff --git a/Projects/Features/AuthFeature/Sources/IntroScene/ViewModel/SplashViewModel.swift b/Projects/Features/AuthFeature/Sources/IntroScene/ViewModel/SplashViewModel.swift
@@ -30,8 +30,6 @@ public class SplashViewModel: AuthViewModelType {
         self.useCase = authUseCase
         self.disposeBag = DisposeBag()
         useCase.tokenReIssue()
-//        useCase.getAllPoseData()
-
     }
 
     public func transform(_ input: Input, action: (Output) -> Void) -> Output {

diff --git a/Projects/Features/AuthFeature/Sources/SignupScene/Supporter/AuthSeemoreButton.swift b/Projects/Features/AuthFeature/Sources/SignupScene/Supporter/AuthSeemoreButton.swift
@@ -8,9 +8,7 @@ import Core
 import DSKit
 
 public class AuthSeemoreButton: BaseButton {
-
-//    private var containerView = UIView()
-
+
     private var textLabel = MGLabel(text: "자세히 보기", font: UIFont.Pretendard.labelSmall, textColor: DSKitAsset.Colors.gray300.color, isCenter: true)
 
     private var lineView = MGLine(lineColor: DSKitAsset.Colors.gray300.color, lineWidth: 1.0)