Merge pull request #203 from DSM-PICK/feeture/(#202)-resign

🔗 :: (#202) 회원탈퇴 및 회원가입 로직 수정

Author: circle0802

Projects/Data/Sources/API/AuthAPI.swift

@@ -11,6 +11,7 @@ public enum AuthAPI {
     case refreshToken
     case signup(req: SignupRequestParams)
     case passwordChange(req: PasswordChangeRequestParams)
+    case resign
 }
 
 extension AuthAPI: PiCKAPI {
@@ -30,6 +31,8 @@ extension AuthAPI: PiCKAPI {
             return "/refresh"
         case .passwordChange:
             return "/password"
+        case .resign:
+            return ""
         }
     }
 
@@ -39,6 +42,8 @@ extension AuthAPI: PiCKAPI {
             return .post
         case .refreshToken:
             return .put
+        case .resign:
+            return .delete
         }
     }
 
@@ -59,6 +64,8 @@ extension AuthAPI: PiCKAPI {
         switch self {
         case .refreshToken:
             return .refreshToken
+        case .resign:
+            return .accessToken
         default:
             return .tokenIsEmpty
         }

Projects/Data/Sources/DI/UseCaseAssembly.swift

@@ -18,6 +18,9 @@ public final class UseCaseAssembly: Assembly {
         container.register(LogoutUseCase.self) { resolver in
             LogoutUseCase(repository: resolver.resolve(AuthRepository.self)!)
         }
+        container.register(ResignUseCase.self) { resolver in
+            ResignUseCase(repository: resolver.resolve(AuthRepository.self)!)
+        }
         container.register(RefreshTokenUseCase.self) { resolver in
             RefreshTokenUseCase(repository: resolver.resolve(AuthRepository.self)!)
         }

Projects/Data/Sources/DataSource/AuthDataSource.swift

@@ -10,9 +10,10 @@ import AppNetwork
 
 protocol AuthDataSource {
     func signin(req: SigninRequestParams) -> Single<TokenDTO>
-    func signup(req: SignupRequestParams) -> Completable
+    func signup(req: SignupRequestParams) -> Single<TokenDTO>
     func passwordChange(req: PasswordChangeRequestParams) -> Completable
     func logout()
+    func resign() -> Completable
     func refreshToken() -> Single<TokenDTO>
 }
 
@@ -31,10 +32,10 @@ class AuthDataSourceImpl: BaseDataSource<AuthAPI>, AuthDataSource {
             .map(TokenDTO.self)
     }
 
-    func signup(req: SignupRequestParams) -> Completable {
+    func signup(req: SignupRequestParams) -> Single<TokenDTO> {
         return request(.signup(req: req))
             .filterSuccessfulStatusCodes()
-            .asCompletable()
+            .map(TokenDTO.self)
     }
 
     func passwordChange(req: PasswordChangeRequestParams) -> Completable {
@@ -51,6 +52,20 @@ class AuthDataSourceImpl: BaseDataSource<AuthAPI>, AuthDataSource {
         UserDefaultStorage.shared.remove(forKey: .userInfoData)
     }
 
+    func resign() -> Completable {
+        return request(.resign)
+            .filterSuccessfulStatusCodes()
+            .asCompletable()
+            .do(onCompleted: { [weak self] in
+                guard let self else { return }
+                self.keychain.delete(type: .accessToken)
+                self.keychain.delete(type: .refreshToken)
+                self.keychain.delete(type: .id)
+                self.keychain.delete(type: .password)
+                UserDefaultStorage.shared.remove(forKey: .userInfoData)
+            })
+    }
+
     func refreshToken() -> Single<TokenDTO> {
         return request(.refreshToken)
             .filterSuccessfulStatusCodes()

Projects/Data/Sources/Repository/AuthRepositoryImpl.swift

@@ -42,7 +42,26 @@ class AuthRepositoryImpl: AuthRepository {
     }
 
     func signup(req: SignupRequestParams) -> Completable {
-        return remoteDataSource.signup(req: req)
+        return Completable.create { [weak self] completable in
+            guard let self = self else { return Disposables.create {} }
+
+            self.remoteDataSource.signup(req: req)
+                .subscribe(onSuccess: { tokenData in
+                    self.keyChain.save(type: .accessToken, value: tokenData.accessToken)
+                    self.keyChain.save(type: .refreshToken, value: tokenData.refreshToken)
+
+                    self.keyChain.save(type: .id, value: req.accountID)
+                    self.keyChain.save(type: .password, value: req.password)
+
+                    self.watchDataSource.activate()
+                    completable(.completed)
+                }, onFailure: {
+                    completable(.error($0))
+                })
+                .disposed(by: self.disposeBag)
+
+            return Disposables.create {}
+        }
     }
 
     func passwordChange(req: PasswordChangeRequestParams) -> Completable {
@@ -53,6 +72,10 @@ class AuthRepositoryImpl: AuthRepository {
         return remoteDataSource.logout()
     }
 
+    func resign() -> Completable {
+        return remoteDataSource.resign()
+    }
+
     func refreshToken() -> Completable {
         return Completable.create { [weak self] completable in
             guard let self = self else { return Disposables.create {} }

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

@@ -8,6 +8,7 @@ public struct SignupRequestParams: Encodable {
     public let classNum: Int
     public let num: Int
     public let code: String
+    public let deviceToken: String?
 
     public init(
         accountID: String,
@@ -16,7 +17,8 @@ public struct SignupRequestParams: Encodable {
         grade: Int,
         classNum: Int,
         num: Int,
-        code: String
+        code: String,
+        deviceToken: String?
 
     ) {
         self.accountID = accountID
@@ -26,6 +28,7 @@ public struct SignupRequestParams: Encodable {
         self.classNum = classNum
         self.num = num
         self.code = code
+        self.deviceToken = deviceToken
     }
 
     enum CodingKeys: String, CodingKey {
@@ -36,6 +39,7 @@ public struct SignupRequestParams: Encodable {
         case classNum = "class_num"
         case num
         case code
+        case deviceToken = "device_token"
     }
 
 }

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

@@ -3,12 +3,12 @@ import Foundation
 public struct SigninRequestParams: Encodable {
     public let accountID: String
     public let password: String
-    public let deviceToken: String
+    public let deviceToken: String?
 
     public init(
         accountID: String,
         password: String,
-        deviceToken: String
+        deviceToken: String?
     ) {
         self.accountID = accountID
         self.password = password

Projects/Domain/Sources/Repository/AuthRepository.swift

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

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

@@ -0,0 +1,15 @@
+import Foundation
+
+import RxSwift
+
+public struct ResignUseCase {
+    let repository: AuthRepository
+
+    public init(repository: AuthRepository) {
+        self.repository = repository
+    }
+
+    public func execute() -> Completable {
+        repository.resign()
+    }
+}

Projects/Modules/DesignSystem/Resources/Image.xcassets/mainIcon/resign.imageset/Contents.json

@@ -0,0 +1,21 @@
+{
+  "images" : [
+    {
+      "filename" : "resign.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}