Ensure name is updated after anonymous account linking

StanfordSpezi · Jun 11, 2024 · faef99a · faef99a
1 parent f05c859
commit faef99a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/Sources/SpeziFirebaseAccount/Account Services/FirebaseAccountService.swift b/Sources/SpeziFirebaseAccount/Account Services/FirebaseAccountService.swift
@@ -113,10 +113,7 @@ extension FirebaseAccountService {
             }
 
             if let name = modifications.modifiedDetails.name {
-                Self.logger.debug("Creating change request for updated display name.")
-                let changeRequest = currentUser.createProfileChangeRequest()
-                changeRequest.displayName = name.formatted(.name(style: .long))
-                try await changeRequest.commitChanges()
+                try await updateDisplayName(of: currentUser, name)
             }
 
             // None of the above requests will trigger our state change listener, therefore, we just call it manually.
@@ -129,4 +126,11 @@ extension FirebaseAccountService {
             throw FirebaseAccountError.unknown(.internalError)
         }
     }
+
+    func updateDisplayName(of user: User, _ name: PersonNameComponents) async throws {
+        Self.logger.debug("Creating change request for updated display name.")
+        let changeRequest = user.createProfileChangeRequest()
+        changeRequest.displayName = name.formatted(.name(style: .long))
+        try await changeRequest.commitChanges()
+    }
 }
diff --git a/Sources/SpeziFirebaseAccount/Account Services/FirebaseEmailPasswordAccountService.swift b/Sources/SpeziFirebaseAccount/Account Services/FirebaseEmailPasswordAccountService.swift
@@ -93,6 +93,10 @@ actor FirebaseEmailPasswordAccountService: UserIdPasswordAccountService, Firebas
                 Self.logger.debug("Linking email-password credentials with current anonymous user account ...")
                 let result = try await currentUser.link(with: credential)
 
+                if let displayName = signupDetails.name {
+                    try await updateDisplayName(of: currentUser, displayName)
+                }
+
                 try await context.notifyUserSignIn(user: currentUser, for: self, isNewUser: true)
 
                 return
@@ -105,10 +109,7 @@ actor FirebaseEmailPasswordAccountService: UserIdPasswordAccountService, Firebas
             try await authResult.user.sendEmailVerification()
 
             if let displayName = signupDetails.name {
-                Self.logger.debug("Creating change request for display name.")
-                let changeRequest = authResult.user.createProfileChangeRequest()
-                changeRequest.displayName = displayName.formatted(.name(style: .medium))
-                try await changeRequest.commitChanges()
+                try await updateDisplayName(of: authResult.user, displayName)
             }
         }
     }

diff --git a/Tests/UITests/TestAppUITests/FirebaseClient.swift b/Tests/UITests/TestAppUITests/FirebaseClient.swift
@@ -51,7 +51,7 @@ struct FirestoreAccount: Decodable, Equatable {
 
 
 enum FirebaseClient {
-    private static let projectId = "spezifirebaseuitests"
+    private static let projectId = "nams-e43ed"
 
     // curl -H "Authorization: Bearer owner" -X DELETE http://localhost:9099/emulator/v1/projects/spezifirebaseuitests/accounts
     static func deleteAllAccounts() async throws {