Merge pull request #184 from DSM-PICK/feature/(#183)-signup_logic

🔗 :: (#183) 회원가입, 비밀번호 변경 로직

Author: circle0802

Projects/Core/Sources/Steps/PiCKStep.swift

@@ -6,20 +6,17 @@ public enum PiCKStep: Step {
     // start
     case appIsRequired
     case onboardingIsRequired
-    case loginIsRequired
+    case signinIsRequired
 
     // tab
     case tabIsRequired
     case popIsRequired
 
-    // MARK: Login
-    case signUpIsRequired
-
-    // MARK: SignUp
+    // MARK: Signup
     case verifyEmailIsRequired
-    case passwordSettingIsRequired
+    case passwordSettingIsRequired(email: String, verificationCode: String)
     case infoSettingIsRequired(email: String, password: String, verificationCode: String)
-    case signUpComplete
+    case signupComplete
 
     // MARK: home
     case homeIsRequired
@@ -56,7 +53,7 @@ public enum PiCKStep: Step {
 
     // MARK: ChangePassword
     case changePasswordIsRequired
-    case newPasswordIsRequired
+    case newPasswordIsRequired(verificationCode: String)
 
     // MARK: test
     case testIsRequired

Projects/Data/Sources/API/AuthAPI.swift

@@ -7,9 +7,10 @@ import Domain
 import AppNetwork
 
 public enum AuthAPI {
-    case login(req: SigninRequestParams)
+    case signin(req: SigninRequestParams)
     case refreshToken
-    case signUp(req: SignUpRequestParams)
+    case signup(req: SignupRequestParams)
+    case passwordChange(req: PasswordChangeRequestParams)
 }
 
 extension AuthAPI: PiCKAPI {
@@ -21,18 +22,20 @@ extension AuthAPI: PiCKAPI {
 
     public var urlPath: String {
         switch self {
-        case .login:
+        case .signin:
             return "/login"
-        case .signUp:
+        case .signup:
             return "/signup"
         case .refreshToken:
             return "/refresh"
+        case .passwordChange:
+            return "/password"
         }
     }
 
     public var method: Moya.Method {
         switch self {
-        case .login, .signUp:
+        case .signin, .signup, .passwordChange:
             return .post
         case .refreshToken:
             return .put
@@ -41,9 +44,11 @@ extension AuthAPI: PiCKAPI {
 
     public var task: Moya.Task {
         switch self {
-        case let .login(req):
+        case let .signin(req):
             return .requestJSONEncodable(req)
-        case let .signUp(req):
+        case let .signup(req):
+            return .requestJSONEncodable(req)
+        case let .passwordChange(req):
             return .requestJSONEncodable(req)
         default:
             return .requestPlain
@@ -61,7 +66,7 @@ extension AuthAPI: PiCKAPI {
 
     public var errorMap: [Int: ErrorType]? {
         switch self {
-        case .login(let req):
+        case .signin(let req):
             return [
                 401: .passwordMismatch,
                 404: .idMismatch

Projects/Data/Sources/DI/UseCaseAssembly.swift

@@ -12,15 +12,18 @@ public final class UseCaseAssembly: Assembly {
         container.register(SigninUseCase.self) { resolver in
             SigninUseCase(repository: resolver.resolve(AuthRepository.self)!)
         }
-        container.register(SignUpUseCase.self) { resolver in
-            SignUpUseCase(repository: resolver.resolve(AuthRepository.self)!)
+        container.register(SignupUseCase.self) { resolver in
+            SignupUseCase(repository: resolver.resolve(AuthRepository.self)!)
         }
         container.register(LogoutUseCase.self) { resolver in
             LogoutUseCase(repository: resolver.resolve(AuthRepository.self)!)
         }
         container.register(RefreshTokenUseCase.self) { resolver in
             RefreshTokenUseCase(repository: resolver.resolve(AuthRepository.self)!)
         }
+        container.register(PasswordChangeUseCase.self) { resolver in
+            PasswordChangeUseCase(repository: resolver.resolve(AuthRepository.self)!)
+        }
         // MARK: Home
         container.register(FetchApplyStatusUsecase.self) { resolver in
             FetchApplyStatusUsecase(repository: resolver.resolve(HomeRepository.self)!)

Projects/Data/Sources/DataSource/AuthDataSource.swift

@@ -9,8 +9,9 @@ import Domain
 import AppNetwork
 
 protocol AuthDataSource {
-    func login(req: SigninRequestParams) -> Single<TokenDTO>
-    func signUp(req: SignUpRequestParams) -> Completable
+    func signin(req: SigninRequestParams) -> Single<TokenDTO>
+    func signup(req: SignupRequestParams) -> Completable
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable
     func logout()
     func refreshToken() -> Single<TokenDTO>
 }
@@ -24,14 +25,20 @@ class AuthDataSourceImpl: BaseDataSource<AuthAPI>, AuthDataSource {
         super.init(keychain: keychain)
     }
 
-    func login(req: SigninRequestParams) -> Single<TokenDTO> {
-        return request(.login(req: req))
+    func signin(req: SigninRequestParams) -> Single<TokenDTO> {
+        return request(.signin(req: req))
             .filterSuccessfulStatusCodes()
             .map(TokenDTO.self)
     }
 
-    func signUp(req: SignUpRequestParams) -> Completable {
-        return request(.signUp(req: req))
+    func signup(req: SignupRequestParams) -> Completable {
+        return request(.signup(req: req))
+            .filterSuccessfulStatusCodes()
+            .asCompletable()
+    }
+
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable {
+        return request(.passwordChange(req: req))
             .filterSuccessfulStatusCodes()
             .asCompletable()
     }

Projects/Data/Sources/DataSource/MailDataSource.swift

@@ -10,7 +10,7 @@ import AppNetwork
 
 protocol MailDataSource {
     func verifyEmailCode(req: VerifyEmailCodeRequestParams) -> Completable
-    func mailCodeCheck(req: MailCodeCheckRequestParams) -> Completable
+    func mailCodeCheck(req: MailCodeCheckRequestParams) -> Single<Bool>
 }
 
 class MailSourceImpl: BaseDataSource<MailAPI>, MailDataSource {
@@ -20,9 +20,9 @@ class MailSourceImpl: BaseDataSource<MailAPI>, MailDataSource {
                .asCompletable()
        }
 
-    func mailCodeCheck(req: MailCodeCheckRequestParams) -> Completable {
+    func mailCodeCheck(req: MailCodeCheckRequestParams) -> Single<Bool> {
         return request(.mailCodeCheck(req: req))
             .filterSuccessfulStatusCodes()
-            .asCompletable()
+            .map(Bool.self)
     }
 }

Projects/Data/Sources/DataSource/WatchDataSource.swift

@@ -37,7 +37,6 @@ class WatchDataSourceImpl: NSObject, WatchDataSource, WCSessionDelegate {
             return
         }
 
-
         let message: [String: Any] = [
             "access_token": keychain.load(type: .accessToken)
         ]

Projects/Data/Sources/Repository/AuthRepositoryImpl.swift

@@ -17,14 +17,12 @@ class AuthRepositoryImpl: AuthRepository {
     init(remoteDataSource: AuthDataSource) {
         self.remoteDataSource = remoteDataSource
     }
-//    func signUp(req: SignUpRequestParams) -> Completable {
-//        
-//    }
+
     func signin(req: SigninRequestParams) -> Completable {
         return Completable.create { [weak self] completable in
             guard let self = self else { return Disposables.create {} }
 
-            self.remoteDataSource.login(req: req)
+            self.remoteDataSource.signin(req: req)
                 .subscribe(onSuccess: { tokenData in
                     self.keyChain.save(type: .accessToken, value: tokenData.accessToken)
                     self.keyChain.save(type: .refreshToken, value: tokenData.refreshToken)
@@ -43,8 +41,12 @@ class AuthRepositoryImpl: AuthRepository {
         }
     }
 
-    func signUp(req: SignUpRequestParams) -> Completable {
-        return remoteDataSource.signUp(req: req)
+    func signup(req: SignupRequestParams) -> Completable {
+        return remoteDataSource.signup(req: req)
+    }
+
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable {
+        return remoteDataSource.passwordChange(req: req)
     }
 
     func logout() {

Projects/Data/Sources/Repository/MailRepositoryImpl.swift

@@ -15,7 +15,7 @@ class MailRepositoryImpl: MailRepository {
           return remoteDataSource.verifyEmailCode(req: req)
       }
 
-    func mailCodeCheck(req: MailCodeCheckRequestParams) -> Completable {
+    func mailCodeCheck(req: MailCodeCheckRequestParams) -> Single<Bool> {
         return remoteDataSource.mailCodeCheck(req: req)
     }
 

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

@@ -0,0 +1,14 @@
+import Foundation
+
+public struct PasswordChangeRequestParams: Encodable {
+    public let password: String
+    public let code: String
+
+    public init(
+        password: String,
+        code: String
+    ) {
+        self.password = password
+        self.code = code
+    }
+}

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

@@ -1,6 +1,6 @@
 import Foundation
 
-public struct SignUpRequestParams: Encodable {
+public struct SignupRequestParams: Encodable {
     public let accountID: String
     public let password: String
     public let name: String