로그인 api 연동

Projects/App/Sources/AppDelegate.swift

@@ -19,7 +19,10 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
         assembler = Assembler([
             KeychainAssembly(),
-            PresentationAssembly()
+            PresentationAssembly(),
+            DataSourceAssembly(),
+            RepositoryAssembly(),
+            UseCaseAssembly()
         ], container: AppDelegate.container)
         return true
     }

Projects/App/Support/Info.plist

@@ -2,6 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 	<key>API_BASE_URL</key>
 	<string>$(API_BASE_URL)</string>
 	<key>AppIdentifierPrefix</key>

Projects/Core/Sources/JwtStore/JwtStore.swift

@@ -1,8 +1,5 @@
 public enum KeychainType: String {
     case accessToken = "ACCESS-TOKEN"
-    case refreshToken = "REFRESH-TOKEN"
-    case accessExpiresAt = "ACCESS-EXPIRED-AT"
-    case refreshExpiresAt = "REFRESH-EXPIRED-AT"
 }
 
 public protocol Keychain {

Projects/Core/Sources/Steps/EmailLoginStep.swift

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

Projects/Data/Sources/Auth/DataSource/API/AuthAPI.swift

@@ -0,0 +1,47 @@
+import Moya
+import Domain
+import AppNetwork
+
+enum AuthAPI {
+    case login(LoginRequestQuery)
+    case signup(SignupRequestQuery)
+}
+
+extension AuthAPI: EmotingAPI {
+    typealias ErrorType = Error
+
+    var domain: EmotingDomain {
+        .auth
+    }
+
+    var urlPath: String {
+        switch self {
+        case .login:
+            return "/login"
+        case .signup:
+            return "/signup"
+        }
+    }
+
+    var method: Method {
+        return .post
+    }
+
+    var task: Task {
+        switch self {
+        case let .login(req):
+            return .requestJSONEncodable(req)
+
+        case let .signup(req):
+            return .requestJSONEncodable(req)
+        }
+    }
+
+    var jwtTokenType: JwtTokenType {
+        return .none
+    }
+
+    var errorMap: [Int: ErrorType]? {
+        return nil
+    }
+}

Projects/Data/Sources/Auth/DataSource/Remote/RemoteAuthDataSource.swift

@@ -0,0 +1,21 @@
+import RxSwift
+import Domain
+import AppNetwork
+
+protocol RemoteAuthDataSource {
+    func login(req: LoginRequestQuery) -> Single<TokenDTO>
+    func signup(req: SignupRequestQuery) -> Completable
+}
+
+final class RemoteAuthDataSourceImpl: RemoteBaseDataSource<AuthAPI>, RemoteAuthDataSource {
+    func login(req: LoginRequestQuery) -> Single<TokenDTO> {
+        return request(.login(req))
+            .map(TokenDTO.self)
+    }
+
+    func signup(req: SignupRequestQuery) -> Completable {
+        return request(.signup(req))
+            .asCompletable()
+    }
+
+}

Projects/Data/Sources/Auth/Repository/AuthRepositoryImpl.swift

@@ -0,0 +1,19 @@
+import RxSwift
+import Domain
+
+struct AuthRepositoryImpl: AuthRepository {
+    private let remoteAuthDataSource: any RemoteAuthDataSource
+
+    init(remoteAuthDataSource: any RemoteAuthDataSource) {
+        self.remoteAuthDataSource = remoteAuthDataSource
+    }
+
+    func login(req: Domain.LoginRequestQuery) -> RxSwift.Completable {
+        remoteAuthDataSource.login(req: req)
+            .asCompletable()
+    }
+
+    func signup(req: Domain.SignupRequestQuery) -> RxSwift.Completable {
+        remoteAuthDataSource.signup(req: req)
+    }
+}

Projects/Data/Sources/Base/BaseRemoteDataSource.swift

@@ -0,0 +1,51 @@
+import Moya
+import Domain
+import AppNetwork
+import Foundation
+import RxSwift
+import RxMoya
+import Core
+import Alamofire
+
+class RemoteBaseDataSource<API: EmotingAPI> {
+    private let keychain: any Keychain
+
+    private let provider: MoyaProvider<API>
+
+    init(keychain: any Keychain) {
+        self.keychain = keychain
+#if DEBUG
+        self.provider = MoyaProvider<API>(plugins: [JwtPlugin(keychain: keychain), MoyaLogginPlugin()])
+#else
+        self.provider = MoyaProvider<API>(plugins: [JwtPlugin(keychain: keychain)])
+#endif
+    }
+
+    func request(_ api: API) -> Single<Response> {
+        return .create { single in
+            var disposables: [Disposable] = []
+            disposables.append(
+                self.defaultRequest(api)
+                    .subscribe(
+                        onSuccess: { single(.success($0)) },
+                        onFailure: { single(.failure($0)) }
+                    )
+            )
+            return Disposables.create(disposables)
+        }
+    }
+}
+
+private extension RemoteBaseDataSource {
+    func defaultRequest(_ api: API) -> Single<Response> {
+        return provider.rx
+            .request(api)
+            .timeout(.seconds(120), scheduler: MainScheduler.asyncInstance)
+            .catch { error in
+                guard let code = (error as? MoyaError)?.response?.statusCode else {
+                    return .error(error)
+                }
+                return .error(api.errorMap?[code] ?? error)
+            }
+    }
+}

Projects/Data/Sources/DI/DataSourceAssembly.swift

@@ -0,0 +1,18 @@
+import Foundation
+import Swinject
+import Core
+import Domain
+
+public final class DataSourceAssembly: Assembly {
+    public init() {}
+
+    private let keychain = { (resolver: Resolver) in
+        resolver.resolve(Keychain.self)!
+    }
+
+    public func assemble(container: Container) {
+        container.register(RemoteAuthDataSource.self) { resolver in
+            RemoteAuthDataSourceImpl(keychain: self.keychain(resolver))
+        }
+    }
+}

Projects/Data/Sources/DI/RepositoryAssembly.swift

@@ -0,0 +1,13 @@
+import Foundation
+import Swinject
+import Domain
+
+public final class RepositoryAssembly: Assembly {
+    public init() {}
+
+    public func assemble(container: Container) {
+        container.register(AuthRepository.self) { resolver in
+            AuthRepositoryImpl(remoteAuthDataSource: resolver.resolve(RemoteAuthDataSource.self)!)
+        }
+    }
+}

Projects/Data/Sources/DI/UseCaseAssembly.swift

@@ -0,0 +1,21 @@
+import Foundation
+import Swinject
+import Domain
+
+public final class UseCaseAssembly: Assembly {
+    public init() {}
+
+    public func assemble(container: Container) {
+        // Auth
+        container.register(LoginUseCase.self) { resolver in
+            LoginUseCase(
+                authRepository: resolver.resolve(AuthRepository.self)!
+            )
+        }
+        container.register(SignupUseCase.self) { resolver in
+            SignupUseCase(
+                authRepository: resolver.resolve(AuthRepository.self)!
+            )
+        }
+    }
+}

Projects/Domain/Sources/Auth/Parameter/LoginRequestQuery.swift

@@ -0,0 +1,11 @@
+import Foundation
+
+public struct LoginRequestQuery: Encodable {
+    public let email: String
+    public let password: String
+
+    public init(email: String, password: String) {
+        self.email = email
+        self.password = password
+    }
+}

Projects/Domain/Sources/Auth/Parameter/SignupRequestQuery.swift

@@ -0,0 +1,15 @@
+import Foundation
+
+public struct SignupRequestQuery: Encodable {
+    public let email: String
+    public let password: String
+    public let nickname: String
+    public let age: Int
+
+    public init(email: String, password: String, nickname: String, age: Int) {
+        self.email = email
+        self.password = password
+        self.nickname = nickname
+        self.age = age
+    }
+}

Projects/Domain/Sources/Auth/Repository/AuthRepository.swift

@@ -0,0 +1,6 @@
+import RxSwift
+
+public protocol AuthRepository {
+    func login(req: LoginRequestQuery) -> Completable
+    func signup(req: SignupRequestQuery) -> Completable
+}

Projects/Domain/Sources/Auth/UseCase/LoginUseCase.swift

@@ -0,0 +1,13 @@
+import RxSwift
+
+public struct LoginUseCase {
+    public init(authRepository: AuthRepository) {
+        self.authRepository = authRepository
+    }
+
+    private let authRepository: AuthRepository
+
+    public func execute(req: LoginRequestQuery) -> Completable {
+        return authRepository.login(req: req)
+    }
+}

Projects/Domain/Sources/Auth/UseCase/SignupUseCase.swift

@@ -0,0 +1,13 @@
+import RxSwift
+
+public struct SignupUseCase {
+    public init(authRepository: AuthRepository) {
+        self.authRepository = authRepository
+    }
+
+    private let authRepository: AuthRepository
+
+    public func execute(req: SignupRequestQuery) -> Completable {
+        return authRepository.signup(req: req)
+    }
+}

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)
         ))
     }