Skip to content

Passkey new finalize enrollment #15163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

/// The GCIP endpoint for finalizePasskeyEnrollment rpc
private let finalizePasskeyEnrollmentEndPoint = "accounts/passkeyEnrollment:finalize"

@available(iOS 15.0, macOS 12.0, tvOS 16.0, *)
class FinalizePasskeyEnrollmentRequest: IdentityToolkitRequest, AuthRPCRequest {
typealias Response = FinalizePasskeyEnrollmentResponse

/// The raw user access token.
let idToken: String
/// The passkey name.
let name: String
/// The credential ID.
let credentialID: String
/// The CollectedClientData object from the authenticator.
let clientDataJSON: String
/// The attestation object from the authenticator.
let attestationObject: String

init(idToken: String,
name: String,
credentialID: String,
clientDataJSON: String,
attestationObject: String,
requestConfiguration: AuthRequestConfiguration) {
self.idToken = idToken
self.name = name
self.credentialID = credentialID
self.clientDataJSON = clientDataJSON
self.attestationObject = attestationObject
super.init(
endpoint: finalizePasskeyEnrollmentEndPoint,
requestConfiguration: requestConfiguration,
useIdentityPlatform: true
)
}

var unencodedHTTPRequestBody: [String: AnyHashable]? {
var postBody: [String: AnyHashable] = [
"idToken": idToken,
"name": name,
]
let authAttestationResponse: [String: AnyHashable] = [
"clientDataJSON": clientDataJSON,
"attestationObject": attestationObject,
]
let authRegistrationResponse: [String: AnyHashable] = [
"id": credentialID,
"response": authAttestationResponse,
]
postBody["authenticatorRegistrationResponse"] = authRegistrationResponse
if let tenantId = tenantID {
postBody["tenantId"] = tenantId
}
return postBody
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

import Foundation

@available(iOS 15.0, macOS 12.0, tvOS 16.0, *)
struct FinalizePasskeyEnrollmentResponse: AuthRPCResponse {
/// The user raw access token.
let idToken: String
/// Refresh token for the authenticated user.
let refreshToken: String

init(dictionary: [String: AnyHashable]) throws {
guard
let idToken = dictionary["idToken"] as? String,
let refreshToken = dictionary["refreshToken"] as? String
else {
throw AuthErrorUtils.unexpectedResponse(deserializedResponse: dictionary)
}
self.idToken = idToken
self.refreshToken = refreshToken
}
}
27 changes: 27 additions & 0 deletions FirebaseAuth/Sources/Swift/User/User.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,33 @@ extension User: NSSecureCoding {}
)
return registrationRequest
}

/// Finalize the passkey enrollment with the platfrom public key credential.
/// - Parameter platformCredential: The name for the passkey to be created.
@available(iOS 15.0, macOS 12.0, tvOS 16.0, *)
public func finalizePasskeyEnrollment(withPlatformCredential platformCredential: ASAuthorizationPlatformPublicKeyCredentialRegistration) async throws
-> AuthDataResult {
let credentialID = platformCredential.credentialID.base64EncodedString()
let clientDataJSON = platformCredential.rawClientDataJSON.base64EncodedString()
let attestationObject = platformCredential.rawAttestationObject!.base64EncodedString()

let request = FinalizePasskeyEnrollmentRequest(
idToken: rawAccessToken(),
name: passkeyName ?? "Unnamed account (Apple)",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would have already set this in start, do we really need to this check again?

Copy link
Contributor Author

@srushtisv srushtisv Jul 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in this case, since passkeyName is an optional string, we either need to provide a default value like this, or force-unwrap using '!' to abort execution if the optional value contains nil. There's no compiler guarantee that startEnrollment would be called and will set the passkeyName. Although, we can add guard else throw{..} in the beginning to confirm that passkeyName is set but as we know in the passkey flow, finalizePasskeyEnrollment will always be called after startPasskeyEnrollment hence I didnt use an explicit error handling here and used the default name which could be the only case where passkeyName is nil. Please let me know if I should add a guard statement here also, in that case we can remove "Unnamed account (Apple)" from here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's okay if we need to keep it, you can update this to use the same constant as you used in the StartEnrollment flow once you merge

credentialID: credentialID,
clientDataJSON: clientDataJSON,
attestationObject: attestationObject,
requestConfiguration: auth!.requestConfiguration
)
let response = try await backend.call(with: request)
let user = try await auth!.completeSignIn(
withAccessToken: response.idToken,
accessTokenExpirationDate: nil,
refreshToken: response.refreshToken,
anonymous: false
)
return AuthDataResult(withUser: user, additionalUserInfo: nil)
}
#endif

// MARK: Internal implementations below
Expand Down
114 changes: 114 additions & 0 deletions FirebaseAuth/Tests/Unit/FinalizePasskeyEnrollmentRequestTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#if os(iOS) || os(tvOS) || os(macOS)

@testable import FirebaseAuth
import FirebaseCore
import Foundation
import XCTest

