Skip to content

[Auth] Restore MFA request setup to Firebase 10 behavior #13858

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.

Sign up for GitHub

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 2 commits into from
Oct 9, 2024
Merged

[Auth] Restore MFA request setup to Firebase 10 behavior #13858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
086f53f
[Auth] Restore MFA request setup to Firebase 10 behavior
ncooke3 Oct 9, 2024
777d7a6
Changelog
ncooke3 Oct 9, 2024
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
4 changes: 4 additions & 0 deletions FirebaseAuth/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased
- [Fixed] Restore Firebase 10 behavior by ignoring `nil` display names used
during multi factor enrollment. (#13856)

# 11.3.0
- [Fixed] Restore Firebase 10 behavior by querying with the
`kSecAttrSynchronizable` key when auth state is set to be shared across
Expand Down
10 changes: 5 additions & 5 deletions FirebaseAuth/Sources/Swift/Backend/RPC/MultiFactor/Enroll/FinalizeMFAEnrollmentRequest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ class FinalizeMFAEnrollmentRequest: IdentityToolkitRequest, AuthRPCRequest {
}
if let displayName = displayName {
body["displayName"] = displayName
if let phoneVerificationInfo {
body["phoneVerificationInfo"] = phoneVerificationInfo.dictionary
} else if let totpVerificationInfo {
body["totpVerificationInfo"] = totpVerificationInfo.dictionary
}
}
if let phoneVerificationInfo {
body["phoneVerificationInfo"] = phoneVerificationInfo.dictionary
} else if let totpVerificationInfo {
body["totpVerificationInfo"] = totpVerificationInfo.dictionary
}

if let tenantID = tenantID {
Expand Down
12 changes: 10 additions & 2 deletions FirebaseAuth/Tests/Unit/FinalizeMFAEnrollmentRequestTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,14 @@ class FinalizeMFAEnrollmentRequestTests: RPCBaseTests {
@brief Tests the Finalize MFA Enrollment using TOTP request.
*/
func testTOTPStartMFAEnrollmentRequest() async throws {
try await assertTOTPStartMFAEnrollmentRequest(displayName: "sparky")
}

func testTOTPStartMFAEnrollmentRequest_WhenDisplayNameIsNil() async throws {
try await assertTOTPStartMFAEnrollmentRequest(displayName: nil)
}

func assertTOTPStartMFAEnrollmentRequest(displayName: String?) async throws {
let kIDToken = "idToken"
let kDisplayName = "displayName"
let kSessionInfo = "sessionInfo"
Expand All @@ -40,7 +48,7 @@ class FinalizeMFAEnrollmentRequestTests: RPCBaseTests {
let requestInfo = AuthProtoFinalizeMFATOTPEnrollmentRequestInfo(sessionInfo: kSessionInfo,
verificationCode: kVerificationCode)
let request = FinalizeMFAEnrollmentRequest(idToken: kIDToken,
displayName: kDisplayName,
displayName: displayName,
totpVerificationInfo: requestInfo,
requestConfiguration: requestConfiguration)

Expand All @@ -55,7 +63,7 @@ class FinalizeMFAEnrollmentRequestTests: RPCBaseTests {
value: kIDToken
)
let requestDictionary = try XCTUnwrap(rpcIssuer.decodedRequest as? [String: AnyHashable])
XCTAssertEqual(requestDictionary[kDisplayName], kDisplayName)
XCTAssertEqual(requestDictionary[kDisplayName], displayName)
let totpInfo = try XCTUnwrap(requestDictionary[kTOTPVerificationInfo] as? [String: String])
XCTAssertEqual(totpInfo["verificationCode"], kVerificationCode)
XCTAssertNil(requestDictionary[kPhoneVerificationInfo])
Expand Down
Loading