[Feat] #468 - apple getIdentityToken 구현

sopt-makers · Jan 18, 2025 · 1d8d045 · 1d8d045
1 parent 6aa9eba
commit 1d8d045
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 15 deletions.
diff --git a/SOPT-iOS/Projects/Data/Sources/Repository/CoreAuthRepository.swift b/SOPT-iOS/Projects/Data/Sources/Repository/CoreAuthRepository.swift
@@ -1,9 +1,33 @@
 //
-//  CoreAuthRepository.swift
+//  CoreOAuthRepository.swift
 //  Data
 //
 //  Created by 장석우 on 1/18/25.
 //  Copyright © 2025 SOPT-iOS. All rights reserved.
 //
 
+import Combine
 import Foundation
+
+import Domain
+import Networks
+
+public class CoreOAuthRepository {
+
+    private let appleService: AuthenticationService
+//    private let googleService:
+
+    public init(appleService: AuthenticationService) {
+        self.appleService = appleService
+    }
+}
+
+extension CoreOAuthRepository: CoreOAuthRepositoryInterface {
+    public func getIdentityToken(from provider: OAuthType) -> AnyPublisher<String, Domain.CoreAuthError> {
+        switch provider {
+        case .apple: return appleService.getIdentityToken()
+        case .google: fatalError() //TODO: 
+        }
+
+    }
+}
diff --git a/SOPT-iOS/Projects/Data/Sources/Repository/SignInRepository.swift b/SOPT-iOS/Projects/Data/Sources/Repository/SignInRepository.swift
@@ -19,6 +19,7 @@ public class SignInRepository {
 
     private let authService: AuthService
     private let userService: UserService
+
     private let cancelBag = CancelBag()
 
     public init(authService: AuthService, userService: UserService) {
@@ -28,6 +29,7 @@ public class SignInRepository {
 }
 
 extension SignInRepository: SignInRepositoryInterface {
+
     public func requestSignIn(token: String) -> AnyPublisher<Bool, Error> {
         return authService.signIn(token: token)
             .catch ({ error in

diff --git a/SOPT-iOS/Projects/Demo/Sources/Dependency/RegisterDependencies.swift b/SOPT-iOS/Projects/Demo/Sources/Dependency/RegisterDependencies.swift
@@ -27,12 +27,21 @@ extension AppDelegate {
                 )
             }
         )
+
+        container.register(
+            interface: CoreOAuthRepositoryInterface.self,
+            implement: {
+                CoreOAuthRepository(appleService: DefaultAppleAuthenticationService())
+            }
+        )
+
         container.register(
             interface: SplashRepositoryInterface.self,
             implement: {
                 SplashRepository(service: DefaultFirebaseService())
             }
         )
+
         container.register(
             interface: MainRepositoryInterface.self,
             implement: {

diff --git a/SOPT-iOS/Projects/Domain/Sources/Error/CoreAuthError.swift b/SOPT-iOS/Projects/Domain/Sources/Error/CoreAuthError.swift
@@ -7,3 +7,19 @@
 //
 
 import Foundation
+
+public enum CoreAuthError: Error {
+    case apple(Apple)
+    case google(Google)
+    case unknown(Error)
+
+    public enum Apple: Error {
+        case authFail(Error)
+        case credentialFail
+        case encodedFail
+    }
+
+    public enum Google: Error {
+
+    }
+}
diff --git a/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/CoreOAuthRepositoryInterface.swift b/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/CoreOAuthRepositoryInterface.swift
@@ -1,5 +1,5 @@
 //
-//  CoreAuthRepository.swift
+//  CoreOAuthRepositoryInterface.swift
 //  Domain
 //
 //  Created by 장석우 on 1/18/25.

diff --git a/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/SignInRepositoryInterface.swift b/SOPT-iOS/Projects/Domain/Sources/RepositoryInterface/SignInRepositoryInterface.swift
@@ -8,8 +8,6 @@
 
 import Combine
 
-// TODO: - User 유형 설정 방식 생각하기
-
 public protocol SignInRepositoryInterface {
     func requestSignIn(token: String) -> AnyPublisher<Bool, Error>
 }
diff --git a/SOPT-iOS/Projects/Domain/Sources/UseCase/SignInUseCase.swift b/SOPT-iOS/Projects/Domain/Sources/UseCase/SignInUseCase.swift
@@ -17,17 +17,25 @@ public enum SiginInHandleableType {
 
 public protocol SignInUseCase {
     func requestSignIn(token: String)
+    func login(with provider: OAuthType) -> AnyPublisher<String, Never>
     var signInSuccess: CurrentValueSubject<SiginInHandleableType, Error> { get set }
 }
 
 public class DefaultSignInUseCase {
 
     private let repository: SignInRepositoryInterface
+    private let oauthRepository: CoreOAuthRepositoryInterface
+
     private var cancelBag = CancelBag()
+
     public var signInSuccess = CurrentValueSubject<SiginInHandleableType, Error>(.loginFailure)
 
-    public init(repository: SignInRepositoryInterface) {
+    public init(
+        repository: SignInRepositoryInterface,
+        oauthRepository: CoreOAuthRepositoryInterface
+    ) {
         self.repository = repository
+        self.oauthRepository = oauthRepository
     }
 }
 
@@ -46,4 +54,12 @@ extension DefaultSignInUseCase: SignInUseCase {
                 self.signInSuccess.send(isSuccessed ? .loginSuccess : .loginFailure)
             }.store(in: self.cancelBag)
     }
+
+    public func login(with provider: OAuthType) -> AnyPublisher<String, Never> {
+        oauthRepository.getIdentityToken(from: .apple)
+            .catch { _ in
+                return Empty<String, Never>()
+            }
+            .eraseToAnyPublisher()
+    }
 }
diff --git a/SOPT-iOS/Projects/Features/AuthFeature/Sources/Coordinator/AuthBuilder.swift b/SOPT-iOS/Projects/Features/AuthFeature/Sources/Coordinator/AuthBuilder.swift
@@ -13,14 +13,15 @@ import Domain
 public
 final class AuthBuilder {
     @Injected public var repository: SignInRepositoryInterface
+    @Injected public var oauthRepository: CoreOAuthRepositoryInterface
 
     public init() { }
 }
 
 extension AuthBuilder: AuthFeatureViewBuildable {
 
     public func makeSignIn() -> SignInPresentable {
-        let useCase = DefaultSignInUseCase(repository: repository)
+        let useCase = DefaultSignInUseCase(repository: repository, oauthRepository: oauthRepository)
         let vm = SignInViewModel(useCase: useCase)
         let vc = SignInVC()
         vc.viewModel = vm

diff --git a/SOPT-iOS/Projects/Features/AuthFeature/Sources/SignInScene/ViewModel/SignInViewModel.swift b/SOPT-iOS/Projects/Features/AuthFeature/Sources/SignInScene/ViewModel/SignInViewModel.swift
@@ -60,16 +60,13 @@ extension SignInViewModel {
                 UserDefaultKeyList.clearUserData()
             }.store(in: self.cancelBag)
 
-        input.googleLoginButtonTapped
+        Publishers.Merge(
+            input.googleLoginButtonTapped.map { OAuthType.google },
+            input.appleLoginButtonTapped.map { OAuthType.apple }
+        ).flatMap(useCase.login)
             .withUnretained(self)
-            .sink { owner, _ in
-                owner.onSocialLoginFail?() //TODO: 구글 로그인 로직
-            }.store(in: self.cancelBag)
-
-        input.appleLoginButtonTapped
-            .withUnretained(self)
-            .sink { owner, _ in
-                owner.onSocialLoginFail?() //TODO: 애플 로그인 로직
+            .sink { owner, id in
+                print(id)
             }.store(in: self.cancelBag)
 
         input.signUpButtonTapped

diff --git a/SOPT-iOS/Projects/SOPT-iOS/SOPT-iOS.entitlements b/SOPT-iOS/Projects/SOPT-iOS/SOPT-iOS.entitlements
@@ -4,5 +4,9 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.applesignin</key>
+	<array>
+		<string>Default</string>
+	</array>
 </dict>
 </plist>
diff --git a/SOPT-iOS/Projects/SOPT-iOS/Sources/Dependency/RegisterDependencies.swift b/SOPT-iOS/Projects/SOPT-iOS/Sources/Dependency/RegisterDependencies.swift
@@ -27,6 +27,14 @@ extension AppDelegate {
                 )
             }
         )
+
+        container.register(
+            interface: CoreOAuthRepositoryInterface.self,
+            implement: {
+                CoreOAuthRepository(appleService: DefaultAppleAuthenticationService())
+            }
+        )
+
         container.register(
             interface: SplashRepositoryInterface.self,
             implement: {