⚡️ :: 전체적인 회원가입 flow 수정

Projects/Core/Sources/Steps/EmailLoginStep.swift

@@ -0,0 +1,6 @@
+import RxFlow
+
+public enum EmailLoginStep: Step {
+    case emailLoginisRequired
+    case tabIsRequired
+}

Projects/Flow/Sources/AgeSignupFlow.swift

@@ -51,8 +51,8 @@ private extension AgeSignupFlow {
         }
 
         return .one(flowContributor: .contribute(
-            withNextPresentable: rootViewController,
-            withNextStepper: rootViewController.reactor
+            withNextPresentable: profilSignupFlow,
+            withNextStepper: OneStepper(withSingleStep: ProfilSignupStep.profilSignupIsRequired)
         ))
     }
 }

Projects/Flow/Sources/AppStepper.swift

@@ -11,6 +11,6 @@ public final class AppStepper: Stepper {
     public init() {}
 
     public var initialStep: Step {
-        return AppStep.testIsRequired
+        return AppStep.onboardingIsRequired
     }
 }

Projects/Flow/Sources/EmailLoginFlow.swift

@@ -0,0 +1,40 @@
+import UIKit
+import RxFlow
+import RxSwift
+import Core
+import Swinject
+import Presentation
+
+public final class EmailLoginFlow: Flow {
+    public let container: Container
+    public var root: Presentable {
+        return self.rootViewController
+    }
+
+    public let rootViewController: EmailLoginViewController
+
+    public init(container: Container) {
+        self.container = container
+        self.rootViewController = container.resolve(EmailLoginViewController.self)!
+    }
+
+    public func navigate(to step: Step) -> FlowContributors {
+        guard let step = step as? EmailLoginStep else { return .none }
+
+        switch step {
+        case .emailLoginisRequired:
+            return navigationToEmailLogin()
+        case .tabIsRequired:
+            return .end(forwardToParentFlowWithStep: OauthLoginStep.tabIsRequired)
+        }
+    }
+}
+
+private extension EmailLoginFlow {
+    func navigationToEmailLogin() -> FlowContributors {
+        return .one(flowContributor: .contribute(
+            withNextPresentable: rootViewController,
+            withNextStepper: rootViewController.reactor
+        ))
+    }
+}

Projects/Flow/Sources/OauthLoginFlow.swift

@@ -29,7 +29,7 @@ public final class OauthLoginFlow: Flow {
         case .emailSignupIsRequired:
             return navigationToEmailSignup()
         case .tabIsRequired:
-            return .end(forwardToParentFlowWithStep: OnboardingStep.tabIsRequired)
+            return .end(forwardToParentFlowWithStep: AppStep.tabIsRequired)
         }
     }
 }
@@ -50,16 +50,15 @@ private extension OauthLoginFlow {
     }
 
     func navigationToEmailLogin() -> FlowContributors {
-        let emailLoginViewController = container.resolve(EmailLoginViewController.self)!
+        let emailLoginFlow = EmailLoginFlow(container: container)
 
-        self.rootViewController.pushViewController(
-            emailLoginViewController,
-            animated: true
-        )
+        Flows.use(emailLoginFlow, when: .created) { (root) in
+            self.rootViewController.pushViewController(root, animated: true)
+        }
 
         return .one(flowContributor: .contribute(
-            withNextPresentable: emailLoginViewController,
-            withNextStepper: emailLoginViewController.reactor
+            withNextPresentable: emailLoginFlow,
+            withNextStepper: OneStepper(withSingleStep: EmailLoginStep.emailLoginisRequired)
         ))
     }
 

Projects/Flow/Sources/ProFilSignupFlow.swift

@@ -26,7 +26,7 @@ public final class ProFilSignupFlow: Flow {
             return navigationToProfilSignup()
 
         case .oauthLoginIsRequired:
-            return .end(forwardToParentFlowWithStep: AgeSignupStep.oauthLoginIsRequired)
+            return navigationToOauthLogin()
         }
     }
 }
@@ -38,4 +38,9 @@ private extension ProFilSignupFlow {
             withNextStepper: rootViewController.reactor
         ))
     }
+
+    func navigationToOauthLogin() -> FlowContributors {
+        self.rootViewController.navigationController?.popToRootViewController(animated: true)
+        return .end(forwardToParentFlowWithStep: AgeSignupStep.oauthLoginIsRequired)
+    }
 }

Projects/Presentation/Sources/Base/BaseReactorViewController.swift

@@ -42,7 +42,7 @@ public class BaseReactorViewController<Reactor: BaseReactor>: UIViewController,
         bindAction()
         bindState()
         configureViewController()
-//        configureNavigation()
+        configureNavigation()
 
         self.viewDidLoadPublisher.accept(())
     }