[#619] FCM Token을 해제하지 못할 시 로그아웃에 실패하는 현상을 해결한다 (#622)

Author: opficdev

Application/DevLogData/Sources/Common/DataLayerError.swift

@@ -5,7 +5,6 @@
 //  Created by opfic on 3/11/26.
 //
 
-import AuthenticationServices
 import Foundation
 import DevLogCore
 
@@ -48,17 +47,3 @@ public enum DataLayerError: Error {
     case notAuthenticated
     case linkCredentialAlreadyInUse
 }
-
-public extension Error {
-    var isSocialLoginCancelled: Bool {
-        switch self {
-        case let authError as ASAuthorizationError:
-            return authError.code == .canceled
-        case let webAuthError as ASWebAuthenticationSessionError:
-            return webAuthError.code == .canceledLogin
-        default:
-            let nsError = self as NSError
-            return nsError.domain == "com.google.GIDSignIn" && nsError.code == -5
-        }
-    }
-}

Application/DevLogData/Sources/Protocol/AuthenticationService.swift

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

Application/DevLogData/Sources/Repository/AuthDataRepositoryImpl.swift

@@ -37,7 +37,7 @@ final class AuthDataRepositoryImpl: AuthDataRepository {
         return providerStrings.compactMap { AuthProvider(rawValue: $0) }
     }
 
-    func linkProvider(_ provider: AuthProvider) async throws {
+    func linkProvider(_ provider: AuthProvider) async throws -> Bool {
         guard let uid = authService.uid,
               let email = authService.currentUserEmail else {
             throw AuthError.notAuthenticated
@@ -54,7 +54,7 @@ final class AuthDataRepositoryImpl: AuthDataRepository {
         }
 
         do {
-            try await service.link(uid: uid, email: email)
+            return try await service.link(uid: uid, email: email)
         } catch {
             throw mapLinkError(error)
         }

Application/DevLogData/Sources/Repository/AuthenticationRepositoryImpl.swift

@@ -31,11 +31,11 @@ final class AuthenticationRepositoryImpl: AuthenticationRepository {
         self.widgetSnapshotUpdater = widgetSnapshotUpdater
     }
 
-    func signIn(_ provider: AuthProvider) async throws {
+    func signIn(_ provider: AuthProvider) async throws -> Bool {
         authService.beginSignIn()
 
         do {
-            let response: AuthDataResponse
+            let response: AuthDataResponse?
             switch provider {
             case .apple:
                 response = try await appleAuthService.signIn()
@@ -45,8 +45,14 @@ final class AuthenticationRepositoryImpl: AuthenticationRepository {
                 response = try await googleAuthService.signIn()
             }
 
+            guard let response else {
+                authService.cancelSignIn()
+                return false
+            }
+
             try await userService.upsertUser(response)
             authService.completeSignIn()
+            return true
         } catch {
             if authService.uid != nil {
                 try? await authService.clearCurrentSession()

Application/DevLogDomain/Sources/Protocol/AuthDataRepository.swift

@@ -13,7 +13,7 @@ public protocol AuthDataRepository {
     func fetchAllProviders() async throws -> [AuthProvider]
 
     /// 특정 프로바이더를 계정에 연결합니다
-    func linkProvider(_ provider: AuthProvider) async throws
+    func linkProvider(_ provider: AuthProvider) async throws -> Bool
 
     /// 특정 프로바이더를 계정에서 해제합니다
     func unlinkProvider(_ provider: AuthProvider) async throws

Application/DevLogDomain/Sources/Protocol/AuthenticationRepository.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 public protocol AuthenticationRepository {
-    func signIn(_ provider: AuthProvider) async throws
+    func signIn(_ provider: AuthProvider) async throws -> Bool
     func signOut() async throws
     func restore() -> Bool
     func delete() async throws

Application/DevLogDomain/Sources/UseCase/Auth/Provider/LinkAuthProviderUseCase.swift

@@ -6,5 +6,5 @@
 //
 
 public protocol LinkAuthProviderUseCase {
-    func execute(_ provider: AuthProvider) async throws
+    func execute(_ provider: AuthProvider) async throws -> Bool
 }

Application/DevLogDomain/Sources/UseCase/Auth/Provider/LinkAuthProviderUseCaseImpl.swift

@@ -12,7 +12,7 @@ public final class LinkAuthProviderUseCaseImpl: LinkAuthProviderUseCase {
         self.repository = repository
     }
 
-    public func execute(_ provider: AuthProvider) async throws {
+    public func execute(_ provider: AuthProvider) async throws -> Bool {
         try await repository.linkProvider(provider)
     }
 }

Application/DevLogDomain/Sources/UseCase/Auth/SignIn/SignInUseCase.swift

@@ -6,5 +6,5 @@
 //
 
 public protocol SignInUseCase {
-    func execute(_ provider: AuthProvider) async throws
+    func execute(_ provider: AuthProvider) async throws -> Bool
 }

Application/DevLogDomain/Sources/UseCase/Auth/SignIn/SignInUseCaseImpl.swift

@@ -12,7 +12,7 @@ public final class SignInUseCaseImpl: SignInUseCase {
         self.repository = repository
     }
 
-    public func execute(_ provider: AuthProvider) async throws {
+    public func execute(_ provider: AuthProvider) async throws -> Bool {
         try await repository.signIn(provider)
     }
 }