refactor: 인증 공급자 로그아웃 책임 분리

Author: opficdev

Application/Data/Sources/Protocol/AuthenticationService.swift

@@ -9,7 +9,7 @@ import Foundation
 
 public protocol AuthenticationService {
     func signIn() async throws -> AuthDataResponse?
-    func signOut(_ uid: String) async throws
+    func signOut()
     func deleteAuth(_ uid: String) async throws
     func link(uid: String) async throws -> Bool
     func unlink(_ uid: String) async throws

Application/Data/Sources/Repository/AuthenticationRepositoryImpl.swift

@@ -64,29 +64,22 @@ final class AuthenticationRepositoryImpl: AuthenticationRepository {
     }
 
     func signOut() async throws {
-        guard let uid = authService.uid,
-              let providerID = try await authService.getProviderID(),
-              let provider = AuthProvider(rawValue: providerID)
-        else {
+        let providers = authService.providerIDs.compactMap { AuthProvider(rawValue: $0) }
+
+        do {
             try await authService.clearCurrentSession()
-            widgetSnapshotUpdater.clear()
-            return
+        } catch {
+            throw error.toDomain()
         }
 
-        do {
+        for provider in providers {
             switch provider {
             case .apple:
-                try await appleAuthService.signOut(uid)
+                appleAuthService.signOut()
             case .github:
-                try await githubAuthService.signOut(uid)
+                githubAuthService.signOut()
             case .google:
-                try await googleAuthService.signOut(uid)
-            }
-        } catch {
-            if case AuthError.notAuthenticated = error.toDomain() {
-                try await authService.clearCurrentSession()
-            } else {
-                throw error.toDomain()
+                googleAuthService.signOut()
             }
         }
 

Application/Data/Tests/Repository/AuthenticationRepositoryImplTests.swift

@@ -44,17 +44,46 @@ struct AuthenticationRepositoryImplTests {
         ])
     }
 
-    @Test("Apple 로그아웃은 provider 로그아웃 뒤 위젯 데이터를 정리한다")
-    func Apple_로그아웃은_provider_로그아웃_뒤_위젯_데이터를_정리한다() async throws {
+    @Test("로그아웃은 공통 세션 정리 후 연결된 모든 provider 세션과 위젯 데이터를 정리한다")
+    func 로그아웃은_공통_세션_정리_후_연결된_모든_provider_세션과_위젯_데이터를_정리한다() async throws {
         let fixture = makeAuthenticationRepositoryFixture(
             uid: "user-id",
-            providerID: "apple.com"
+            providerIDs: ["apple.com", "github.com", "google.com"]
         )
 
         try await fixture.repository.signOut()
 
         #expect(fixture.events.values() == [
+            "auth.clearCurrentSession",
             "apple.signOut",
+            "github.signOut",
+            "google.signOut",
+            "widget.clear"
+        ])
+    }
+
+    @Test("공통 세션 정리 실패는 provider 세션과 위젯 데이터를 정리하지 않고 오류를 전달한다")
+    func 공통_세션_정리_실패는_provider_세션과_위젯_데이터를_정리하지_않고_오류를_전달한다() async {
+        let fixture = makeAuthenticationRepositoryFixture(
+            uid: "user-id",
+            providerIDs: ["apple.com", "github.com", "google.com"],
+            clearCurrentSessionError: AuthenticationRepositoryTestError.clearCurrentSession
+        )
+
+        await #expect(throws: AuthenticationRepositoryTestError.clearCurrentSession) {
+            try await fixture.repository.signOut()
+        }
+        #expect(fixture.events.values() == ["auth.clearCurrentSession"])
+    }
+
+    @Test("provider 목록이 없어도 공통 세션과 위젯 데이터를 정리한다")
+    func provider_목록이_없어도_공통_세션과_위젯_데이터를_정리한다() async throws {
+        let fixture = makeAuthenticationRepositoryFixture(uid: "user-id")
+
+        try await fixture.repository.signOut()
+
+        #expect(fixture.events.values() == [
+            "auth.clearCurrentSession",
             "widget.clear"
         ])
     }
