fix the unit tests

firebase · Apr 2, 2024 · f4497cd · f4497cd
1 parent a35b791
commit f4497cd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/FirebaseAuth/Sources/User/FIRUser.m b/FirebaseAuth/Sources/User/FIRUser.m
@@ -619,6 +619,11 @@ - (void)startPasskeyEnrollmentWithName:(nullable NSString *)name
                         // cached the passkey name.  This is needed when calling
                         // finalizePasskeyEnrollment
                         self.passkeyName = name;
+                        // If passkey name is not provided, we will provide a firebase formatted
+                        // default name.
+                        if (self.passkeyName == nil || [self.passkeyName isEqual:@""]) {
+                          self.passkeyName = @"Unnamed account (Apple)";
+                        }
                         NSData *challengeInData =
                             [[NSData alloc] initWithBase64EncodedString:response.challenge
                                                                 options:0];
@@ -631,7 +636,7 @@ - (void)startPasskeyEnrollmentWithName:(nullable NSString *)name
                         ASAuthorizationPlatformPublicKeyCredentialRegistrationRequest *request =
                             [provider
                                 createCredentialRegistrationRequestWithChallenge:challengeInData
-                                                                            name:name
+                                                                            name:self.passkeyName
                                                                           userID:userIdInData];
                         completion(request, nil);
                       }
@@ -654,10 +659,6 @@ - (void)finalizePasskeyEnrollmentWithPlatformCredential:
     NSString *attestationObject =
         [platformCredential.rawAttestationObject base64EncodedStringWithOptions:0];
 
-    // If passkey name is not provided, we will provide a firebase formatted default name.
-    if (self.passkeyName == nil || [self.passkeyName isEqual:@""]) {
-      self.passkeyName = @"Unnamed account (Apple)";
-    }
     FIRFinalizePasskeyEnrollmentRequest *request =
         [[FIRFinalizePasskeyEnrollmentRequest alloc] initWithIDToken:self.rawAccessToken
                                                                 name:self.passkeyName

diff --git a/FirebaseAuth/Tests/Unit/FIRUserTests.m b/FirebaseAuth/Tests/Unit/FIRUserTests.m
@@ -1027,6 +1027,9 @@ - (void)testStartPasskeyEnrollmentWithNilNameSuccess {
                                                                          XCTAssertEqualObjects(
                                                                              user.passkeyName,
                                                                              kDefaultPasskeyName);
+                                                                         XCTAssertEqualObjects(
+                                                                             request.name,
+                                                                             kDefaultPasskeyName);
                                                                          XCTAssertEqualObjects(
                                                                              [[request challenge]
                                                                                  base64EncodedStringWithOptions:
@@ -1083,11 +1086,15 @@ - (void)testStartPasskeyEnrollmentWithEmptyNameSuccess {
                                                                          XCTAssertEqualObjects(
                                                                              user.passkeyName,
                                                                              kDefaultPasskeyName);
+                                                                         XCTAssertEqualObjects(
+                                                                             request.name,
+                                                                             kDefaultPasskeyName);
                                                                          XCTAssertEqualObjects(
                                                                              [[request challenge]
                                                                                  base64EncodedStringWithOptions:
                                                                                      0],
                                                                              kChallenge);
+
                                                                          XCTAssertEqualObjects(
                                                                              [request
                                                                                  relyingPartyIdentifier],