@@ -1058,6 +1058,7 @@ extension User: NSSecureCoding {}
1058
1058
/// A cached passkey name being passed from startPasskeyEnrollment(withName:) call and consumed
1059
1059
/// at finalizePasskeyEnrollment(withPlatformCredential:) call
1060
1060
private var passkeyName : String ?
1061
+ private let defaultPasskeyName : String = " Unnamed account (Apple) "
1061
1062
1062
1063
/// Start the passkey enrollment creating a plaform public key creation request with the
1063
1064
/// challenge from GCIP backend.
@@ -1077,7 +1078,12 @@ extension User: NSSecureCoding {}
1077
1078
requestConfiguration: requestConfiguration
1078
1079
)
1079
1080
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
+ ) }
1081
1087
guard let challengeInData = Data ( base64Encoded: response. challenge) else {
1082
1088
throw NSError (
1083
1089
domain: AuthErrorDomain,
@@ -1095,12 +1101,11 @@ extension User: NSSecureCoding {}
1095
1101
let provider = ASAuthorizationPlatformPublicKeyCredentialProvider (
1096
1102
relyingPartyIdentifier: response. rpID
1097
1103
)
1098
- let registrationRequest = provider. createCredentialRegistrationRequest (
1104
+ return provider. createCredentialRegistrationRequest (
1099
1105
challenge: challengeInData,
1100
- name: passkeyName ?? " Unnamed account (Apple) " ,
1106
+ name: passkeyName,
1101
1107
userID: userIdInData
1102
1108
)
1103
- return registrationRequest
1104
1109
}
1105
1110
#endif
1106
1111
0 commit comments