feat :: [#183] 비밀번호 변경 api 연동

Author: circle0802

Projects/Data/Sources/API/AuthAPI.swift

@@ -10,6 +10,7 @@ public enum AuthAPI {
     case signin(req: SigninRequestParams)
     case refreshToken
     case signup(req: SignupRequestParams)
+    case passwordChange(req: PasswordChangeRequestParams)
 }
 
 extension AuthAPI: PiCKAPI {
@@ -27,12 +28,14 @@ extension AuthAPI: PiCKAPI {
             return "/signup"
         case .refreshToken:
             return "/refresh"
+        case .passwordChange:
+            return "/password"
         }
     }
 
     public var method: Moya.Method {
         switch self {
-        case .signin, .signup:
+        case .signin, .signup, .passwordChange:
             return .post
         case .refreshToken:
             return .put
@@ -45,6 +48,8 @@ extension AuthAPI: PiCKAPI {
             return .requestJSONEncodable(req)
         case let .signup(req):
             return .requestJSONEncodable(req)
+        case let .passwordChange(req):
+            return .requestJSONEncodable(req)
         default:
             return .requestPlain
         }

Projects/Data/Sources/DI/UseCaseAssembly.swift

@@ -21,6 +21,9 @@ public final class UseCaseAssembly: Assembly {
         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

@@ -11,6 +11,7 @@ import AppNetwork
 protocol AuthDataSource {
     func signin(req: SigninRequestParams) -> Single<TokenDTO>
     func signup(req: SignupRequestParams) -> Completable
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable
     func logout()
     func refreshToken() -> Single<TokenDTO>
 }
@@ -36,6 +37,12 @@ class AuthDataSourceImpl: BaseDataSource<AuthAPI>, AuthDataSource {
             .asCompletable()
     }
 
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable {
+        return request(.passwordChange(req: req))
+            .filterSuccessfulStatusCodes()
+            .asCompletable()
+    }
+
     func logout() {
         keychain.delete(type: .accessToken)
         keychain.delete(type: .refreshToken)

Projects/Data/Sources/Repository/AuthRepositoryImpl.swift

@@ -17,9 +17,7 @@ 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 {} }
@@ -47,6 +45,10 @@ class AuthRepositoryImpl: AuthRepository {
         return remoteDataSource.signup(req: req)
     }
 
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable {
+        return remoteDataSource.passwordChange(req: req)
+    }
+
     func logout() {
         return remoteDataSource.logout()
     }

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/Repository/AuthRepository.swift

@@ -5,6 +5,7 @@ import RxSwift
 public protocol AuthRepository {
     func signin(req: SigninRequestParams) -> Completable
     func signup(req: SignupRequestParams) -> Completable
+    func passwordChange(req: PasswordChangeRequestParams) -> Completable
     func logout()
     func refreshToken() -> Completable
 }

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

@@ -0,0 +1,16 @@
+import Foundation
+
+import RxSwift
+
+public class PasswordChangeUseCase {
+    let repository: AuthRepository
+
+    public init(repository: AuthRepository) {
+        self.repository = repository
+    }
+
+    public func execute(req: PasswordChangeRequestParams) -> Completable {
+        return repository.passwordChange(req: req)
+    }
+
+}

Projects/Presentation/Sources/DI/PresentationAssembly.swift

@@ -215,7 +215,9 @@ public final class PresentationAssembly: Assembly {
             ChangePasswordViewController(viewModel: resolver.resolve(ChangePasswordViewModel.self)!)
         }
         container.register(NewPasswordViewModel.self) { resolver in
-            NewPasswordViewModel()
+            NewPasswordViewModel(
+                passwordChangeUseCase: resolver.resolve(PasswordChangeUseCase.self)!
+            )
         }
         container.register(NewPasswordViewController.self) { resolver in
             NewPasswordViewController(viewModel: resolver.resolve(NewPasswordViewModel.self)!)

Projects/Presentation/Sources/Scene/AllTab/ChangePassword/NewPassword/NewPasswordViewController.swift

@@ -8,6 +8,7 @@ import DesignSystem
 
 public class NewPasswordViewController: BaseViewController<NewPasswordViewModel> {
     public var verificationCode: String = ""
+
     private let titleLabel = PiCKLabel(
         text: "PiCK 비밀번호 변경하기",
         textColor: .modeBlack,
@@ -42,14 +43,15 @@ public class NewPasswordViewController: BaseViewController<NewPasswordViewModel>
     public override func attribute() {
         super.attribute()
 
+        navigationTitleText = "비밀번호 변경"
         navigationController?.interactivePopGestureRecognizer?.isEnabled = false
     }
 
     public override func bind() {
         let input = NewPasswordViewModel.Input(
             nextButtonTap: changeButton.rx.tap.asObservable(),
-            emailText: newPasswordTextField.rx.text.orEmpty.asObservable(),
-            certificationText: newPWCheckTextField.rx.text.orEmpty.asObservable()
+            newPasswordText: newPasswordTextField.rx.text.orEmpty.asObservable(),
+            certificationText: Observable.just(verificationCode)
         )
 
         let output = viewModel.transform(input: input)

Projects/Presentation/Sources/Scene/AllTab/ChangePassword/NewPassword/NewPasswordViewModel.swift

@@ -9,13 +9,17 @@ public class NewPasswordViewModel: BaseViewModel, Stepper {
     private let disposeBag = DisposeBag()
     public var steps = PublishRelay<Step>()
 
-    public init() {
+    private let passwordChangeUseCase: PasswordChangeUseCase
 
+    public init(
+        passwordChangeUseCase: PasswordChangeUseCase
+    ) {
+        self.passwordChangeUseCase = passwordChangeUseCase
     }
 
     public struct Input {
         let nextButtonTap: Observable<Void>
-        let emailText: Observable<String>
+        let newPasswordText: Observable<String>
         let certificationText: Observable<String>
     }
 
@@ -25,21 +29,27 @@ public class NewPasswordViewModel: BaseViewModel, Stepper {
 
     public func transform(input: Input) -> Output {
         let isFormValid = Observable.combineLatest(
-            input.emailText,
+            input.newPasswordText,
             input.certificationText
-        ) { email, certification in
-            return !email.isEmpty && !certification.isEmpty
+        ) { password, certification in
+            return !password.isEmpty && !certification.isEmpty
         }
         .distinctUntilChanged()
 
         input.nextButtonTap
             .withLatestFrom(Observable.combineLatest(
-                input.emailText,
+                input.newPasswordText,
                 input.certificationText
             ))
-            .do(onNext: { email, certification in
-            })
-            .map { _ in PiCKStep.logoutIsRequired }
+            .flatMapLatest { [weak self] password, certification -> Observable<Step> in
+                guard let self = self else { return Observable<Step>.empty() }
+                let params = PasswordChangeRequestParams(
+                    password: password,
+                    code: certification
+                )
+                return self.passwordChangeUseCase.execute(req: params)
+                    .andThen(Observable.just(PiCKStep.signinIsRequired))
+            }
             .bind(to: steps)
             .disposed(by: disposeBag)