Skip to content

Commit b6f1fe8

Browse files
committed
resolving comments in user.swift
1 parent bf88537 commit b6f1fe8

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

FirebaseAuth/Sources/Swift/User/User.swift

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,7 @@ extension User: NSSecureCoding {}
10581058
/// A cached passkey name being passed from startPasskeyEnrollment(withName:) call and consumed
10591059
/// at finalizePasskeyEnrollment(withPlatformCredential:) call
10601060
private var passkeyName: String?
1061+
private let defaultPasskeyName: String = "Unnamed account (Apple)"
10611062

10621063
/// Start the passkey enrollment creating a plaform public key creation request with the
10631064
/// challenge from GCIP backend.
@@ -1077,7 +1078,12 @@ extension User: NSSecureCoding {}
10771078
requestConfiguration: requestConfiguration
10781079
)
10791080
let response = try await backend.call(with: request)
1080-
passkeyName = (name?.isEmpty ?? true) ? "Unnamed account (Apple)" : name!
1081+
guard let passkeyName = (name?.isEmpty ?? true) ? defaultPasskeyName : name
1082+
else { throw NSError(
1083+
domain: AuthErrorDomain,
1084+
code: AuthErrorCode.internalError.rawValue,
1085+
userInfo: [NSLocalizedDescriptionKey: "Failed to unwrap passkey name"]
1086+
) }
10811087
guard let challengeInData = Data(base64Encoded: response.challenge) else {
10821088
throw NSError(
10831089
domain: AuthErrorDomain,
@@ -1095,12 +1101,11 @@ extension User: NSSecureCoding {}
10951101
let provider = ASAuthorizationPlatformPublicKeyCredentialProvider(
10961102
relyingPartyIdentifier: response.rpID
10971103
)
1098-
let registrationRequest = provider.createCredentialRegistrationRequest(
1104+
return provider.createCredentialRegistrationRequest(
10991105
challenge: challengeInData,
1100-
name: passkeyName ?? "Unnamed account (Apple)",
1106+
name: passkeyName,
11011107
userID: userIdInData
11021108
)
1103-
return registrationRequest
11041109
}
11051110
#endif
11061111

0 commit comments

Comments
 (0)