fix: fcmToken이 없어도 로그인을 성공하도록 수정

Author: opficdev

Application/DevLogData/Sources/DTO/AuthDataResponse.swift

@@ -14,7 +14,7 @@ public struct AuthDataResponse {
     public let email: String?
     public let providers: [String]
     public let providerID: String
-    public let fcmToken: String
+    public let fcmToken: String?
     public let accessToken: String?
 
     public init(
@@ -23,7 +23,7 @@ public struct AuthDataResponse {
         email: String?,
         providers: [String],
         providerID: String,
-        fcmToken: String,
+        fcmToken: String? = nil,
         accessToken: String? = nil
     ) {
         self.uid = uid

Application/DevLogInfra/Sources/Extension/FirebaseAuthUser+.swift

@@ -12,7 +12,7 @@ import DevLogData
 extension FirebaseAuth.User {
     func makeResponse(
         providerID: AuthProviderID,
-        fcmToken: String,
+        fcmToken: String? = nil,
         accessToken: String? = nil
     ) -> AuthDataResponse {
         return AuthDataResponse(

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

@@ -90,10 +90,8 @@ final class AppleAuthenticationServiceImpl: AuthenticationService {
                 try await result.user.link(with: appleCredential)
             }
 
-            let fcmToken = try await messaging.token()
-
             logger.info("Successfully signed in with Apple")
-            return result.user.makeResponse(providerID: .apple, fcmToken: fcmToken)
+            return result.user.makeResponse(providerID: .apple)
         } catch {
             logger.error("Failed to sign in with Apple", error: error)
             throw error

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

@@ -72,12 +72,9 @@ final class GithubAuthenticationServiceImpl: NSObject, AuthenticationService {
                 try await result.user.link(with: credential)
             }
 
-            let fcmToken = try await messaging.token()
-
             logger.info("Successfully signed in with GitHub")
             return result.user.makeResponse(
                 providerID: .gitHub,
-                fcmToken: fcmToken,
                 accessToken: accessToken
             )
         } catch {

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

@@ -51,10 +51,8 @@ final class GoogleAuthenticationServiceImpl: AuthenticationService {
                 try await changeRequest.commitChanges()
             }
 
-            let fcmToken = try await messaging.token()
-
             logger.info("Successfully signed in with Google")
-            return result.user.makeResponse(providerID: .google, fcmToken: fcmToken)
+            return result.user.makeResponse(providerID: .google)
         } catch {
             logger.error("Failed to sign in with Google", error: error)
             throw error

Application/DevLogInfra/Sources/Service/UserServiceImpl.swift

@@ -56,7 +56,11 @@ final class UserServiceImpl: UserService {
                 userField["createdAt"] = FieldValue.serverTimestamp()
             }
 
-            var settingField = ["fcmToken": response.fcmToken]
+            var settingField: [String: Any] = [:]
+
+            if let fcmToken = response.fcmToken {
+                settingField["fcmToken"] = fcmToken
+            }
 
             // 깃헙 로그인 시 추가 정보 저장
             if response.providerID == "github.com", let accessToken = response.accessToken {
@@ -73,7 +77,11 @@ final class UserServiceImpl: UserService {
                 merge: true
             )
             async let infoUpdate: Void = infoRef.setData(userFieldSnapshot, merge: true)
-            async let tokensUpdate: Void = tokensRef.setData(settingFieldSnapshot, merge: true)
+            async let tokensUpdate: Void? = {
+                guard !settingFieldSnapshot.isEmpty else { return nil }
+                try await tokensRef.setData(settingFieldSnapshot, merge: true)
+                return nil
+            }()
 
             let settingsDocument = try await settingsRef.getDocument()
             var settingsField: [String: Any] = [