@available(iOS 15.0, macOS 12.0, tvOS 16.0, *)
class FinalizePasskeyEnrollmentRequestTests: XCTestCase {
private var request: FinalizePasskeyEnrollmentRequest!
private var fakeConfig: AuthRequestConfiguration!

override func setUp() {
super.setUp()
fakeConfig = AuthRequestConfiguration(
apiKey: "FAKE_API_KEY",
appID: "FAKE_APP_ID"
)
}

override func tearDown() {
request = nil
fakeConfig = nil
super.tearDown()
}

func testInitWithValidParameters() {
request = FinalizePasskeyEnrollmentRequest(
idToken: "ID_TOKEN",
name: "MyPasskey",
credentialID: "CRED_ID",
clientDataJSON: "CLIENT_JSON",
attestationObject: "ATTEST_OBJ",
requestConfiguration: fakeConfig
)

XCTAssertEqual(request.idToken, "ID_TOKEN")
XCTAssertEqual(request.name, "MyPasskey")
XCTAssertEqual(request.credentialID, "CRED_ID")
XCTAssertEqual(request.clientDataJSON, "CLIENT_JSON")
XCTAssertEqual(request.attestationObject, "ATTEST_OBJ")
XCTAssertEqual(request.endpoint, "accounts/passkeyEnrollment:finalize")
XCTAssertTrue(request.useIdentityPlatform)
}

func testUnencodedHTTPRequestBodyWithoutTenantId() {
request = FinalizePasskeyEnrollmentRequest(
idToken: "ID_TOKEN",
name: "MyPasskey",
credentialID: "CRED_ID",
clientDataJSON: "CLIENT_JSON",
attestationObject: "ATTEST_OBJ",
requestConfiguration: fakeConfig
)

let body = request.unencodedHTTPRequestBody
XCTAssertNotNil(body)
XCTAssertEqual(body?["idToken"] as? String, "ID_TOKEN")
XCTAssertEqual(body?["name"] as? String, "MyPasskey")

let authReg = body?["authenticatorRegistrationResponse"] as? [String: AnyHashable]
XCTAssertNotNil(authReg)
XCTAssertEqual(authReg?["id"] as? String, "CRED_ID")

let authResp = authReg?["response"] as? [String: AnyHashable]
XCTAssertEqual(authResp?["clientDataJSON"] as? String, "CLIENT_JSON")
XCTAssertEqual(authResp?["attestationObject"] as? String, "ATTEST_OBJ")

XCTAssertNil(body?["tenantId"])
}

func testUnencodedHTTPRequestBodyWithTenantId() {
// setting up fake auth to set tenantId
let options = FirebaseOptions(googleAppID: "0:0000000000000:ios:0000000000000000",
gcmSenderID: "00000000000000000-00000000000-000000000")
options.apiKey = AuthTests.kFakeAPIKey
options.projectID = "myProjectID"
let name = "test-AuthTests\(AuthTests.testNum)"
AuthTests.testNum = AuthTests.testNum + 1
let fakeAuth = Auth(app: FirebaseApp(instanceWithName: name, options: options))
fakeAuth.tenantID = "TEST_TENANT"
let configWithTenant = AuthRequestConfiguration(
apiKey: "FAKE_API_KEY",
appID: "FAKE_APP_ID",
auth: fakeAuth
)
request = FinalizePasskeyEnrollmentRequest(
idToken: "ID_TOKEN",
name: "MyPasskey",
credentialID: "CRED_ID",
clientDataJSON: "CLIENT_JSON",
attestationObject: "ATTEST_OBJ",
requestConfiguration: configWithTenant
)
let body = request.unencodedHTTPRequestBody
XCTAssertEqual(body?["tenantId"] as? String, "TEST_TENANT")
}
}

#endif
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
// Copyright 2025 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#if os(iOS) || os(tvOS) || os(macOS)

@testable import FirebaseAuth
import XCTest

@available(iOS 15.0, macOS 12.0, tvOS 16.0, *)
class FinalizePasskeyEnrollmentResponseTests: XCTestCase {
private func makeValidDictionary() -> [String: AnyHashable] {
return [
"idToken": "FAKE_ID_TOKEN" as AnyHashable,
"refreshToken": "FAKE_REFRESH_TOKEN" as AnyHashable,
]
}

func testInitWithValidDictionary() throws {
let response = try FinalizePasskeyEnrollmentResponse(
dictionary: makeValidDictionary()
)
XCTAssertEqual(response.idToken, "FAKE_ID_TOKEN")
XCTAssertEqual(response.refreshToken, "FAKE_REFRESH_TOKEN")
}

func testInitWithMissingIdTokenThrowsError() {
var dict = makeValidDictionary()
dict.removeValue(forKey: "idToken")
XCTAssertThrowsError(
try FinalizePasskeyEnrollmentResponse(dictionary: dict)
)
}

func testInitWithMissingRefreshTokenThrowsError() {
var dict = makeValidDictionary()
dict.removeValue(forKey: "refreshToken")
XCTAssertThrowsError(
try FinalizePasskeyEnrollmentResponse(dictionary: dict)
)
}

func testInitWithEmptyDictionaryThrowsError() {
XCTAssertThrowsError(
try FinalizePasskeyEnrollmentResponse(dictionary: [:])
)
}
}

#endif
Loading