Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
4 changes: 4 additions & 0 deletions FirebaseAuth/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased
- [fixed] Fix a `fatalError` unenrolling from MFA. An invalid user token now throws an
`invalidUserToken` error instead of crashing. (#14663)

# 11.9.0
- [changed] Using reCAPTCHA Enterprise and Firebase Auth requires reCAPTCHA
Enterprise 18.7.0 or later.
Expand Down
2 changes: 1 addition & 1 deletion FirebaseAuth/Sources/Swift/User/User.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ extension User: NSSecureCoding {}
anonymous: Bool) async throws -> User {
guard let accessToken = accessToken,
let refreshToken = refreshToken else {
fatalError("Internal FirebaseAuth Error: nil token")
throw AuthErrorUtils.invalidUserTokenError(message: "Invalid user token: accessToken or refreshToken is nil")
}
let tokenService = SecureTokenService(withRequestConfiguration: auth.requestConfiguration,
accessToken: accessToken,
Expand Down
17 changes: 17 additions & 0 deletions FirebaseAuth/Tests/Unit/UserTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1554,6 +1554,23 @@ class UserTests: RPCBaseTests {
}
#endif

func testRetrieveUserWithInvalidToken() async throws {
let auth = try XCTUnwrap(self.auth)
do {
_ = try await User.retrieveUser(
withAuth: auth,
accessToken: nil,
accessTokenExpirationDate: Date(),
refreshToken: nil,
anonymous: false
)
XCTFail("Expected an error to be thrown")
} catch let error as NSError {
XCTAssertEqual(error.domain, AuthErrors.domain)
XCTAssertEqual(error.code, AuthErrorCode.invalidUserToken.rawValue)
}
}

// MARK: Private helper functions

private func expectVerifyPhoneNumberRequest(isLink: Bool = false) {
Expand Down
Loading