@@ -98,14 +127,16 @@ struct AuthenticationRepositoryImplTests {
         providerID: String? = nil,
         providerIDs: [String] = [],
         signInResult: Result<AuthDataResponse?, Error> = .success(nil),
-        deleteCurrentUserError: Error? = nil
+        deleteCurrentUserError: Error? = nil,
+        clearCurrentSessionError: Error? = nil
     ) -> AuthenticationRepositoryFixture {
         let events = AuthenticationRepositoryEventRecorder()
         let authService = AuthenticationRepositoryAuthServiceSpy(
             uid: uid,
             providerID: providerID,
             providerIDs: providerIDs,
             deleteCurrentUserError: deleteCurrentUserError,
+            clearCurrentSessionError: clearCurrentSessionError,
             events: events
         )
         let appleAuthService = AuthenticationServiceSpy(
@@ -149,6 +180,7 @@ private struct AuthenticationRepositoryFixture {
 }
 
 private enum AuthenticationRepositoryTestError: Error, Equatable {
+    case clearCurrentSession
     case requiresRecentLogin
 }
 
@@ -171,6 +203,7 @@ final class AuthenticationRepositoryAuthServiceSpy: AuthService {
     private let subject: CurrentValueSubject<Bool, Never>
     private let providerID: String?
     private let deleteCurrentUserError: Error?
+    private let clearCurrentSessionError: Error?
     private let events: AuthenticationRepositoryEventRecorder
 
     var uid: String?
@@ -183,13 +216,15 @@ final class AuthenticationRepositoryAuthServiceSpy: AuthService {
         providerIDs: [String],
         providerCount: Int? = nil,
         deleteCurrentUserError: Error? = nil,
+        clearCurrentSessionError: Error? = nil,
         events: AuthenticationRepositoryEventRecorder
     ) {
         self.uid = uid
         self.providerID = providerID
         self.providerIDs = providerIDs
         self.providerCount = providerCount ?? providerIDs.count
         self.deleteCurrentUserError = deleteCurrentUserError
+        self.clearCurrentSessionError = clearCurrentSessionError
         self.events = events
         self.subject = CurrentValueSubject<Bool, Never>(uid != nil)
     }
@@ -223,10 +258,13 @@ final class AuthenticationRepositoryAuthServiceSpy: AuthService {
 
     func clearCurrentSession() async throws {
         events.record("auth.clearCurrentSession")
+        if let clearCurrentSessionError {
+            throw clearCurrentSessionError
+        }
     }
 }
 
-actor AuthenticationServiceSpy: AuthenticationService {
+final class AuthenticationServiceSpy: AuthenticationService {
     private let provider: String
     private let signInResult: Result<AuthDataResponse?, Error>
     private let linkResult: Result<Bool, Error>
@@ -252,7 +290,7 @@ actor AuthenticationServiceSpy: AuthenticationService {
         return try signInResult.get()
     }
 
-    func signOut(_ uid: String) async throws {
+    func signOut() {
         events.record("\(provider).signOut")
     }
 

Application/Infra/Sources/Service/AuthServiceImpl.swift

@@ -119,6 +119,11 @@ final class AuthServiceImpl: AuthService {
     func clearCurrentSession() async throws {
         logger.info("Clearing current auth session")
 
+        if let uid {
+            let infoRef = store.document(FirestorePath.userData(uid, document: .tokens))
+            try? await infoRef.updateData(["fcmToken": FieldValue.delete()])
+        }
+
         do {
             if messaging.fcmToken != nil {
                 try await messaging.deleteToken()

Application/Infra/Sources/Service/SocialLogin/AppleAuthenticationServiceImpl.swift

@@ -7,8 +7,6 @@
 
 import AuthenticationServices
 import FirebaseAuth
-import FirebaseFirestore
-import FirebaseMessaging
 import Foundation
 import Core
 import Data
@@ -19,7 +17,6 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
 
         enum Code: Int {
             case signIn = 1
-            case signOut
             case deleteAuth
             case link
             case unlink
@@ -28,8 +25,6 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
 
     private var appleSignInDelegate: AppleSignInDelegate?
     private var appleSignInContinuation: CheckedContinuation<ASAuthorization, Error>?
-    private let store = FirebaseConfiguration.firestore
-    private let messaging = Messaging.messaging()
     private var user: User? { Auth.auth().currentUser }
     private let logger = Logger(category: "AppleAuthService")
 
@@ -65,26 +60,7 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
         }
     }
 
-    func signOut(_ uid: String) async throws {
-        do {
-            let infoRef = store.document(FirestorePath.userData(uid, document: .tokens))
-            try? await infoRef.updateData(["fcmToken": FieldValue.delete()])
-
-            if messaging.fcmToken != nil {
-                do {
-                    try await messaging.deleteToken()
-                } catch {
-                    logger.error("Failed to delete FCM token while signing out with Apple", error: error)
-                }
-            }
-
-            try Auth.auth().signOut()
-        } catch {
-            logger.error("Failed to sign out with Apple", error: error)
-            record(error, code: .signOut)
-            throw error
-        }
-    }
+    func signOut() { }
 
     func deleteAuth(_ uid: String) async throws {
         do {

Application/Infra/Sources/Service/SocialLogin/GithubAuthenticationServiceImpl.swift

@@ -6,8 +6,6 @@
 //
 
 import FirebaseAuth
-import FirebaseFirestore
-import FirebaseMessaging
 import Core
 import Data
 
@@ -17,15 +15,12 @@ final class GithubAuthenticationServiceImpl: AuthenticationService {
 
         enum Code: Int {
             case signIn = 1
-            case signOut
             case deleteAuth
             case link
             case unlink
         }
     }
 
-    private let store = FirebaseConfiguration.firestore
-    private let messaging = Messaging.messaging()
     private var user: User? { Auth.auth().currentUser }
     private let logger = Logger(category: "GithubAuthService")
 
@@ -58,26 +53,7 @@ final class GithubAuthenticationServiceImpl: AuthenticationService {
         }
     }
 
-    func signOut(_ uid: String) async throws {
-        do {
-            let infoRef = store.document(FirestorePath.userData(uid, document: .tokens))
-            try? await infoRef.updateData(["fcmToken": FieldValue.delete()])
-
-            if messaging.fcmToken != nil {
-                do {
-                    try await messaging.deleteToken()
-                } catch {
-                    logger.error("Failed to delete FCM token while signing out with GitHub", error: error)
-                }
-            }
-
-            try Auth.auth().signOut()
-        } catch {
-            logger.error("Failed to sign out with GitHub", error: error)
-            record(error, code: .signOut)
-            throw error
-        }
-    }
+    func signOut() { }
 
     func deleteAuth(_ uid: String) async throws {
         do {

Application/Infra/Sources/Service/SocialLogin/GoogleAuthenticationServiceImpl.swift

@@ -6,8 +6,6 @@
 //
 
 import FirebaseAuth
-import FirebaseFirestore
-import FirebaseMessaging
 import Foundation
 import GoogleSignIn
 import Core
@@ -19,15 +17,12 @@ final class GoogleAuthenticationServiceImpl: AuthenticationService {
 
         enum Code: Int {
             case signIn = 1
-            case signOut
             case deleteAuth
             case link
             case unlink
         }
     }
 
-    private let store = FirebaseConfiguration.firestore
-    private let messaging = Messaging.messaging()
     private var user: User? { Auth.auth().currentUser }
     private let logger = Logger(category: "GoogleAuthService")
 
@@ -59,26 +54,8 @@ final class GoogleAuthenticationServiceImpl: AuthenticationService {
         }
     }
 
-    func signOut(_ uid: String) async throws {
-        do {
-            let infoRef = store.document(FirestorePath.userData(uid, document: .tokens))
-            try? await infoRef.updateData(["fcmToken": FieldValue.delete()])
-
-            if messaging.fcmToken != nil {
-                do {
-                    try await messaging.deleteToken()
-                } catch {
-                    logger.error("Failed to delete FCM token while signing out with Google", error: error)
-                }
-            }
-
-            try Auth.auth().signOut()
-            GIDSignIn.sharedInstance.signOut()
-        } catch {
-            logger.error("Failed to sign out with Google", error: error)
-            record(error, code: .signOut)
-            throw error
-        }
+    func signOut() {
+        GIDSignIn.sharedInstance.signOut()
     }
 
     func deleteAuth(_ uid: String) async throws {