fix: 여러 공급자가 링크된 유저인 경우 providers를 순회해서 링크를 끉도록 해결

Author: opficdev

DevLog/Data/Repository/AuthenticationRepositoryImpl.swift

@@ -63,20 +63,25 @@ final class AuthenticationRepositoryImpl: AuthenticationRepository {
     }
 
     func delete() async throws {
-        guard let uid = authService.uid,
-              let providerID = try await authService.getProviderID(),
-              let provider = AuthProvider(rawValue: providerID)
-        else {
+        guard let uid = authService.uid else {
             throw AuthError.notAuthenticated
         }
 
-        switch provider {
-        case .apple:
-            try await appleAuthService.deleteAuth(uid)
-        case .github:
-            try await githubAuthService.deleteAuth(uid)
-        case .google:
-            try await googleAuthService.deleteAuth(uid)
+        let providers = (authService.providerIDs ?? []).compactMap { AuthProvider(rawValue: $0) }
+
+        for provider in providers {
+            switch provider {
+            case .apple:
+                try await appleAuthService.deleteAuth(uid)
+            case .github:
+                try await githubAuthService.deleteAuth(uid)
+            case .google:
+                try await googleAuthService.deleteAuth(uid)
+            }
         }
+
+        try await authService.deleteFirestoreUserData(uid)
+        try await authService.deleteCurrentUser()
+        try await authService.clearCurrentSession()
     }
 }

DevLog/Infra/Service/AuthService.swift

@@ -7,9 +7,13 @@
 
 import FirebaseAuth
 import FirebaseFirestore
+import FirebaseFunctions
+import FirebaseMessaging
 
 final class AuthService {
     private let store = Firestore.firestore()
+    private let functions = Functions.functions(region: "asia-northeast3")
+    private let messaging = Messaging.messaging()
     private let logger = Logger(category: "AuthService")
 
     var uid: String? {
@@ -42,4 +46,29 @@ final class AuthService {
             throw error
         }
     }
+
+    func deleteFirestoreUserData(_ uid: String) async throws {
+        logger.info("Deleting Firestore user data. uid: \(uid)")
+
+        let deleteFunction = functions.httpsCallable("deleteUserFirestoreData")
+        _ = try await deleteFunction.call(["uid": uid])
+    }
+
+    func deleteCurrentUser() async throws {
+        logger.info("Deleting FirebaseAuth current user")
+
+        guard let currentUser = Auth.auth().currentUser else {
+            logger.warning("No current user to delete")
+            throw AuthError.notAuthenticated
+        }
+
+        try await currentUser.delete()
+    }
+
+    func clearCurrentSession() async throws {
+        logger.info("Clearing current auth session")
+
+        try await messaging.deleteToken()
+        try Auth.auth().signOut()
+    }
 }

DevLog/Infra/Service/SocialLogin/AppleAuthenticationService.swift

@@ -105,14 +105,6 @@ final class AppleAuthenticationService: AuthenticationService {
         let token = try await refreshAppleAccessToken()
 
         try await revokeAppleAccessToken(token: token)
-
-        let deleteFunction = functions.httpsCallable("deleteUserFirestoreData")
-
-        _ = try await deleteFunction.call(["uid": uid])
-
-        try await user?.delete()
-        try await messaging.deleteToken()
-        try Auth.auth().signOut()
     }
 
     func link(uid: String, email: String) async throws {

DevLog/Infra/Service/SocialLogin/GithubAuthenticationService.swift

@@ -82,14 +82,6 @@ final class GithubAuthenticationService: NSObject, AuthenticationService {
 
     func deleteAuth(_ uid: String) async throws {
         try await revokeAccessToken()
-
-        let deleteFunction = functions.httpsCallable("deleteUserFirestoreData")
-
-        _ = try await deleteFunction.call(["uid": uid])
-
-        try await user?.delete()
-        try await messaging.deleteToken()
-        try Auth.auth().signOut()
     }
 
     func link(uid: String, email: String) async throws {

DevLog/Infra/Service/SocialLogin/GoogleAuthenticationService.swift

@@ -78,15 +78,8 @@ final class GoogleAuthenticationService: AuthenticationService {
     }
 
     func deleteAuth(_ uid: String) async throws {
-        let deleteFunction = functions.httpsCallable("deleteUserFirestoreData")
-
-        _ = try await deleteFunction.call(["uid": uid])
-
-        try await user?.delete()
         GIDSignIn.sharedInstance.signOut()
         try await GIDSignIn.sharedInstance.disconnect()
-        try await messaging.deleteToken()
-        try Auth.auth().signOut()
     }
 
     func link(uid: String, email: String) async throws {