diff --git a/FirebaseAuth/CHANGELOG.md b/FirebaseAuth/CHANGELOG.md index d321d14aebf5..6b0f356bdf99 100644 --- a/FirebaseAuth/CHANGELOG.md +++ b/FirebaseAuth/CHANGELOG.md @@ -4,6 +4,7 @@ - [added] Introduced the Swift enum `AuthProviderID` for the Auth Provider IDs. (#9236) - [deprecated] Swift APIs using `String`-typed `productID`s have been deprecated in favor of newly added API that leverages the `AuthProviderID` enum. +- [fixed] Breaking API: The `email` property in `ActionCodeInfo` is not non-optional. # 10.21.0 - [fixed] Fixed multifactor resolver to use the correct Auth instance instead of diff --git a/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift b/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift index 09fcac26a466..6341963455c3 100644 --- a/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift +++ b/FirebaseAuth/Sources/Swift/ActionCode/ActionCodeInfo.swift @@ -21,7 +21,7 @@ import Foundation /// The email address to which the code was sent. The new email address in the case of /// `ActionCodeOperation.recoverEmail`. - @objc public let email: String? + @objc public let email: String /// The email that is being recovered in the case of `ActionCodeOperation.recoverEmail`. @objc public let previousEmail: String? diff --git a/FirebaseAuth/Sources/Swift/Auth/Auth.swift b/FirebaseAuth/Sources/Swift/Auth/Auth.swift index 693e7257503c..46d39520201f 100644 --- a/FirebaseAuth/Sources/Swift/Auth/Auth.swift +++ b/FirebaseAuth/Sources/Swift/Auth/Auth.swift @@ -53,9 +53,7 @@ import FirebaseCoreExtension open func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) { - kAuthGlobalWorkQueue.sync { - self.tokenManager.cancel(withError: error) - } + self.tokenManagerGet().cancel(withError: error) } open func application(_ application: UIApplication, @@ -76,56 +74,51 @@ import FirebaseCoreExtension @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) extension Auth: AuthInterop { + func getTokenInternal(forcingRefresh forceRefresh: Bool) { + // Enable token auto-refresh if not already enabled. + if !self.autoRefreshTokens { + AuthLog.logInfo(code: "I-AUT000002", message: "Token auto-refresh enabled.") + self.autoRefreshTokens = true + self.scheduleAutoTokenRefresh() + +#if os(iOS) || os(tvOS) // TODO(ObjC): Is a similar mechanism needed on macOS? + self.applicationDidBecomeActiveObserver = + NotificationCenter.default.addObserver( + forName: UIApplication.didBecomeActiveNotification, + object: nil, queue: nil + ) { notification in + self.isAppInBackground = false + if !self.autoRefreshScheduled { + self.scheduleAutoTokenRefresh() + } + } + self.applicationDidEnterBackgroundObserver = + NotificationCenter.default.addObserver( + forName: UIApplication.didEnterBackgroundNotification, + object: nil, queue: nil + ) { notification in + self.isAppInBackground = true + } +#endif + } + } + /// Retrieves the Firebase authentication token, possibly refreshing it if it has expired. + /// TODO: Switch protocol and implementation to Swift when clients are all Swift. /// /// This method is not for public use. It is for Firebase clients of AuthInterop. @objc(getTokenForcingRefresh:withCallback:) public func getToken(forcingRefresh forceRefresh: Bool, - completion callback: @escaping (String?, Error?) -> Void) { - kAuthGlobalWorkQueue.async { [weak self] in - if let strongSelf = self { - // Enable token auto-refresh if not already enabled. - if !strongSelf.autoRefreshTokens { - AuthLog.logInfo(code: "I-AUT000002", message: "Token auto-refresh enabled.") - strongSelf.autoRefreshTokens = true - strongSelf.scheduleAutoTokenRefresh() - - #if os(iOS) || os(tvOS) // TODO(ObjC): Is a similar mechanism needed on macOS? - strongSelf.applicationDidBecomeActiveObserver = - NotificationCenter.default.addObserver( - forName: UIApplication.didBecomeActiveNotification, - object: nil, queue: nil - ) { notification in - if let strongSelf = self { - strongSelf.isAppInBackground = false - if !strongSelf.autoRefreshScheduled { - strongSelf.scheduleAutoTokenRefresh() - } - } - } - strongSelf.applicationDidEnterBackgroundObserver = - NotificationCenter.default.addObserver( - forName: UIApplication.didEnterBackgroundNotification, - object: nil, queue: nil - ) { notification in - if let strongSelf = self { - strongSelf.isAppInBackground = true - } - } - #endif - } - } - // Call back with 'nil' if there is no current user. - guard let strongSelf = self, let currentUser = strongSelf.currentUser else { - DispatchQueue.main.async { - callback(nil, nil) + completion: @escaping (String?, Error?) -> Void) { + Task { + do { + let token = try await authWorker.getToken(forcingRefresh: forceRefresh) + await MainActor.run { + completion(token, nil) } - return - } - // Call back with current user token. - currentUser.internalGetToken(forceRefresh: forceRefresh) { token, error in - DispatchQueue.main.async { - callback(token, error) + } catch { + await MainActor.run { + completion(nil, error) } } } @@ -179,14 +172,10 @@ extension Auth: AuthInterop { /// The string used to set this property must be a language code that follows BCP 47. @objc open var languageCode: String? { get { - kAuthGlobalWorkQueue.sync { - requestConfiguration.languageCode - } + self.getLanguageCode() } set(val) { - kAuthGlobalWorkQueue.sync { - requestConfiguration.languageCode = val - } + self.setLanguageCode(val) } } @@ -213,60 +202,6 @@ extension Auth: AuthInterop { /// this domain when signing in. This domain must be allowlisted in the Firebase Console. @objc open var customAuthDomain: String? - /// Sets the `currentUser` on the receiver to the provided user object. - /// - Parameters: - /// - user: The user object to be set as the current user of the calling Auth instance. - /// - completion: Optionally; a block invoked after the user of the calling Auth instance has - /// been updated or an error was encountered. - @objc open func updateCurrentUser(_ user: User?, completion: ((Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - guard let user else { - let error = AuthErrorUtils.nullUserError(message: nil) - Auth.wrapMainAsync(completion, error) - return - } - let updateUserBlock: (User) -> Void = { user in - do { - try self.updateCurrentUser(user, byForce: true, savingToDisk: true) - Auth.wrapMainAsync(completion, nil) - } catch { - Auth.wrapMainAsync(completion, error) - } - } - if user.requestConfiguration.apiKey != self.requestConfiguration.apiKey { - // If the API keys are different, then we need to confirm that the user belongs to the same - // project before proceeding. - user.requestConfiguration = self.requestConfiguration - user.reload { error in - if let error { - Auth.wrapMainAsync(completion, error) - return - } - updateUserBlock(user) - } - } else { - updateUserBlock(user) - } - } - } - - /// Sets the `currentUser` on the receiver to the provided user object. - /// - Parameter user: The user object to be set as the current user of the calling Auth instance. - /// - Parameter completion: Optionally; a block invoked after the user of the calling Auth - /// instance has been updated or an error was encountered. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) - open func updateCurrentUser(_ user: User) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.updateCurrentUser(user) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } - } - } - /// [Deprecated] Fetches the list of all sign-in methods previously used for the provided /// email address. This method returns an empty list when [Email Enumeration /// Protection](https://cloud.google.com/identity-platform/docs/admin/email-enumeration-protection) @@ -286,16 +221,15 @@ extension Auth: AuthInterop { ) @objc open func fetchSignInMethods(forEmail email: String, completion: (([String]?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let request = CreateAuthURIRequest(identifier: email, - continueURI: "http:www.google.com", - requestConfiguration: self.requestConfiguration) - Task { - do { - let response = try await AuthBackend.call(with: request) - Auth.wrapMainAsync(callback: completion, withParam: response.signinMethods, error: nil) - } catch { - Auth.wrapMainAsync(callback: completion, withParam: nil, error: error) + Task { + do { + let result = try await fetchSignInMethods(forEmail: email) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -317,15 +251,7 @@ extension Auth: AuthInterop { message: "`fetchSignInMethods` is deprecated and will be removed in a future release. This method returns an empty list when Email Enumeration Protection is enabled." ) open func fetchSignInMethods(forEmail email: String) async throws -> [String] { - return try await withCheckedThrowingContinuation { continuation in - self.fetchSignInMethods(forEmail: email) { methods, error in - if let methods { - continuation.resume(returning: methods) - } else { - continuation.resume(throwing: error!) - } - } - } + return try await authWorker.fetchSignInMethods(forEmail: email) } /// Signs in using an email address and password. @@ -350,61 +276,20 @@ extension Auth: AuthInterop { @objc open func signIn(withEmail email: String, password: String, completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - Task { - do { - let authData = try await self.internalSignInAndRetrieveData( - withEmail: email, - password: password - ) - decoratedCallback(authData, nil) - } catch { - decoratedCallback(nil, error) + Task { + do { + let result = try await signIn(withEmail: email, password: password) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } } - /// Signs in using an email address and password. - /// - /// When [Email Enumeration - /// Protection](https://cloud.google.com/identity-platform/docs/admin/email-enumeration-protection) - /// is enabled, this method throws in case of an invalid email/password. - /// - /// Possible error codes: - /// * `AuthErrorCodeOperationNotAllowed` - Indicates that email and password - /// accounts are not enabled. Enable them in the Auth section of the - /// Firebase console. - /// * `AuthErrorCodeUserDisabled` - Indicates the user's account is disabled. - /// * `AuthErrorCodeWrongPassword` - Indicates the user attempted - /// sign in with an incorrect password. - /// * `AuthErrorCodeInvalidEmail` - Indicates the email address is malformed. - /// - Parameter email: The user's email address. - /// - Parameter password: The user's password. - /// - Returns: The signed in user. - func internalSignInUser(withEmail email: String, - password: String) async throws -> User { - let request = VerifyPasswordRequest(email: email, - password: password, - requestConfiguration: requestConfiguration) - if request.password.count == 0 { - throw AuthErrorUtils.wrongPasswordError(message: nil) - } - #if os(iOS) - let response = try await injectRecaptcha(request: request, - action: AuthRecaptchaAction.signInWithPassword) - #else - let response = try await AuthBackend.call(with: request) - #endif - return try await completeSignIn( - withAccessToken: response.idToken, - accessTokenExpirationDate: response.approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false - ) - } - /// Signs in using an email address and password. /// /// Possible error codes: @@ -418,18 +303,11 @@ extension Auth: AuthInterop { /// - Parameter email: The user's email address. /// - Parameter password: The user's password. /// - Returns: The `AuthDataResult` after a successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func signIn(withEmail email: String, password: String) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.signIn(withEmail: email, password: password) { authData, error in - if let authData { - continuation.resume(returning: authData) - } else { - continuation.resume(throwing: error!) - } - } - } + let result = try await authWorker.signIn(withEmail: email, password: password) + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } /// Signs in using an email address and email sign-in link. @@ -449,16 +327,15 @@ extension Auth: AuthInterop { @objc open func signIn(withEmail email: String, link: String, completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - let credential = EmailAuthCredential(withEmail: email, link: link) - Task { - do { - let authData = try await self.internalSignInAndRetrieveData(withCredential: credential, - isReauthentication: false) - decoratedCallback(authData, nil) - } catch { - decoratedCallback(nil, error) + Task { + do { + let result = try await signIn(withEmail: email, link: link) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -476,17 +353,10 @@ extension Auth: AuthInterop { /// - Parameter email: The user's email address. /// - Parameter link: The email sign-in link. /// - Returns: The `AuthDataResult` after a successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func signIn(withEmail email: String, link: String) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.signIn(withEmail: email, link: link) { result, error in - if let result { - continuation.resume(returning: result) - } else { - continuation.resume(throwing: error!) - } - } - } + let result = try await authWorker.signIn(withEmail: email, link: link) + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } #if os(iOS) @@ -528,18 +398,15 @@ extension Auth: AuthInterop { open func signIn(with provider: FederatedAuthProvider, uiDelegate: AuthUIDelegate?, completion: ((AuthDataResult?, Error?) -> Void)?) { - kAuthGlobalWorkQueue.async { - Task { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - do { - let credential = try await provider.credential(with: uiDelegate) - let authData = try await self.internalSignInAndRetrieveData( - withCredential: credential, - isReauthentication: false - ) - decoratedCallback(authData, nil) - } catch { - decoratedCallback(nil, error) + Task { + do { + let result = try await signIn(with: provider, uiDelegate: uiDelegate) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -575,22 +442,15 @@ extension Auth: AuthInterop { /// protocol, this is used for presenting the web context. If nil, a default AuthUIDelegate /// will be used. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @available(tvOS, unavailable) @available(macOS, unavailable) @available(watchOS, unavailable) @discardableResult open func signIn(with provider: FederatedAuthProvider, uiDelegate: AuthUIDelegate?) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.signIn(with: provider, uiDelegate: uiDelegate) { result, error in - if let result { - continuation.resume(returning: result) - } else { - continuation.resume(throwing: error!) - } - } - } + let result = try await authWorker.signIn(with: provider, uiDelegate: uiDelegate) + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } #endif // iOS @@ -629,15 +489,15 @@ extension Auth: AuthInterop { @objc(signInWithCredential:completion:) open func signIn(with credential: AuthCredential, completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - Task { - do { - let authData = try await self.internalSignInAndRetrieveData(withCredential: credential, - isReauthentication: false) - decoratedCallback(authData, nil) - } catch { - decoratedCallback(nil, error) + Task { + do { + let result = try await signIn(with: credential) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -674,18 +534,11 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeSessionExpired` - Indicates that the SMS code has expired. /// - Parameter credential: The credential supplied by the IdP. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func signIn(with credential: AuthCredential) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.signIn(with: credential) { result, error in - if let result { - continuation.resume(returning: result) - } else { - continuation.resume(throwing: error!) - } - } - } + let result = try await authWorker.signIn(with: credential) + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } /// Asynchronously creates and becomes an anonymous user. @@ -699,32 +552,15 @@ extension Auth: AuthInterop { /// - Parameter completion: Optionally; a block which is invoked when the sign in finishes, or is /// canceled. Invoked asynchronously on the main thread in the future. @objc open func signInAnonymously(completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - if let currentUser = self.currentUser, currentUser.isAnonymous { - let result = AuthDataResult(withUser: currentUser, additionalUserInfo: nil) - decoratedCallback(result, nil) - return - } - let request = SignUpNewUserRequest(requestConfiguration: self.requestConfiguration) - Task { - do { - let response = try await AuthBackend.call(with: request) - let user = try await self.completeSignIn( - withAccessToken: response.idToken, - accessTokenExpirationDate: response.approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: true - ) - // TODO: The ObjC implementation passed a nil providerID to the nonnull providerID - let additionalUserInfo = AdditionalUserInfo(providerID: "", - profile: nil, - username: nil, - isNewUser: true) - decoratedCallback(AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo), - nil) - } catch { - decoratedCallback(nil, error) + Task { + do { + let result = try await signInAnonymously() + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -739,18 +575,11 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeOperationNotAllowed` - Indicates that anonymous accounts are /// not enabled. Enable them in the Auth section of the Firebase console. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult @objc open func signInAnonymously() async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.signInAnonymously { result, error in - if let result { - continuation.resume(returning: result) - } else { - continuation.resume(throwing: error!) - } - } - } + let result = try await authWorker.signInAnonymously() + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } /// Asynchronously signs in to Firebase with the given Auth token. @@ -765,28 +594,15 @@ extension Auth: AuthInterop { /// canceled. Invoked asynchronously on the main thread in the future. @objc open func signIn(withCustomToken token: String, completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - let request = VerifyCustomTokenRequest(token: token, - requestConfiguration: self.requestConfiguration) - Task { - do { - let response = try await AuthBackend.call(with: request) - let user = try await self.completeSignIn( - withAccessToken: response.idToken, - accessTokenExpirationDate: response.approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false - ) - // TODO: The ObjC implementation passed a nil providerID to the nonnull providerID - let additionalUserInfo = AdditionalUserInfo(providerID: "", - profile: nil, - username: nil, - isNewUser: response.isNewUser) - decoratedCallback(AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo), - nil) - } catch { - decoratedCallback(nil, error) + Task { + do { + let result = try await signIn(withCustomToken: token) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -801,18 +617,11 @@ extension Auth: AuthInterop { /// belong to different projects. /// - Parameter token: A self-signed custom auth token. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func signIn(withCustomToken token: String) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.signIn(withCustomToken: token) { result, error in - if let result { - continuation.resume(returning: result) - } else { - continuation.resume(throwing: error!) - } - } - } + let result = try await authWorker.signIn(withCustomToken: token) + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } /// Creates and, on success, signs in a user with the given email address and password. @@ -834,70 +643,16 @@ extension Auth: AuthInterop { @objc open func createUser(withEmail email: String, password: String, completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - guard password.count > 0 else { - if let completion { - completion(nil, AuthErrorUtils.weakPasswordError(serverResponseReason: "Missing password")) - } - return - } - guard email.count > 0 else { - if let completion { - completion(nil, AuthErrorUtils.missingEmailError(message: nil)) - } - return - } - kAuthGlobalWorkQueue.async { - let decoratedCallback = self.signInFlowAuthDataResultCallback(byDecorating: completion) - let request = SignUpNewUserRequest(email: email, - password: password, - displayName: nil, - idToken: nil, - requestConfiguration: self.requestConfiguration) - - #if os(iOS) - self.wrapInjectRecaptcha(request: request, - action: AuthRecaptchaAction.signUpPassword) { response, error in - if let error { - DispatchQueue.main.async { - decoratedCallback(nil, error) - } - return - } - self.internalCreateUserWithEmail(request: request, inResponse: response, - decoratedCallback: decoratedCallback) - } - #else - self.internalCreateUserWithEmail(request: request, decoratedCallback: decoratedCallback) - #endif - } - } - - func internalCreateUserWithEmail(request: SignUpNewUserRequest, - inResponse: SignUpNewUserResponse? = nil, - decoratedCallback: @escaping (AuthDataResult?, Error?) -> Void) { Task { do { - var response: SignUpNewUserResponse - if let inResponse { - response = inResponse - } else { - response = try await AuthBackend.call(with: request) + let result = try await createUser(withEmail: email, password: password) + await MainActor.run { + completion?(result, nil) } - let user = try await self.completeSignIn( - withAccessToken: response.idToken, - accessTokenExpirationDate: response.approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false - ) - let additionalUserInfo = AdditionalUserInfo(providerID: EmailAuthProvider.id, - profile: nil, - username: nil, - isNewUser: true) - decoratedCallback(AuthDataResult(withUser: user, - additionalUserInfo: additionalUserInfo), - nil) } catch { - decoratedCallback(nil, error) + await MainActor.run { + completion?(nil, error) + } } } } @@ -917,18 +672,17 @@ extension Auth: AuthInterop { /// - Parameter email: The user's email address. /// - Parameter password: The user's desired password. /// - Returns: The `AuthDataResult` after the successful signin. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func createUser(withEmail email: String, password: String) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.createUser(withEmail: email, password: password) { result, error in - if let result { - continuation.resume(returning: result) - } else { - continuation.resume(throwing: error!) - } - } + guard password.count > 0 else { + throw AuthErrorUtils.weakPasswordError(serverResponseReason: "Missing password") + } + guard email.count > 0 else { + throw AuthErrorUtils.missingEmailError(message: nil) } + let result = try await authWorker.createUser(withEmail: email, password: password) + try await authWorker.updateCurrentUser(result.user, byForce: false, savingToDisk: true) + return result } /// Resets the password given a code sent to the user outside of the app and a new password @@ -947,11 +701,17 @@ extension Auth: AuthInterop { /// Invoked asynchronously on the main thread in the future. @objc open func confirmPasswordReset(withCode code: String, newPassword: String, completion: @escaping (Error?) -> Void) { - kAuthGlobalWorkQueue.async { - let request = ResetPasswordRequest(oobCode: code, - newPassword: newPassword, - requestConfiguration: self.requestConfiguration) - self.wrapAsyncRPCTask(request, completion) + Task { + do { + try await confirmPasswordReset(withCode: code, newPassword: newPassword) + await MainActor.run { + completion(nil) + } + } catch { + await MainActor.run { + completion(error) + } + } } } @@ -967,17 +727,8 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeInvalidActionCode` - Indicates the OOB code is invalid. /// - Parameter code: The reset code. /// - Parameter newPassword: The new password. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func confirmPasswordReset(withCode code: String, newPassword: String) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.confirmPasswordReset(withCode: code, newPassword: newPassword) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } - } + try await authWorker.confirmPasswordReset(withCode: code, newPassword: newPassword) } /// Checks the validity of an out of band code. @@ -987,24 +738,15 @@ extension Auth: AuthInterop { /// asynchronously on the main thread in the future. @objc open func checkActionCode(_ code: String, completion: @escaping (ActionCodeInfo?, Error?) -> Void) { - kAuthGlobalWorkQueue.async { - let request = ResetPasswordRequest(oobCode: code, - newPassword: nil, - requestConfiguration: self.requestConfiguration) - Task { - do { - let response = try await AuthBackend.call(with: request) - - let operation = ActionCodeInfo.actionCodeOperation(forRequestType: response.requestType) - guard let email = response.email else { - fatalError("Internal Auth Error: Failed to get a ResetPasswordResponse") - } - let actionCodeInfo = ActionCodeInfo(withOperation: operation, - email: email, - newEmail: response.verifiedEmail) - Auth.wrapMainAsync(callback: completion, withParam: actionCodeInfo, error: nil) - } catch { - Auth.wrapMainAsync(callback: completion, withParam: nil, error: error) + Task { + do { + let code = try await checkActionCode(code) + await MainActor.run { + completion(code, nil) + } + } catch { + await MainActor.run { + completion(nil, error) } } } @@ -1013,17 +755,8 @@ extension Auth: AuthInterop { /// Checks the validity of an out of band code. /// - Parameter code: The out of band code to check validity. /// - Returns: An `ActionCodeInfo`. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func checkActionCode(_ code: String) async throws -> ActionCodeInfo { - return try await withCheckedThrowingContinuation { continuation in - self.checkActionCode(code) { info, error in - if let info { - continuation.resume(returning: info) - } else { - continuation.resume(throwing: error!) - } - } - } + return try await authWorker.checkActionCode(code) } /// Checks the validity of a verify password reset code. @@ -1032,29 +765,25 @@ extension Auth: AuthInterop { /// Invoked asynchronously on the main thread in the future. @objc open func verifyPasswordResetCode(_ code: String, completion: @escaping (String?, Error?) -> Void) { - checkActionCode(code) { info, error in - if let error { - completion(nil, error) - return + Task { + do { + let email = try await verifyPasswordResetCode(code) + await MainActor.run { + completion(email, nil) + } + } catch { + await MainActor.run { + completion(nil, error) + } } - completion(info?.email, nil) } } /// Checks the validity of a verify password reset code. /// - Parameter code: The password reset code to be verified. /// - Returns: An email. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func verifyPasswordResetCode(_ code: String) async throws -> String { - return try await withCheckedThrowingContinuation { continuation in - self.verifyPasswordResetCode(code) { code, error in - if let code { - continuation.resume(returning: code) - } else { - continuation.resume(throwing: error!) - } - } - } + return try await authWorker.verifyPasswordResetCode(code) } /// Applies out of band code. @@ -1065,10 +794,17 @@ extension Auth: AuthInterop { /// - Parameter completion: Optionally; a block which is invoked when the request finishes. /// Invoked asynchronously on the main thread in the future. @objc open func applyActionCode(_ code: String, completion: @escaping (Error?) -> Void) { - kAuthGlobalWorkQueue.async { - let request = SetAccountInfoRequest(requestConfiguration: self.requestConfiguration) - request.oobCode = code - self.wrapAsyncRPCTask(request, completion) + Task { + do { + try await applyActionCode(code) + await MainActor.run { + completion(nil) + } + } catch { + await MainActor.run { + completion(error) + } + } } } @@ -1077,17 +813,8 @@ extension Auth: AuthInterop { /// This method will not work for out of band codes which require an additional parameter, /// such as password reset code. /// - Parameter code: The out of band code to be applied. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func applyActionCode(_ code: String) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.applyActionCode(code) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } - } + try await authWorker.applyActionCode(code) } /// Initiates a password reset for the given email address. @@ -1143,24 +870,17 @@ extension Auth: AuthInterop { @objc open func sendPasswordReset(withEmail email: String, actionCodeSettings: ActionCodeSettings?, completion: ((Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - let request = GetOOBConfirmationCodeRequest.passwordResetRequest( - email: email, - actionCodeSettings: actionCodeSettings, - requestConfiguration: self.requestConfiguration - ) - #if os(iOS) - self.wrapInjectRecaptcha(request: request, - action: AuthRecaptchaAction.getOobCode) { result, error in - if let completion { - DispatchQueue.main.async { - completion(error) - } - } + Task { + do { + try await sendPasswordReset(withEmail: email, actionCodeSettings: actionCodeSettings) + await MainActor.run { + completion?(nil) } - #else - self.wrapAsyncRPCTask(request, completion) - #endif + } catch { + await MainActor.run { + completion?(error) + } + } } } @@ -1189,18 +909,9 @@ extension Auth: AuthInterop { /// - Parameter email: The email address of the user. /// - Parameter actionCodeSettings: An `ActionCodeSettings` object containing settings related to /// handling action codes. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func sendPasswordReset(withEmail email: String, actionCodeSettings: ActionCodeSettings? = nil) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.sendPasswordReset(withEmail: email, actionCodeSettings: actionCodeSettings) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } - } + try await authWorker.sendPasswordReset(withEmail: email, actionCodeSettings: actionCodeSettings) } /// Sends a sign in with email link to provided email address. @@ -1212,28 +923,17 @@ extension Auth: AuthInterop { @objc open func sendSignInLink(toEmail email: String, actionCodeSettings: ActionCodeSettings, completion: ((Error?) -> Void)? = nil) { - if !actionCodeSettings.handleCodeInApp { - fatalError("The handleCodeInApp flag in ActionCodeSettings must be true for Email-link " + - "Authentication.") - } - kAuthGlobalWorkQueue.async { - let request = GetOOBConfirmationCodeRequest.signInWithEmailLinkRequest( - email, - actionCodeSettings: actionCodeSettings, - requestConfiguration: self.requestConfiguration - ) - #if os(iOS) - self.wrapInjectRecaptcha(request: request, - action: AuthRecaptchaAction.getOobCode) { result, error in - if let completion { - DispatchQueue.main.async { - completion(error) - } - } + Task { + do { + try await sendSignInLink(toEmail: email, actionCodeSettings: actionCodeSettings) + await MainActor.run { + completion?(nil) } - #else - self.wrapAsyncRPCTask(request, completion) - #endif + } catch { + await MainActor.run { + completion?(error) + } + } } } @@ -1241,18 +941,13 @@ extension Auth: AuthInterop { /// - Parameter email: The email address of the user. /// - Parameter actionCodeSettings: An `ActionCodeSettings` object containing settings related to /// handling action codes. - @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func sendSignInLink(toEmail email: String, actionCodeSettings: ActionCodeSettings) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.sendSignInLink(toEmail: email, actionCodeSettings: actionCodeSettings) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } + if !actionCodeSettings.handleCodeInApp { + fatalError("The handleCodeInApp flag in ActionCodeSettings must be true for Email-link " + + "Authentication.") } + try await authWorker.sendSignInLink(toEmail: email, actionCodeSettings: actionCodeSettings) } /// Signs out the current user. @@ -1261,13 +956,24 @@ extension Auth: AuthInterop { /// * `AuthErrorCodeKeychainError` - Indicates an error occurred when accessing the /// keychain. The `NSLocalizedFailureReasonErrorKey` field in the `userInfo` /// dictionary will contain more information about the error encountered. + @available(*, noasync, message: "Use the async version instead") @objc(signOut:) open func signOut() throws { - try kAuthGlobalWorkQueue.sync { - guard self.currentUser != nil else { - return - } - return try self.updateCurrentUser(nil, byForce: false, savingToDisk: true) + let semaphore = DispatchSemaphore(value: 0) + Task { + try await authWorker.signOut() + semaphore.signal() } + semaphore.wait() + } + + /// Signs out the current user. + /// + /// Possible error codes: + /// * `AuthErrorCodeKeychainError` - Indicates an error occurred when accessing the + /// keychain. The `NSLocalizedFailureReasonErrorKey` field in the `userInfo` + /// dictionary will contain more information about the error encountered. + open func signOut() async throws { + try await authWorker.signOut() } /// Checks if link is an email sign-in link. @@ -1407,24 +1113,24 @@ extension Auth: AuthInterop { /// Sets `languageCode` to the app's current language. @objc open func useAppLanguage() { - kAuthGlobalWorkQueue.sync { - self.requestConfiguration.languageCode = Locale.preferredLanguages.first - } + setLanguageCode(Locale.preferredLanguages.first) } /// Configures Firebase Auth to connect to an emulated host instead of the remote backend. @objc open func useEmulator(withHost host: String, port: Int) { + let semaphore = DispatchSemaphore(value: 0) + Task { + await useEmulator(withHost: host, port: port) + semaphore.signal() + } + semaphore.wait() + } + + open func useEmulator(withHost host: String, port: Int) async { guard host.count > 0 else { fatalError("Cannot connect to empty host") } - // If host is an IPv6 address, it should be formatted with surrounding brackets. - let formattedHost = host.contains(":") ? "[\(host)]" : host - kAuthGlobalWorkQueue.sync { - self.requestConfiguration.emulatorHostAndPort = "\(formattedHost):\(port)" - #if os(iOS) - self.settings?.appVerificationDisabledForTesting = true - #endif - } + await authWorker.useEmulator(withHost: host, port: port) } /// Revoke the users token with authorization code. @@ -1432,18 +1138,17 @@ extension Auth: AuthInterop { /// complete, or fails. Invoked asynchronously on the main thread in the future. @objc open func revokeToken(withAuthorizationCode authorizationCode: String, completion: ((Error?) -> Void)? = nil) { - currentUser?.internalGetToken { idToken, error in - if let error { - Auth.wrapMainAsync(completion, error) - return - } - guard let idToken else { - fatalError("Internal Auth Error: Both idToken and error are nil") + Task { + do { + try await revokeToken(withAuthorizationCode: authorizationCode) + if let completion { + completion(nil) + } + } catch { + if let completion { + completion(error) + } } - let request = RevokeTokenRequest(withToken: authorizationCode, - idToken: idToken, - requestConfiguration: self.requestConfiguration) - self.wrapAsyncRPCTask(request, completion) } } @@ -1452,14 +1157,12 @@ extension Auth: AuthInterop { /// complete, or fails. Invoked asynchronously on the main thread in the future. @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func revokeToken(withAuthorizationCode authorizationCode: String) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.revokeToken(withAuthorizationCode: authorizationCode) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } + if let currentUser { + let idToken = try await currentUser.internalGetTokenAsync() + let request = RevokeTokenRequest(withToken: authorizationCode, + idToken: idToken, + requestConfiguration: self.requestConfiguration) + let _ = try await AuthBackend.call(with: request) } } @@ -1470,7 +1173,7 @@ extension Auth: AuthInterop { return try internalUseUserAccessGroup(accessGroup) } - private func internalUseUserAccessGroup(_ accessGroup: String?) throws { + func internalUseUserAccessGroup(_ accessGroup: String?) throws { storedUserManager.setStoredUserAccessGroup(accessGroup: accessGroup) let user = try getStoredUser(forAccessGroup: accessGroup) try updateCurrentUser(user, byForce: false, savingToDisk: false) @@ -1536,6 +1239,40 @@ extension Auth: AuthInterop { return user } + /// Sets the `currentUser` on the receiver to the provided user object. + /// - Parameters: + /// - user: The user object to be set as the current user of the calling Auth instance. + /// - completion: Optionally; a block invoked after the user of the calling Auth instance has + /// been updated or an error was encountered. + @objc open func updateCurrentUser(_ user: User?, completion: ((Error?) -> Void)? = nil) { + Task { + guard let user else { + await MainActor.run { + completion?(AuthErrorUtils.nullUserError(message: nil)) + } + return + } + do { + try await updateCurrentUser(user) + await MainActor.run { + completion?(nil) + } + } catch { + await MainActor.run { + completion?(error) + } + } + } + } + + /// Sets the `currentUser` on the receiver to the provided user object. + /// - Parameter user: The user object to be set as the current user of the calling Auth instance. + /// - Parameter completion: Optionally; a block invoked after the user of the calling Auth + /// instance has been updated or an error was encountered. + open func updateCurrentUser(_ user: User) async throws { + try await authWorker.updateCurrentUser(user) + } + #if os(iOS) /// The APNs token used for phone number authentication. /// @@ -1547,11 +1284,44 @@ extension Auth: AuthInterop { /// If swizzling is disabled, the APNs Token must be set for phone number auth to work, /// by either setting this property or by calling `setAPNSToken(_:type:)`. @objc(APNSToken) open var apnsToken: Data? { - kAuthGlobalWorkQueue.sync { - self.tokenManager.token?.data + var data: Data? + let semaphore = DispatchSemaphore(value: 0) + Task { + data = await tokenManagerGet().token?.data + semaphore.signal() } + semaphore.wait() + return data } + func tokenManagerInit(_ manager: AuthAPNSTokenManager) { + let semaphore = DispatchSemaphore(value: 0) + Task { + await authWorker.tokenManagerInit(manager) + semaphore.signal() + } + semaphore.wait() + } + + func tokenManagerInit(_ manager: AuthAPNSTokenManager) async { + await authWorker.tokenManagerInit(manager) + } + + func tokenManagerGet() -> AuthAPNSTokenManager { + var manager: AuthAPNSTokenManager! + let semaphore = DispatchSemaphore(value: 0) + Task { + manager = await tokenManagerGet() + semaphore.signal() + } + semaphore.wait() + return manager + } + + func tokenManagerGet() async -> AuthAPNSTokenManager { + return await authWorker.tokenManagerGet() + } + /// Sets the APNs token along with its type. /// /// This method is available on iOS only. @@ -1559,11 +1329,47 @@ extension Auth: AuthInterop { /// If swizzling is disabled, the APNs Token must be set for phone number auth to work, /// by either setting calling this method or by setting the `APNSToken` property. @objc open func setAPNSToken(_ token: Data, type: AuthAPNSTokenType) { - kAuthGlobalWorkQueue.sync { - self.tokenManager.token = AuthAPNSToken(withData: token, type: type) + let semaphore = DispatchSemaphore(value: 0) + Task { + await authWorker.tokenManagerSet(token, type: type) + semaphore.signal() } + semaphore.wait() } + /// Sets the APNs token along with its type. + /// + /// This method is available on iOS only. + /// + /// If swizzling is disabled, the APNs Token must be set for phone number auth to work, + /// by either setting calling this method or by setting the `APNSToken` property. + open func setAPNSToken(_ token: Data, type: AuthAPNSTokenType) async { + await authWorker.tokenManagerSet(token, type: type) + } + + /// Whether the specific remote notification is handled by `Auth` . + /// + /// This method is available on iOS only. + /// + /// If swizzling is disabled, related remote notifications must be forwarded to this method + /// for phone number auth to work. + /// - Parameter userInfo: A dictionary that contains information related to the + /// notification in question. + /// - Returns: Whether or the notification is handled. A return value of `true` means the + /// notification is for Firebase Auth so the caller should ignore the notification from further + /// processing, and `false` means the notification is for the app (or another library) so + /// the caller should continue handling this notification as usual. + @objc open func canHandleNotification(_ userInfo: [AnyHashable: Any]) -> Bool { + var result = false + let semaphore = DispatchSemaphore(value: 0) + Task { + result = await authWorker.canHandleNotification(userInfo) + semaphore.signal() + } + semaphore.wait() + return result + } + /// Whether the specific remote notification is handled by `Auth` . /// /// This method is available on iOS only. @@ -1576,10 +1382,8 @@ extension Auth: AuthInterop { /// notification is for Firebase Auth so the caller should ignore the notification from further /// processing, and `false` means the notification is for the app (or another library) so /// the caller should continue handling this notification as usual. - @objc open func canHandleNotification(_ userInfo: [AnyHashable: Any]) -> Bool { - kAuthGlobalWorkQueue.sync { - self.notificationManager.canHandle(notification: userInfo) - } + @objc open func canHandleNotification(_ userInfo: [AnyHashable: Any]) async -> Bool { + return await authWorker.canHandleNotification(userInfo) } /// Whether the specific URL is handled by `Auth` . @@ -1595,13 +1399,31 @@ extension Auth: AuthInterop { /// the URL is for the app (or another library) so the caller should continue handling /// this URL as usual. @objc(canHandleURL:) open func canHandle(_ url: URL) -> Bool { - kAuthGlobalWorkQueue.sync { - guard let authURLPresenter = self.authURLPresenter as? AuthURLPresenter else { - return false - } - return authURLPresenter.canHandle(url: url) + var result = false + let semaphore = DispatchSemaphore(value: 0) + Task { + result = await authWorker.canHandle(url) + semaphore.signal() } + semaphore.wait() + return result } + + /// Whether the specific URL is handled by `Auth` . + /// + /// This method is available on iOS only. + /// + /// If swizzling is disabled, URLs received by the application delegate must be forwarded + /// to this method for phone number auth to work. + /// - Parameter url: The URL received by the application delegate from any of the openURL + /// method. + /// - Returns: Whether or the URL is handled. `true` means the URL is for Firebase Auth + /// so the caller should ignore the URL from further processing, and `false` means the + /// the URL is for the app (or another library) so the caller should continue handling + /// this URL as usual. + open func canHandle(_ url: URL) async -> Bool { + return await authWorker.canHandle(url) + } #endif /// The name of the `NSNotificationCenter` notification which is posted when the auth state @@ -1638,83 +1460,69 @@ extension Auth: AuthInterop { auth: nil, heartbeatLogger: app.heartbeatLogger, appCheck: appCheck) + authWorker = AuthWorker(requestConfiguration: requestConfiguration) super.init() requestConfiguration.auth = self - protectedDataInitialization(keychainStorageProvider) + Task { + await authWorker.protectedDataInitialization(keychainStorageProvider) + } } - private func protectedDataInitialization(_ keychainStorageProvider: AuthKeychainStorage) { - // Continue with the rest of initialization in the work thread. - kAuthGlobalWorkQueue.async { [weak self] in - // Load current user from Keychain. - guard let self else { + // TODO delete me + + func signInFlowAuthDataResultCallback(byDecorating callback: + ((AuthDataResult?, Error?) -> Void)?) -> (AuthDataResult?, Error?) -> Void { + let authDataCallback: (((AuthDataResult?, Error?) -> Void)?, AuthDataResult?, Error?) -> Void = + { callback, result, error in + Auth.wrapMainAsync(callback: callback, withParam: result, error: error) + } + return { authResult, error in + if let error { + authDataCallback(callback, nil, error) return } - if let keychainServiceName = Auth.keychainServiceName(forAppName: self.firebaseAppName) { - self.keychainServices = AuthKeychainServices(service: keychainServiceName, - storage: keychainStorageProvider) - self.storedUserManager = AuthStoredUserManager( - serviceName: keychainServiceName, - keychainServices: self.keychainServices - ) + do { + try self.updateCurrentUser(authResult?.user, byForce: false, savingToDisk: true) + } catch { + authDataCallback(callback, nil, error) + return } + authDataCallback(callback, authResult, nil) + } + } + // TODO: delete me + func updateCurrentUser(_ user: User?, byForce force: Bool, + savingToDisk saveToDisk: Bool) throws { + if user == currentUser { + possiblyPostAuthStateChangeNotification() + } + if let user { + if user.tenantID != nil || tenantID != nil, tenantID != user.tenantID { + let error = AuthErrorUtils.tenantIDMismatchError() + throw error + } + } + var throwError: Error? + if saveToDisk { do { - if let storedUserAccessGroup = self.storedUserManager.getStoredUserAccessGroup() { - try self.internalUseUserAccessGroup(storedUserAccessGroup) - } else { - let user = try self.getUser() - try self.updateCurrentUser(user, byForce: false, savingToDisk: false) - if let user { - self.tenantID = user.tenantID - self.lastNotifiedUserToken = user.rawAccessToken() - } - } + try saveUser(user) } catch { - #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst) - if (error as NSError).code == AuthErrorCode.keychainError.rawValue { - // If there's a keychain error, assume it is due to the keychain being accessed - // before the device is unlocked as a result of prewarming, and listen for the - // UIApplicationProtectedDataDidBecomeAvailable notification. - self.addProtectedDataDidBecomeAvailableObserver() - } - #endif - AuthLog.logError(code: "I-AUT000001", - message: "Error loading saved user when starting up: \(error)") + throwError = error } - - #if os(iOS) - if GULAppEnvironmentUtil.isAppExtension() { - // iOS App extensions should not call [UIApplication sharedApplication], even if - // UIApplication responds to it. - return - } - - // Using reflection here to avoid build errors in extensions. - let sel = NSSelectorFromString("sharedApplication") - guard UIApplication.responds(to: sel), - let rawApplication = UIApplication.perform(sel), - let application = rawApplication.takeUnretainedValue() as? UIApplication else { - return - } - - // Initialize for phone number auth. - self.tokenManager = AuthAPNSTokenManager(withApplication: application) - self.appCredentialManager = AuthAppCredentialManager(withKeychain: self.keychainServices) - self.notificationManager = AuthNotificationManager( - withApplication: application, - appCredentialManager: self.appCredentialManager - ) - - GULAppDelegateSwizzler.registerAppDelegateInterceptor(self) - GULSceneDelegateSwizzler.registerSceneDelegateInterceptor(self) - #endif + } + if throwError == nil || force { + currentUser = user + possiblyPostAuthStateChangeNotification() + } + if let throwError { + throw throwError } } #if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst) - private func addProtectedDataDidBecomeAvailableObserver() { + func addProtectedDataDidBecomeAvailableObserver() { weak var weakSelf = self protectedDataDidBecomeAvailableObserver = NotificationCenter.default.addObserver( @@ -1752,7 +1560,7 @@ extension Auth: AuthInterop { #endif } - private func getUser() throws -> User? { + func getUser() throws -> User? { var user: User? if let userAccessGroup { guard let apiKey = app?.options.apiKey else { @@ -1837,7 +1645,7 @@ extension Auth: AuthInterop { // MARK: Private methods /// Posts the auth state change notificaton if current user's token has been changed. - private func possiblyPostAuthStateChangeNotification() { + func possiblyPostAuthStateChangeNotification() { let token = currentUser?.rawAccessToken() if lastNotifiedUserToken == token || (token != nil && lastNotifiedUserToken == token) { @@ -1870,7 +1678,7 @@ extension Auth: AuthInterop { /// is scheduled 5 minutes before the scheduled expiration time. /// /// If the token expires in less than 5 minutes, schedule the token refresh immediately. - private func scheduleAutoTokenRefresh() { + func scheduleAutoTokenRefresh() { let tokenExpirationInterval = (currentUser?.accessTokenExpirationDate()?.timeIntervalSinceNow ?? 0) - 5 * 60 scheduleAutoTokenRefresh(withDelay: max(tokenExpirationInterval, 0), retry: false) @@ -1880,7 +1688,7 @@ extension Auth: AuthInterop { /// - Parameter delay: The delay in seconds after which the token refresh task should be scheduled /// to be executed. /// - Parameter retry: Flag to determine whether the invocation is a retry attempt or not. - private func scheduleAutoTokenRefresh(withDelay delay: TimeInterval, retry: Bool) { + func scheduleAutoTokenRefresh(withDelay delay: TimeInterval, retry: Bool) { guard let accessToken = currentUser?.rawAccessToken() else { return } @@ -1895,72 +1703,14 @@ extension Auth: AuthInterop { "for the new token.") } autoRefreshScheduled = true - weak var weakSelf = self - AuthDispatcher.shared.dispatch(afterDelay: delay, queue: kAuthGlobalWorkQueue) { - guard let strongSelf = weakSelf else { - return - } - guard strongSelf.currentUser?.rawAccessToken() == accessToken else { - // Another auto refresh must have been scheduled, so keep _autoRefreshScheduled unchanged. - return - } - strongSelf.autoRefreshScheduled = false - if strongSelf.isAppInBackground { - return - } - let uid = strongSelf.currentUser?.uid - strongSelf.currentUser?.internalGetToken(forceRefresh: true) { token, error in - if strongSelf.currentUser?.uid != uid { - return - } - if error != nil { - // Kicks off exponential back off logic to retry failed attempt. Starts with one minute - // delay (60 seconds) if this is the first failed attempt. - let rescheduleDelay = retry ? min(delay * 2, 16 * 60) : 60 - strongSelf.scheduleAutoTokenRefresh(withDelay: rescheduleDelay, retry: true) - } - } - } - } - - /// Update the current user; initializing the user's internal properties correctly, and - /// optionally saving the user to disk. - /// - /// This method is called during: sign in and sign out events, as well as during class - /// initialization time. The only time the saveToDisk parameter should be set to NO is during - /// class initialization time because the user was just read from disk. - /// - Parameter user: The user to use as the current user (including nil, which is passed at sign - /// out time.) - /// - Parameter saveToDisk: Indicates the method should persist the user data to disk. - func updateCurrentUser(_ user: User?, byForce force: Bool, - savingToDisk saveToDisk: Bool) throws { - if user == currentUser { - possiblyPostAuthStateChangeNotification() - } - if let user { - if user.tenantID != nil || tenantID != nil, tenantID != user.tenantID { - let error = AuthErrorUtils.tenantIDMismatchError() - throw error - } - } - var throwError: Error? - if saveToDisk { - do { - try saveUser(user) - } catch { - throwError = error - } - } - if throwError == nil || force { - currentUser = user - possiblyPostAuthStateChangeNotification() - } - if let throwError { - throw throwError + Task { + await authWorker.autoTokenRefresh(accessToken: accessToken, + retry: retry, + delay: fastTokenRefreshForTest ? 0.1 : delay) } } - private func saveUser(_ user: User?) throws { + func saveUser(_ user: User?) throws { if let userAccessGroup { guard let apiKey = app?.options.apiKey else { fatalError("Internal Auth Error: Missing apiKey in saveUser") @@ -2009,193 +1759,7 @@ extension Auth: AuthInterop { anonymous: anonymous) } - /// Signs in using an email address and password. - /// - /// This is the internal counterpart of this method, which uses a callback that does not - /// update the current user. - /// - Parameter email: The user's email address. - /// - Parameter password: The user's password. - private func internalSignInAndRetrieveData(withEmail email: String, - password: String) async throws -> AuthDataResult { - let credential = EmailAuthCredential(withEmail: email, password: password) - return try await internalSignInAndRetrieveData(withCredential: credential, - isReauthentication: false) - } - - func internalSignInAndRetrieveData(withCredential credential: AuthCredential, - isReauthentication: Bool) async throws - -> AuthDataResult { - if let emailCredential = credential as? EmailAuthCredential { - // Special case for email/password credentials - switch emailCredential.emailType { - case let .link(link): - // Email link sign in - return try await internalSignInAndRetrieveData(withEmail: emailCredential.email, link: link) - case let .password(password): - // Email password sign in - let user = try await internalSignInUser( - withEmail: emailCredential.email, - password: password - ) - let additionalUserInfo = AdditionalUserInfo(providerID: EmailAuthProvider.id, - profile: nil, - username: nil, - isNewUser: false) - return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) - } - } - #if !os(watchOS) - if let gameCenterCredential = credential as? GameCenterAuthCredential { - return try await signInAndRetrieveData(withGameCenterCredential: gameCenterCredential) - } - #endif - #if os(iOS) - if let phoneCredential = credential as? PhoneAuthCredential { - // Special case for phone auth credentials - let operation = isReauthentication ? AuthOperationType.reauth : - AuthOperationType.signUpOrSignIn - let response = try await signIn(withPhoneCredential: phoneCredential, - operation: operation) - let user = try await completeSignIn(withAccessToken: response.idToken, - accessTokenExpirationDate: response - .approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false) - - let additionalUserInfo = AdditionalUserInfo(providerID: PhoneAuthProvider.id, - profile: nil, - username: nil, - isNewUser: response.isNewUser) - return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) - } - #endif - let request = VerifyAssertionRequest(providerID: credential.provider, - requestConfiguration: requestConfiguration) - request.autoCreate = !isReauthentication - credential.prepare(request) - let response = try await AuthBackend.call(with: request) - if response.needConfirmation { - let email = response.email - let credential = OAuthCredential(withVerifyAssertionResponse: response) - throw AuthErrorUtils.accountExistsWithDifferentCredentialError( - email: email, - updatedCredential: credential - ) - } - guard let providerID = response.providerID, providerID.count > 0 else { - throw AuthErrorUtils.unexpectedResponse(deserializedResponse: response) - } - let user = try await completeSignIn(withAccessToken: response.idToken, - accessTokenExpirationDate: response - .approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false) - let additionalUserInfo = AdditionalUserInfo(providerID: providerID, - profile: response.profile, - username: response.username, - isNewUser: response.isNewUser) - let updatedOAuthCredential = OAuthCredential(withVerifyAssertionResponse: response) - return AuthDataResult(withUser: user, - additionalUserInfo: additionalUserInfo, - credential: updatedOAuthCredential) - } - - #if os(iOS) - /// Signs in using a phone credential. - /// - Parameter credential: The Phone Auth credential used to sign in. - /// - Parameter operation: The type of operation for which this sign-in attempt is initiated. - private func signIn(withPhoneCredential credential: PhoneAuthCredential, - operation: AuthOperationType) async throws -> VerifyPhoneNumberResponse { - switch credential.credentialKind { - case let .phoneNumber(phoneNumber, temporaryProof): - let request = VerifyPhoneNumberRequest(temporaryProof: temporaryProof, - phoneNumber: phoneNumber, - operation: operation, - requestConfiguration: requestConfiguration) - return try await AuthBackend.call(with: request) - case let .verification(verificationID, code): - guard verificationID.count > 0 else { - throw AuthErrorUtils.missingVerificationIDError(message: nil) - } - guard code.count > 0 else { - throw AuthErrorUtils.missingVerificationCodeError(message: nil) - } - let request = VerifyPhoneNumberRequest(verificationID: verificationID, - verificationCode: code, - operation: operation, - requestConfiguration: requestConfiguration) - return try await AuthBackend.call(with: request) - } - } - #endif - - #if !os(watchOS) - /// Signs in using a game center credential. - /// - Parameter credential: The Game Center Auth Credential used to sign in. - private func signInAndRetrieveData(withGameCenterCredential credential: GameCenterAuthCredential) async throws - -> AuthDataResult { - guard let publicKeyURL = credential.publicKeyURL, - let signature = credential.signature, - let salt = credential.salt else { - fatalError( - "Internal Auth Error: Game Center credential missing publicKeyURL, signature, or salt" - ) - } - let request = SignInWithGameCenterRequest(playerID: credential.playerID, - teamPlayerID: credential.teamPlayerID, - gamePlayerID: credential.gamePlayerID, - publicKeyURL: publicKeyURL, - signature: signature, - salt: salt, - timestamp: credential.timestamp, - displayName: credential.displayName, - requestConfiguration: requestConfiguration) - let response = try await AuthBackend.call(with: request) - let user = try await completeSignIn(withAccessToken: response.idToken, - accessTokenExpirationDate: response - .approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false) - let additionalUserInfo = AdditionalUserInfo(providerID: GameCenterAuthProvider.id, - profile: nil, - username: nil, - isNewUser: response.isNewUser) - return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) - } - - #endif - - /// Signs in using an email and email sign-in link. - /// - Parameter email: The user's email address. - /// - Parameter link: The email sign-in link. - private func internalSignInAndRetrieveData(withEmail email: String, - link: String) async throws -> AuthDataResult { - guard isSignIn(withEmailLink: link) else { - fatalError("The link provided is not valid for email/link sign-in. Please check the link by " + - "calling isSignIn(withEmailLink:) on the Auth instance before attempting to use it " + - "for email/link sign-in.") - } - let queryItems = getQueryItems(link) - guard let actionCode = queryItems["oobCode"] else { - fatalError("Missing oobCode in link URL") - } - let request = EmailLinkSignInRequest(email: email, - oobCode: actionCode, - requestConfiguration: requestConfiguration) - let response = try await AuthBackend.call(with: request) - let user = try await completeSignIn(withAccessToken: response.idToken, - accessTokenExpirationDate: response - .approximateExpirationDate, - refreshToken: response.refreshToken, - anonymous: false) - - let additionalUserInfo = AdditionalUserInfo(providerID: EmailAuthProvider.id, - profile: nil, - username: nil, - isNewUser: response.isNewUser) - return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) - } private func getQueryItems(_ link: String) -> [String: String] { var queryItems = AuthWebUtils.parseURL(link) @@ -2208,45 +1772,24 @@ extension Auth: AuthInterop { return queryItems } - /// Creates a AuthDataResultCallback block which wraps another AuthDataResultCallback; - /// trying to update the current user before forwarding it's invocations along to a subject - /// block. - /// - /// Typically invoked as part of the complete sign-in flow. For any other uses please - /// consider alternative ways of updating the current user. - /// - Parameter callback: Called when the user has been updated or when an error has occurred. - /// Invoked asynchronously on the main thread in the future. - /// - Returns: Returns a block that updates the current user. - func signInFlowAuthDataResultCallback(byDecorating callback: - ((AuthDataResult?, Error?) -> Void)?) -> (AuthDataResult?, Error?) -> Void { - let authDataCallback: (((AuthDataResult?, Error?) -> Void)?, AuthDataResult?, Error?) -> Void = - { callback, result, error in - Auth.wrapMainAsync(callback: callback, withParam: result, error: error) - } - return { authResult, error in - if let error { - authDataCallback(callback, nil, error) - return - } - do { - try self.updateCurrentUser(authResult?.user, byForce: false, savingToDisk: true) - } catch { - authDataCallback(callback, nil, error) - return - } - authDataCallback(callback, authResult, nil) + private func getLanguageCode() -> String? { + var code: String? + let semaphore = DispatchSemaphore(value: 0) + Task { + code = await authWorker.getLanguageCode() + semaphore.signal() } + semaphore.wait() + return code } - private func wrapAsyncRPCTask(_ request: any AuthRPCRequest, _ callback: ((Error?) -> Void)?) { + private func setLanguageCode(_ code: String?) { + let semaphore = DispatchSemaphore(value: 0) Task { - do { - let _ = try await AuthBackend.call(with: request) - Auth.wrapMainAsync(callback, nil) - } catch { - Auth.wrapMainAsync(callback, error) - } + await authWorker.setLanguageCode(code) + semaphore.signal() } + semaphore.wait() } class func wrapMainAsync(_ callback: ((Error?) -> Void)?, _ error: Error?) { @@ -2267,55 +1810,6 @@ extension Auth: AuthInterop { } } - #if os(iOS) - private func wrapInjectRecaptcha(request: T, - action: AuthRecaptchaAction, - _ callback: @escaping ( - (T.Response?, Error?) -> Void - )) { - Task { - do { - let response = try await injectRecaptcha(request: request, action: action) - callback(response, nil) - } catch { - callback(nil, error) - } - } - } - - func injectRecaptcha(request: T, - action: AuthRecaptchaAction) async throws -> T - .Response { - let recaptchaVerifier = AuthRecaptchaVerifier.shared(auth: self) - if recaptchaVerifier.enablementStatus(forProvider: AuthRecaptchaProvider.password) { - try await recaptchaVerifier.injectRecaptchaFields(request: request, - provider: AuthRecaptchaProvider.password, - action: action) - } else { - do { - return try await AuthBackend.call(with: request) - } catch { - let nsError = error as NSError - if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError, - nsError.code == AuthErrorCode.internalError.rawValue, - let messages = underlyingError - .userInfo[AuthErrorUtils.userInfoDeserializedResponseKey] as? [String: AnyHashable], - let message = messages["message"] as? String, - message.hasPrefix("MISSING_RECAPTCHA_TOKEN") { - try await recaptchaVerifier.injectRecaptchaFields( - request: request, - provider: AuthRecaptchaProvider.password, - action: action - ) - } else { - throw error - } - } - } - return try await AuthBackend.call(with: request) - } - #endif - // MARK: Internal properties /// Allow tests to swap in an alternate mainBundle. @@ -2325,10 +1819,11 @@ extension Auth: AuthInterop { /// Auth's backend. var requestConfiguration: AuthRequestConfiguration - #if os(iOS) + let authWorker: AuthWorker + + var fastTokenRefreshForTest = false - /// The manager for APNs tokens used by phone number auth. - var tokenManager: AuthAPNSTokenManager! + #if os(iOS) /// The manager for app credentials used by phone number auth. var appCredentialManager: AuthAppCredentialManager! @@ -2344,16 +1839,16 @@ extension Auth: AuthInterop { // MARK: Private properties /// The stored user manager. - private var storedUserManager: AuthStoredUserManager! + var storedUserManager: AuthStoredUserManager! /// The Firebase app name. - private let firebaseAppName: String + let firebaseAppName: String /// The keychain service. - private var keychainServices: AuthKeychainServices! + var keychainServices: AuthKeychainServices! /// The user access (ID) token used last time for posting auth state changed notification. - private var lastNotifiedUserToken: String? + var lastNotifiedUserToken: String? /// This flag denotes whether or not tokens should be automatically refreshed. /// Will only be set to `true` if the another Firebase service is included (additionally to @@ -2361,11 +1856,11 @@ extension Auth: AuthInterop { private var autoRefreshTokens = false /// Whether or not token auto-refresh is currently scheduled. - private var autoRefreshScheduled = false + var autoRefreshScheduled = false /// A flag that is set to YES if the app is put in the background and no when the app is /// returned to the foreground. - private var isAppInBackground = false + var isAppInBackground = false /// An opaque object to act as the observer for UIApplicationDidBecomeActiveNotification. private var applicationDidBecomeActiveObserver: NSObjectProtocol? diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthDispatcher.swift b/FirebaseAuth/Sources/Swift/Auth/AuthDispatcher.swift deleted file mode 100644 index 6373cdfb4ccf..000000000000 --- a/FirebaseAuth/Sources/Swift/Auth/AuthDispatcher.swift +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2023 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 - -/// A utility class used to facilitate scheduling tasks to be executed in the future. -class AuthDispatcher { - static let shared = AuthDispatcher() - - /// Allows custom implementation of dispatchAfterDelay:queue:callback:. - /// - /// Set to nil to restore default implementation. - var dispatchAfterImplementation: ((TimeInterval, DispatchQueue, @escaping () -> Void) -> Void)? - - /// Schedules task in the future after a specified delay. - /// - Parameter delay: The delay in seconds after which the task will be scheduled to execute. - /// - Parameter queue: The dispatch queue on which the task will be submitted. - /// - Parameter task: The task(block) to be scheduled for future execution. - func dispatch(afterDelay delay: TimeInterval, - queue: DispatchQueue, - task: @escaping () -> Void) { - if let dispatchAfterImplementation { - dispatchAfterImplementation(delay, queue, task) - } else { - queue.asyncAfter(deadline: DispatchTime.now() + delay, execute: task) - } - } -} diff --git a/FirebaseAuth/Sources/Swift/Auth/AuthWorker.swift b/FirebaseAuth/Sources/Swift/Auth/AuthWorker.swift new file mode 100644 index 000000000000..fcb886ebd8cd --- /dev/null +++ b/FirebaseAuth/Sources/Swift/Auth/AuthWorker.swift @@ -0,0 +1,815 @@ +// Copyright 2024 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 + +#if COCOAPODS + @_implementationOnly import GoogleUtilities +#else + @_implementationOnly import GoogleUtilities_AppDelegateSwizzler +@_implementationOnly import GoogleUtilities_Environment +#endif + +#if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst) + import UIKit +#endif + +@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) +actor AuthWorker { + let requestConfiguration: AuthRequestConfiguration + + func getLanguageCode() -> String? { + return requestConfiguration.languageCode + } + + func setLanguageCode(_ code: String?) { + requestConfiguration.languageCode = code + } + + /// The manager for APNs tokens used by phone number auth. + var tokenManager: AuthAPNSTokenManager! + + func tokenManagerCancel(error: Error) { + tokenManager.cancel(withError: error) + } + + func tokenManagerSet(_ token: Data, type: AuthAPNSTokenType) { + self.tokenManager.token = AuthAPNSToken(withData: token, type: type) + } + + func tokenManagerGet() -> AuthAPNSTokenManager { + return tokenManager + } + + func getToken(forcingRefresh forceRefresh: Bool) async throws -> String? { + // Enable token auto-refresh if not already enabled. + guard let auth = requestConfiguration.auth else { + return nil + } + auth.getTokenInternal(forcingRefresh: forceRefresh) + + // Call back with 'nil' if there is no current user. + guard let currentUser = auth.currentUser else { + return nil + } + return try await currentUser.internalGetTokenAsync(forceRefresh: forceRefresh) + } + + /// Only for testing + func tokenManagerInit(_ manager: AuthAPNSTokenManager) { + self.tokenManager = manager + } + + func fetchSignInMethods(forEmail email: String) async throws -> [String] { + let request = CreateAuthURIRequest(identifier: email, + continueURI: "http:www.google.com", + requestConfiguration: self.requestConfiguration) + let response = try await AuthBackend.call(with: request) + return response.signinMethods ?? [] + } + + func signIn(withEmail email: String, password: String) async throws -> AuthDataResult { + let credential = EmailAuthCredential(withEmail: email, password: password) + return try await internalSignInAndRetrieveData(withCredential: credential, + isReauthentication: false) + } + + func signIn(withEmail email: String, link: String) async throws -> AuthDataResult { + let credential = EmailAuthCredential(withEmail: email, link: link) + return try await internalSignInAndRetrieveData(withCredential: credential, + isReauthentication: false) + } + + func signIn(with credential: AuthCredential) async throws -> AuthDataResult { + return try await internalSignInAndRetrieveData(withCredential: credential, + isReauthentication: false) + } + + +#if os(iOS) + func signIn(with provider: FederatedAuthProvider, + uiDelegate: AuthUIDelegate?) async throws -> AuthDataResult { + let credential = try await provider.credential(with: uiDelegate) + return try await self.internalSignInAndRetrieveData( + withCredential: credential, + isReauthentication: false + ) + } +#endif + + func signInAnonymously() async throws -> AuthDataResult { + if let currentUser = requestConfiguration.auth?.currentUser, + currentUser.isAnonymous { + return AuthDataResult(withUser: currentUser, additionalUserInfo: nil) + } + let request = SignUpNewUserRequest(requestConfiguration: self.requestConfiguration) + let response = try await AuthBackend.call(with: request) + let user = try await self.completeSignIn( + withAccessToken: response.idToken, + accessTokenExpirationDate: response.approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: true + ) + // TODO: The ObjC implementation passed a nil providerID to the nonnull providerID + let additionalUserInfo = AdditionalUserInfo(providerID: "", + profile: nil, + username: nil, + isNewUser: true) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + + func signIn(withCustomToken token: String) async throws -> AuthDataResult { + let request = VerifyCustomTokenRequest(token: token, + requestConfiguration: self.requestConfiguration) + let response = try await AuthBackend.call(with: request) + let user = try await self.completeSignIn( + withAccessToken: response.idToken, + accessTokenExpirationDate: response.approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false + ) + // TODO: The ObjC implementation passed a nil providerID to the nonnull providerID + let additionalUserInfo = AdditionalUserInfo(providerID: "", + profile: nil, + username: nil, + isNewUser: response.isNewUser) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + + func createUser(withEmail email: String, password: String) async throws -> AuthDataResult { + let request = SignUpNewUserRequest(email: email, + password: password, + displayName: nil, + idToken: nil, + requestConfiguration: self.requestConfiguration) +#if os(iOS) + let response = try await injectRecaptcha(request: request, + action: AuthRecaptchaAction.signUpPassword) +#else + let response = try await AuthBackend.call(with: request) +#endif + let user = try await self.completeSignIn( + withAccessToken: response.idToken, + accessTokenExpirationDate: response.approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false + ) + let additionalUserInfo = AdditionalUserInfo(providerID: EmailAuthProvider.id, + profile: nil, + username: nil, + isNewUser: true) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + + func confirmPasswordReset(withCode code: String, newPassword: String) async throws { + let request = ResetPasswordRequest(oobCode: code, + newPassword: newPassword, + requestConfiguration: self.requestConfiguration) + let _ = try await AuthBackend.call(with: request) + } + + func checkActionCode(_ code: String) async throws -> ActionCodeInfo { + let request = ResetPasswordRequest(oobCode: code, + newPassword: nil, + requestConfiguration: self.requestConfiguration) + let response = try await AuthBackend.call(with: request) + + let operation = ActionCodeInfo.actionCodeOperation(forRequestType: response.requestType) + guard let email = response.email else { + fatalError("Internal Auth Error: Failed to get a ResetPasswordResponse") + } + return ActionCodeInfo(withOperation: operation, + email: email, + newEmail: response.verifiedEmail) + } + + func verifyPasswordResetCode(_ code: String) async throws -> String { + let info = try await checkActionCode(code) + return info.email + } + + func applyActionCode(_ code: String) async throws { + let request = SetAccountInfoRequest(requestConfiguration: self.requestConfiguration) + request.oobCode = code + let _ = try await AuthBackend.call(with: request) + } + + func sendPasswordReset(withEmail email: String, + actionCodeSettings: ActionCodeSettings? = nil) async throws { + let request = GetOOBConfirmationCodeRequest.passwordResetRequest( + email: email, + actionCodeSettings: actionCodeSettings, + requestConfiguration: self.requestConfiguration + ) +#if os(iOS) + let _ = try await injectRecaptcha(request: request, + action: AuthRecaptchaAction.getOobCode) +#else + let _ = try await AuthBackend.call(with: request) +#endif + } + + func sendSignInLink(toEmail email: String, + actionCodeSettings: ActionCodeSettings) async throws { + let request = GetOOBConfirmationCodeRequest.signInWithEmailLinkRequest( + email, + actionCodeSettings: actionCodeSettings, + requestConfiguration: self.requestConfiguration + ) +#if os(iOS) + let _ = try await injectRecaptcha(request: request, + action: AuthRecaptchaAction.getOobCode) +#else + let _ = try await AuthBackend.call(with: request) +#endif + } + + func signOut() throws { + guard requestConfiguration.auth?.currentUser != nil else { + return + } + try updateCurrentUser(nil, byForce: false, savingToDisk: true) + } + + func updateCurrentUser(_ user: User) async throws { + if user.requestConfiguration.apiKey != self.requestConfiguration.apiKey { + // If the API keys are different, then we need to confirm that the user belongs to the same + // project before proceeding. + user.requestConfiguration = self.requestConfiguration + try await user.reload() + } + try self.updateCurrentUser(user, byForce: true, savingToDisk: true) + } + + /// Continue with the rest of the Auth object initialization in the worker actor. + func protectedDataInitialization(_ keychainStorageProvider: AuthKeychainStorage) { + // Load current user from Keychain. + guard let auth = requestConfiguration.auth else { + return + } + if let keychainServiceName = Auth.keychainServiceName(forAppName: auth.firebaseAppName) { + auth.keychainServices = AuthKeychainServices(service: keychainServiceName, + storage: keychainStorageProvider) + auth.storedUserManager = AuthStoredUserManager( + serviceName: keychainServiceName, + keychainServices: auth.keychainServices + ) + } + do { + if let storedUserAccessGroup = auth.storedUserManager.getStoredUserAccessGroup() { + try auth.internalUseUserAccessGroup(storedUserAccessGroup) + } else { + let user = try auth.getUser() + try self.updateCurrentUser(user, byForce: false, savingToDisk: false) + if let user { + auth.tenantID = user.tenantID + auth.lastNotifiedUserToken = user.rawAccessToken() + } + } + } catch { +#if os(iOS) || os(tvOS) || targetEnvironment(macCatalyst) + if (error as NSError).code == AuthErrorCode.keychainError.rawValue { + // If there's a keychain error, assume it is due to the keychain being accessed + // before the device is unlocked as a result of prewarming, and listen for the + // UIApplicationProtectedDataDidBecomeAvailable notification. + auth.addProtectedDataDidBecomeAvailableObserver() + } +#endif + AuthLog.logError(code: "I-AUT000001", + message: "Error loading saved user when starting up: \(error)") + } + +#if os(iOS) + if GULAppEnvironmentUtil.isAppExtension() { + // iOS App extensions should not call [UIApplication sharedApplication], even if + // UIApplication responds to it. + return + } + + // Using reflection here to avoid build errors in extensions. + let sel = NSSelectorFromString("sharedApplication") + guard UIApplication.responds(to: sel), + let rawApplication = UIApplication.perform(sel), + let application = rawApplication.takeUnretainedValue() as? UIApplication else { + return + } + + // Initialize for phone number auth. + tokenManager = AuthAPNSTokenManager(withApplication: application) + auth.appCredentialManager = AuthAppCredentialManager(withKeychain: auth.keychainServices) + auth.notificationManager = AuthNotificationManager( + withApplication: application, + appCredentialManager: auth.appCredentialManager + ) + + GULAppDelegateSwizzler.registerAppDelegateInterceptor(auth) + GULSceneDelegateSwizzler.registerSceneDelegateInterceptor(auth) +#endif + } + + func updateEmail(user: User, + email: String?, + password: String?) async throws { + let hadEmailPasswordCredential = user.hasEmailPasswordCredential + try await executeUserUpdateWithChanges(user: user) { userAccount, request in + if let email { + request.email = email + } + if let password { + request.password = password + } + } + if let email { + user.email = email + } + if user.email != nil { + guard !hadEmailPasswordCredential else { + if let error = user.updateKeychain() { + throw error + } + return + } + // The list of providers need to be updated for the newly added email-password provider. + let accessToken = try await user.internalGetTokenAsync() + let getAccountInfoRequest = GetAccountInfoRequest(accessToken: accessToken, + requestConfiguration: requestConfiguration) + do { + let accountInfoResponse = try await AuthBackend.call(with: getAccountInfoRequest) + if let users = accountInfoResponse.users { + for userAccountInfo in users { + // Set the account to non-anonymous if there are any providers, even if + // they're not email/password ones. + if let providerUsers = userAccountInfo.providerUserInfo { + if providerUsers.count > 0 { + user.isAnonymous = false + for providerUserInfo in providerUsers { + if providerUserInfo.providerID == EmailAuthProvider.id { + user.hasEmailPasswordCredential = true + break + } + } + } + } + } + } + user.update(withGetAccountInfoResponse: accountInfoResponse) + if let error = user.updateKeychain() { + throw error + } + } catch { + user.signOutIfTokenIsInvalid(withError: error) + throw error + } + } + } + + /// Performs a setAccountInfo request by mutating the results of a getAccountInfo response, + /// atomically in regards to other calls to this method. + /// - Parameter changeBlock: A block responsible for mutating a template `SetAccountInfoRequest` + /// - Parameter callback: A block to invoke when the change is complete. Invoked asynchronously on + /// the auth global work queue in the future. + private func executeUserUpdateWithChanges(user: User, changeBlock: @escaping (GetAccountInfoResponseUser, + SetAccountInfoRequest) -> Void) async throws { + let userAccountInfo = try await getAccountInfoRefreshingCache(user) + let accessToken = try await user.internalGetTokenAsync() + + // Mutate setAccountInfoRequest in block + let setAccountInfoRequest = SetAccountInfoRequest(requestConfiguration: requestConfiguration) + setAccountInfoRequest.accessToken = accessToken + changeBlock(userAccountInfo, setAccountInfoRequest) + do { + let accountInfoResponse = try await AuthBackend.call(with: setAccountInfoRequest) + if let idToken = accountInfoResponse.idToken, + let refreshToken = accountInfoResponse.refreshToken { + let tokenService = SecureTokenService( + withRequestConfiguration: requestConfiguration, + accessToken: idToken, + accessTokenExpirationDate: accountInfoResponse.approximateExpirationDate, + refreshToken: refreshToken + ) + try await user.setTokenService(tokenService: tokenService) + } + } catch { + user.signOutIfTokenIsInvalid(withError: error) + throw error + } + } + + /// Gets the users' account data from the server, updating our local values. + /// - Parameter callback: Invoked when the request to getAccountInfo has completed, or when an + /// error has been detected. Invoked asynchronously on the auth global work queue in the future. + private func getAccountInfoRefreshingCache(_ user: User) async throws -> GetAccountInfoResponseUser { + let token = try await user.internalGetTokenAsync() + let request = GetAccountInfoRequest(accessToken: token, + requestConfiguration: requestConfiguration) + do { + let accountInfoResponse = try await AuthBackend.call(with: request) + user.update(withGetAccountInfoResponse: accountInfoResponse) + if let error = user.updateKeychain() { + throw error + } + return (accountInfoResponse.users?.first)! + } catch { + user.signOutIfTokenIsInvalid(withError: error) + throw error + } + } + + func reauthenticate(with credential: AuthCredential) async throws -> AuthDataResult { + do { + let authResult = try await internalSignInAndRetrieveData( + withCredential: credential, + isReauthentication: true + ) + let user = authResult.user + guard user.uid == requestConfiguration.auth?.getUserID() else { + throw AuthErrorUtils.userMismatchError() + } + // TODO: set tokenService migration + + return authResult + } catch { + if (error as NSError).code == AuthErrorCode.userNotFound.rawValue { + throw AuthErrorUtils.userMismatchError() + } + throw error + } + } + + /// Update the current user; initializing the user's internal properties correctly, and + /// optionally saving the user to disk. + /// + /// This method is called during: sign in and sign out events, as well as during class + /// initialization time. The only time the saveToDisk parameter should be set to NO is during + /// class initialization time because the user was just read from disk. + /// - Parameter user: The user to use as the current user (including nil, which is passed at sign + /// out time.) + /// - Parameter saveToDisk: Indicates the method should persist the user data to disk. + func updateCurrentUser(_ user: User?, byForce force: Bool, + savingToDisk saveToDisk: Bool) throws { + if user == requestConfiguration.auth?.currentUser { + // TODO local + requestConfiguration.auth?.possiblyPostAuthStateChangeNotification() + } + if let user { + if user.tenantID != requestConfiguration.auth?.tenantID { + let error = AuthErrorUtils.tenantIDMismatchError() + throw error + } + } + var throwError: Error? + if saveToDisk { + do { + // TODO call local saveSuer + try requestConfiguration.auth?.saveUser(user) + } catch { + throwError = error + } + } + if throwError == nil || force { + requestConfiguration.auth?.currentUser = user + // TODO + requestConfiguration.auth?.possiblyPostAuthStateChangeNotification() + } + if let throwError { + throw throwError + } + } + + func useEmulator(withHost host: String, port: Int) async { + // If host is an IPv6 address, it should be formatted with surrounding brackets. + let formattedHost = host.contains(":") ? "[\(host)]" : host + requestConfiguration.emulatorHostAndPort = "\(formattedHost):\(port)" +#if os(iOS) + requestConfiguration.auth?.settings?.appVerificationDisabledForTesting = true +#endif + } + +#if os(iOS) + func canHandleNotification(_ userInfo: [AnyHashable: Any]) async -> Bool { + guard let auth = requestConfiguration.auth else { + return false + } + return auth.notificationManager.canHandle(notification: userInfo) + } + + func canHandle(_ url: URL) -> Bool { + guard let auth = requestConfiguration.auth, + let authURLPresenter = auth.authURLPresenter as? AuthURLPresenter else { + return false + } + return authURLPresenter.canHandle(url: url) + } + +#endif + + func autoTokenRefresh(accessToken: String, retry: Bool, delay: TimeInterval) async { + try? await Task.sleep(nanoseconds: UInt64(delay * 1_000_000_000)) + guard let auth = requestConfiguration.auth, + let currentUser = auth.currentUser else { + return + } + let accessToken = currentUser.rawAccessToken() + guard currentUser.rawAccessToken() == accessToken else { + // Another auto refresh must have been scheduled, so keep _autoRefreshScheduled unchanged. + return + } + auth.autoRefreshScheduled = false + if auth.isAppInBackground { + return + } + let uid = currentUser.uid + do { + let _ = try await currentUser.internalGetTokenAsync(forceRefresh: true) + if auth.currentUser?.uid != uid { + return + } + } catch { + // Kicks off exponential back off logic to retry failed attempt. Starts with one minute + // delay (60 seconds) if this is the first failed attempt. + let rescheduleDelay = retry ? min(delay * 2, 16 * 60) : 60 + auth.scheduleAutoTokenRefresh(withDelay: rescheduleDelay, retry: true) + } + } + + func fetchAccessToken(user: User, forcingRefresh forceRefresh: Bool) async throws -> (String?, Bool) { + if !forceRefresh, user.tokenService.hasValidAccessToken() { + return (user.tokenService.accessToken, false) + } else { + AuthLog.logDebug(code: "I-AUT000017", message: "Fetching new token from backend.") + return try await user.tokenService.requestAccessToken(retryIfExpired: true) + } + } + + private func internalSignInAndRetrieveData(withCredential credential: AuthCredential, + isReauthentication: Bool) async throws + -> AuthDataResult { + if let emailCredential = credential as? EmailAuthCredential { + // Special case for email/password credentials + switch emailCredential.emailType { + case let .link(link): + // Email link sign in + return try await internalSignInAndRetrieveData(withEmail: emailCredential.email, link: link) + case let .password(password): + // Email password sign in + let user = try await internalSignInUser( + withEmail: emailCredential.email, + password: password + ) + let additionalUserInfo = AdditionalUserInfo(providerID: EmailAuthProvider.id, + profile: nil, + username: nil, + isNewUser: false) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + } + #if !os(watchOS) + if let gameCenterCredential = credential as? GameCenterAuthCredential { + return try await signInAndRetrieveData(withGameCenterCredential: gameCenterCredential) + } + #endif + #if os(iOS) + if let phoneCredential = credential as? PhoneAuthCredential { + // Special case for phone auth credentials + let operation = isReauthentication ? AuthOperationType.reauth : + AuthOperationType.signUpOrSignIn + let response = try await signIn(withPhoneCredential: phoneCredential, + operation: operation) + let user = try await completeSignIn(withAccessToken: response.idToken, + accessTokenExpirationDate: response + .approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false) + + let additionalUserInfo = AdditionalUserInfo(providerID: PhoneAuthProvider.id, + profile: nil, + username: nil, + isNewUser: response.isNewUser) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + #endif + + let request = VerifyAssertionRequest(providerID: credential.provider, + requestConfiguration: requestConfiguration) + request.autoCreate = !isReauthentication + credential.prepare(request) + let response = try await AuthBackend.call(with: request) + if response.needConfirmation { + let email = response.email + let credential = OAuthCredential(withVerifyAssertionResponse: response) + throw AuthErrorUtils.accountExistsWithDifferentCredentialError( + email: email, + updatedCredential: credential + ) + } + guard let providerID = response.providerID, providerID.count > 0 else { + throw AuthErrorUtils.unexpectedResponse(deserializedResponse: response) + } + let user = try await completeSignIn(withAccessToken: response.idToken, + accessTokenExpirationDate: response + .approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false) + let additionalUserInfo = AdditionalUserInfo(providerID: providerID, + profile: response.profile, + username: response.username, + isNewUser: response.isNewUser) + let updatedOAuthCredential = OAuthCredential(withVerifyAssertionResponse: response) + return AuthDataResult(withUser: user, + additionalUserInfo: additionalUserInfo, + credential: updatedOAuthCredential) + } + +#if os(iOS) + /// Signs in using a phone credential. + /// - Parameter credential: The Phone Auth credential used to sign in. + /// - Parameter operation: The type of operation for which this sign-in attempt is initiated. + private func signIn(withPhoneCredential credential: PhoneAuthCredential, + operation: AuthOperationType) async throws -> VerifyPhoneNumberResponse { + switch credential.credentialKind { + case let .phoneNumber(phoneNumber, temporaryProof): + let request = VerifyPhoneNumberRequest(temporaryProof: temporaryProof, + phoneNumber: phoneNumber, + operation: operation, + requestConfiguration: requestConfiguration) + return try await AuthBackend.call(with: request) + case let .verification(verificationID, code): + guard verificationID.count > 0 else { + throw AuthErrorUtils.missingVerificationIDError(message: nil) + } + guard code.count > 0 else { + throw AuthErrorUtils.missingVerificationCodeError(message: nil) + } + let request = VerifyPhoneNumberRequest(verificationID: verificationID, + verificationCode: code, + operation: operation, + requestConfiguration: requestConfiguration) + return try await AuthBackend.call(with: request) + } + } +#endif + +#if !os(watchOS) + /// Signs in using a game center credential. + /// - Parameter credential: The Game Center Auth Credential used to sign in. + private func signInAndRetrieveData(withGameCenterCredential credential: GameCenterAuthCredential) async throws + -> AuthDataResult { + guard let publicKeyURL = credential.publicKeyURL, + let signature = credential.signature, + let salt = credential.salt else { + fatalError( + "Internal Auth Error: Game Center credential missing publicKeyURL, signature, or salt" + ) + } + let request = SignInWithGameCenterRequest(playerID: credential.playerID, + teamPlayerID: credential.teamPlayerID, + gamePlayerID: credential.gamePlayerID, + publicKeyURL: publicKeyURL, + signature: signature, + salt: salt, + timestamp: credential.timestamp, + displayName: credential.displayName, + requestConfiguration: requestConfiguration) + let response = try await AuthBackend.call(with: request) + let user = try await completeSignIn(withAccessToken: response.idToken, + accessTokenExpirationDate: response + .approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false) + let additionalUserInfo = AdditionalUserInfo(providerID: GameCenterAuthProvider.id, + profile: nil, + username: nil, + isNewUser: response.isNewUser) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + +#endif + + /// Signs in using an email and email sign-in link. + /// - Parameter email: The user's email address. + /// - Parameter link: The email sign-in link. + private func internalSignInAndRetrieveData(withEmail email: String, + link: String) async throws -> AuthDataResult { + guard let auth = requestConfiguration.auth, auth.isSignIn(withEmailLink: link) else { + fatalError("The link provided is not valid for email/link sign-in. Please check the link by " + + "calling isSignIn(withEmailLink:) on the Auth instance before attempting to use it " + + "for email/link sign-in.") + } + let queryItems = getQueryItems(link) + guard let actionCode = queryItems["oobCode"] else { + fatalError("Missing oobCode in link URL") + } + let request = EmailLinkSignInRequest(email: email, + oobCode: actionCode, + requestConfiguration: requestConfiguration) + let response = try await AuthBackend.call(with: request) + let user = try await completeSignIn(withAccessToken: response.idToken, + accessTokenExpirationDate: response + .approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false) + + let additionalUserInfo = AdditionalUserInfo(providerID: EmailAuthProvider.id, + profile: nil, + username: nil, + isNewUser: response.isNewUser) + return AuthDataResult(withUser: user, additionalUserInfo: additionalUserInfo) + } + private func getQueryItems(_ link: String) -> [String: String] { + var queryItems = AuthWebUtils.parseURL(link) + if queryItems.count == 0 { + let urlComponents = URLComponents(string: link) + if let query = urlComponents?.query { + queryItems = AuthWebUtils.parseURL(query) + } + } + return queryItems + } + + + + private func internalSignInUser(withEmail email: String, password: String) async throws -> User { + let request = VerifyPasswordRequest(email: email, + password: password, + requestConfiguration: requestConfiguration) + if request.password.count == 0 { + throw AuthErrorUtils.wrongPasswordError(message: nil) + } + #if os(iOS) + let response = try await injectRecaptcha(request: request, + action: AuthRecaptchaAction.signInWithPassword) + #else + let response = try await AuthBackend.call(with: request) + #endif + return try await completeSignIn( + withAccessToken: response.idToken, + accessTokenExpirationDate: response.approximateExpirationDate, + refreshToken: response.refreshToken, + anonymous: false + ) + } + + #if os(iOS) + func injectRecaptcha(request: T, + action: AuthRecaptchaAction) async throws -> T + .Response { + let recaptchaVerifier = AuthRecaptchaVerifier.shared(auth: requestConfiguration.auth) + if recaptchaVerifier.enablementStatus(forProvider: AuthRecaptchaProvider.password) { + try await recaptchaVerifier.injectRecaptchaFields(request: request, + provider: AuthRecaptchaProvider.password, + action: action) + } else { + do { + return try await AuthBackend.call(with: request) + } catch { + let nsError = error as NSError + if let underlyingError = nsError.userInfo[NSUnderlyingErrorKey] as? NSError, + nsError.code == AuthErrorCode.internalError.rawValue, + let messages = underlyingError + .userInfo[AuthErrorUtils.userInfoDeserializedResponseKey] as? [String: AnyHashable], + let message = messages["message"] as? String, + message.hasPrefix("MISSING_RECAPTCHA_TOKEN") { + try await recaptchaVerifier.injectRecaptchaFields( + request: request, + provider: AuthRecaptchaProvider.password, + action: action + ) + } else { + throw error + } + } + } + return try await AuthBackend.call(with: request) + } +#endif + + private func completeSignIn(withAccessToken accessToken: String?, + accessTokenExpirationDate: Date?, + refreshToken: String?, + anonymous: Bool) async throws -> User { + return try await User.retrieveUser(withAuth: requestConfiguration.auth!, + accessToken: accessToken, + accessTokenExpirationDate: accessTokenExpirationDate, + refreshToken: refreshToken, + anonymous: anonymous) + } + + + init(requestConfiguration: AuthRequestConfiguration) { + self.requestConfiguration = requestConfiguration + } + +} + + diff --git a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift index 61a782713472..074c588b5fdd 100644 --- a/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift +++ b/FirebaseAuth/Sources/Swift/AuthProvider/PhoneAuthProvider.swift @@ -319,7 +319,7 @@ import Foundation } var token: AuthAPNSToken do { - token = try await auth.tokenManager.getToken() + token = try await auth.tokenManagerGet().getToken() } catch { return try await CodeIdentity .recaptcha(reCAPTCHAFlowWithUIDelegate(withUIDelegate: uiDelegate)) diff --git a/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift b/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift index e7dc9c8d0d6e..704de8c1c822 100644 --- a/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift +++ b/FirebaseAuth/Sources/Swift/SystemService/SecureTokenService.swift @@ -83,6 +83,17 @@ class SecureTokenService: NSObject, NSSecureCoding { } } + /// Fetch a fresh ephemeral access token for the ID associated with this instance. The token + /// received in the callback should be considered short lived and not cached. + /// + /// Invoked asyncronously on the auth global work queue in the future. + /// - Parameter forceRefresh: Forces the token to be refreshed. + /// - Parameter callback: Callback block that will be called to return either the token or an + /// error. + func fetchAccessToken(user: User, forcingRefresh forceRefresh: Bool) async throws -> (String?, Bool) { + return try await user.auth.authWorker.fetchAccessToken(user: user, forcingRefresh: forceRefresh) + } + private let taskQueue: AuthSerialTaskQueue // MARK: NSSecureCoding @@ -140,7 +151,7 @@ class SecureTokenService: NSObject, NSSecureCoding { /// since only one of those tasks is ever running at a time, and those tasks are the only /// access to and mutation of these instance variables. /// - Returns: Token and Bool indicating if update occurred. - private func requestAccessToken(retryIfExpired: Bool) async throws -> (String?, Bool) { + func requestAccessToken(retryIfExpired: Bool) async throws -> (String?, Bool) { // TODO: This was a crash in ObjC SDK, should it callback with an error? guard let refreshToken, let requestConfiguration else { fatalError("refreshToken and requestConfiguration should not be nil") @@ -184,7 +195,7 @@ class SecureTokenService: NSObject, NSSecureCoding { return (response.accessToken, tokenUpdated) } - private func hasValidAccessToken() -> Bool { + func hasValidAccessToken() -> Bool { if let accessTokenExpirationDate, accessTokenExpirationDate.timeIntervalSinceNow > kFiveMinutes { AuthLog.logDebug(code: "I-AUT000017", diff --git a/FirebaseAuth/Sources/Swift/User/User.swift b/FirebaseAuth/Sources/Swift/User/User.swift index 4b006d9d5328..7f4bd0f7e08e 100644 --- a/FirebaseAuth/Sources/Swift/User/User.swift +++ b/FirebaseAuth/Sources/Swift/User/User.swift @@ -29,7 +29,7 @@ extension User: NSSecureCoding {} @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @objc(FIRUser) open class User: NSObject, UserInfo { /// Indicates the user represents an anonymous user. - @objc public private(set) var isAnonymous: Bool + @objc public internal(set) var isAnonymous: Bool /// Indicates the user represents an anonymous user. @objc open func anonymous() -> Bool { return isAnonymous } @@ -97,9 +97,16 @@ extension User: NSSecureCoding {} ) @objc(updateEmail:completion:) open func updateEmail(to email: String, completion: ((Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - self.updateEmail(email: email, password: nil) { error in - User.callInMainThreadWithError(callback: completion, error: error) + Task { + do { + try await auth.authWorker.updateEmail(user: self, email: email, password: nil) + await MainActor.run { + completion?(nil) + } + } catch { + await MainActor.run { + completion?(error) + } } } } @@ -137,15 +144,7 @@ extension User: NSSecureCoding {} ) @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func updateEmail(to email: String) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.updateEmail(to: email) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } - } + try await auth.authWorker.updateEmail(user: self, email: email, password: nil) } /// Updates the password for the user. On success, the cached user profile data is updated. @@ -167,15 +166,16 @@ extension User: NSSecureCoding {} /// finished. @objc(updatePassword:completion:) open func updatePassword(to password: String, completion: ((Error?) -> Void)? = nil) { - guard password.count > 0 else { - if let completion { - completion(AuthErrorUtils.weakPasswordError(serverResponseReason: "Missing Password")) - } - return - } - kAuthGlobalWorkQueue.async { - self.updateEmail(email: nil, password: password) { error in - User.callInMainThreadWithError(callback: completion, error: error) + Task { + do { + try await self.updatePassword(to: password) + await MainActor.run { + completion?(nil) + } + } catch { + await MainActor.run { + completion?(error) + } } } } @@ -197,15 +197,10 @@ extension User: NSSecureCoding {} /// - Parameter password: The new password for the user. @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) open func updatePassword(to password: String) async throws { - return try await withCheckedThrowingContinuation { continuation in - self.updatePassword(to: password) { error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume() - } - } + guard password.count > 0 else { + throw AuthErrorUtils.weakPasswordError(serverResponseReason: "Missing Password") } + return try await auth.authWorker.updateEmail(user: self, email: nil, password: password) } #if os(iOS) @@ -355,39 +350,15 @@ extension User: NSSecureCoding {} @objc(reauthenticateWithCredential:completion:) open func reauthenticate(with credential: AuthCredential, completion: ((AuthDataResult?, Error?) -> Void)? = nil) { - kAuthGlobalWorkQueue.async { - Task { - do { - let authResult = try await self.auth?.internalSignInAndRetrieveData( - withCredential: credential, - isReauthentication: true - ) - guard let user = authResult?.user, - user.uid == self.auth?.getUserID() else { - User.callInMainThreadWithAuthDataResultAndError( - callback: completion, - result: authResult, - error: AuthErrorUtils.userMismatchError() - ) - return - } - // Successful reauthenticate - self.setTokenService(tokenService: user.tokenService) { error in - User.callInMainThreadWithAuthDataResultAndError(callback: completion, - result: authResult, - error: error) - } - } catch { - // If "user not found" error returned by backend, - // translate to user mismatch error which is more - // accurate. - var reportError: Error = error - if (error as NSError).code == AuthErrorCode.userNotFound.rawValue { - reportError = AuthErrorUtils.userMismatchError() - } - User.callInMainThreadWithAuthDataResultAndError(callback: completion, - result: nil, - error: reportError) + Task { + do { + let result = try await reauthenticate(with: credential) + await MainActor.run { + completion?(result, nil) + } + } catch { + await MainActor.run { + completion?(nil, error) } } } @@ -425,15 +396,7 @@ extension User: NSSecureCoding {} @available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) @discardableResult open func reauthenticate(with credential: AuthCredential) async throws -> AuthDataResult { - return try await withCheckedThrowingContinuation { continuation in - self.reauthenticate(with: credential) { result, error in - if let result { - continuation.resume(returning: result) - } else if let error { - continuation.resume(throwing: error) - } - } - } + return try await self.auth.authWorker.reauthenticate(with: credential) } #if os(iOS) @@ -1188,7 +1151,7 @@ extension User: NSSecureCoding {} @objc open var phoneNumber: String? /// Whether or not the user can be authenticated by using Firebase email and password. - private var hasEmailPasswordCredential: Bool + var hasEmailPasswordCredential: Bool /// Used to serialize the update profile calls. private var taskQueue: AuthSerialTaskQueue @@ -1203,7 +1166,7 @@ extension User: NSSecureCoding {} private weak var _auth: Auth? /// A weak reference to an `Auth` instance associated with this instance. - weak var auth: Auth? { + weak var auth: Auth! { set { _auth = newValue guard let requestConfiguration = auth?.requestConfiguration else { @@ -1217,142 +1180,7 @@ extension User: NSSecureCoding {} // MARK: Private functions - private func updateEmail(email: String?, - password: String?, - callback: @escaping (Error?) -> Void) { - let hadEmailPasswordCredential = hasEmailPasswordCredential - executeUserUpdateWithChanges(changeBlock: { user, request in - if let email { - request.email = email - } - if let password { - request.password = password - } - }) { error in - if let error { - callback(error) - return - } - if let email { - self.email = email - } - if self.email != nil { - if !hadEmailPasswordCredential { - // The list of providers need to be updated for the newly added email-password provider. - self.internalGetToken { accessToken, error in - if let error { - callback(error) - return - } - guard let accessToken else { - fatalError("Auth Internal Error: Both accessToken and error are nil") - } - if let requestConfiguration = self.auth?.requestConfiguration { - let getAccountInfoRequest = GetAccountInfoRequest(accessToken: accessToken, - requestConfiguration: requestConfiguration) - Task { - do { - let accountInfoResponse = try await AuthBackend.call(with: getAccountInfoRequest) - if let users = accountInfoResponse.users { - for userAccountInfo in users { - // Set the account to non-anonymous if there are any providers, even if - // they're not email/password ones. - if let providerUsers = userAccountInfo.providerUserInfo { - if providerUsers.count > 0 { - self.isAnonymous = false - for providerUserInfo in providerUsers { - if providerUserInfo.providerID == EmailAuthProvider.id { - self.hasEmailPasswordCredential = true - break - } - } - } - } - } - } - self.update(withGetAccountInfoResponse: accountInfoResponse) - if let error = self.updateKeychain() { - callback(error) - return - } - callback(nil) - } catch { - self.signOutIfTokenIsInvalid(withError: error) - callback(error) - } - } - } - } - return - } - } - if let error = self.updateKeychain() { - callback(error) - return - } - callback(nil) - } - } - /// Performs a setAccountInfo request by mutating the results of a getAccountInfo response, - /// atomically in regards to other calls to this method. - /// - Parameter changeBlock: A block responsible for mutating a template `SetAccountInfoRequest` - /// - Parameter callback: A block to invoke when the change is complete. Invoked asynchronously on - /// the auth global work queue in the future. - func executeUserUpdateWithChanges(changeBlock: @escaping (GetAccountInfoResponseUser, - SetAccountInfoRequest) -> Void, - callback: @escaping (Error?) -> Void) { - taskQueue.enqueueTask { complete in - self.getAccountInfoRefreshingCache { user, error in - if let error { - complete() - callback(error) - return - } - guard let user else { - fatalError("Internal error: Both user and error are nil") - } - self.internalGetToken { accessToken, error in - if let error { - complete() - callback(error) - return - } - if let configuration = self.auth?.requestConfiguration { - // Mutate setAccountInfoRequest in block - let setAccountInfoRequest = SetAccountInfoRequest(requestConfiguration: configuration) - setAccountInfoRequest.accessToken = accessToken - changeBlock(user, setAccountInfoRequest) - Task { - do { - let accountInfoResponse = try await AuthBackend.call(with: setAccountInfoRequest) - if let idToken = accountInfoResponse.idToken, - let refreshToken = accountInfoResponse.refreshToken { - let tokenService = SecureTokenService( - withRequestConfiguration: configuration, - accessToken: idToken, - accessTokenExpirationDate: accountInfoResponse.approximateExpirationDate, - refreshToken: refreshToken - ) - self.setTokenService(tokenService: tokenService) { error in - complete() - callback(error) - } - return - } - complete() - callback(nil) - } catch { - self.signOutIfTokenIsInvalid(withError: error) - complete() - callback(error) - } - } - } - } - } - } - } /// Sets a new token service for the `User` instance. /// @@ -1360,7 +1188,7 @@ extension User: NSSecureCoding {} /// are saved in the keychain before calling back. /// - Parameter tokenService: The new token service object. /// - Parameter callback: The block to be called in the global auth working queue once finished. - private func setTokenService(tokenService: SecureTokenService, + func setTokenService(tokenService: SecureTokenService, callback: @escaping (Error?) -> Void) { tokenService.fetchAccessToken(forcingRefresh: false) { token, error, tokenUpdated in if let error { @@ -1376,6 +1204,18 @@ extension User: NSSecureCoding {} } } + /// Sets a new token service for the `User` instance. + /// + /// The method makes sure the token service has access and refresh token and the new tokens + /// are saved in the keychain before calling back. + /// - Parameter tokenService: The new token service object. + func setTokenService(tokenService: SecureTokenService) async throws { + self.tokenService = tokenService + if let error = self.updateKeychain() { + throw error + } + } + /// Gets the users' account data from the server, updating our local values. /// - Parameter callback: Invoked when the request to getAccountInfo has completed, or when an /// error has been detected. Invoked asynchronously on the auth global work queue in the future. @@ -1411,7 +1251,7 @@ extension User: NSSecureCoding {} } } - private func update(withGetAccountInfoResponse response: GetAccountInfoResponse) { + func update(withGetAccountInfoResponse response: GetAccountInfoResponse) { guard let user = response.users?.first else { // Silent fallthrough in ObjC code. AuthLog.logWarning(code: "I-AUT000016", message: "Missing user in GetAccountInfoResponse") @@ -1536,7 +1376,7 @@ extension User: NSSecureCoding {} guard let auth = self.auth else { fatalError("Internal Auth error: missing auth instance on user") } - let response = try await auth.injectRecaptcha(request: request, + let response = try await auth.authWorker.injectRecaptcha(request: request, action: AuthRecaptchaAction .signUpPassword) #else @@ -1599,6 +1439,68 @@ extension User: NSSecureCoding {} } } + // DELETE ME + /// Performs a setAccountInfo request by mutating the results of a getAccountInfo response, + /// atomically in regards to other calls to this method. + /// - Parameter changeBlock: A block responsible for mutating a template `SetAccountInfoRequest` + /// - Parameter callback: A block to invoke when the change is complete. Invoked asynchronously on + /// the auth global work queue in the future. + func executeUserUpdateWithChanges(changeBlock: @escaping (GetAccountInfoResponseUser, + SetAccountInfoRequest) -> Void, + callback: @escaping (Error?) -> Void) { + taskQueue.enqueueTask { complete in + self.getAccountInfoRefreshingCache { user, error in + if let error { + complete() + callback(error) + return + } + guard let user else { + fatalError("Internal error: Both user and error are nil") + } + self.internalGetToken { accessToken, error in + if let error { + complete() + callback(error) + return + } + if let configuration = self.auth?.requestConfiguration { + // Mutate setAccountInfoRequest in block + let setAccountInfoRequest = SetAccountInfoRequest(requestConfiguration: configuration) + setAccountInfoRequest.accessToken = accessToken + changeBlock(user, setAccountInfoRequest) + Task { + do { + let accountInfoResponse = try await AuthBackend.call(with: setAccountInfoRequest) + if let idToken = accountInfoResponse.idToken, + let refreshToken = accountInfoResponse.refreshToken { + let tokenService = SecureTokenService( + withRequestConfiguration: configuration, + accessToken: idToken, + accessTokenExpirationDate: accountInfoResponse.approximateExpirationDate, + refreshToken: refreshToken + ) + self.setTokenService(tokenService: tokenService) { error in + complete() + callback(error) + } + return + } + complete() + callback(nil) + } catch { + self.signOutIfTokenIsInvalid(withError: error) + complete() + callback(error) + } + } + } + } + } + } + } + + private func link(withEmailCredential emailCredential: EmailAuthCredential, completion: ((AuthDataResult?, Error?) -> Void)?) { if hasEmailPasswordCredential { @@ -1780,7 +1682,7 @@ extension User: NSSecureCoding {} /// Signs out this user if the user or the token is invalid. /// - Parameter error: The error from the server. - private func signOutIfTokenIsInvalid(withError error: Error) { + func signOutIfTokenIsInvalid(withError error: Error) { let code = (error as NSError).code if code == AuthErrorCode.userNotFound.rawValue || code == AuthErrorCode.userDisabled.rawValue || @@ -1814,14 +1716,19 @@ extension User: NSSecureCoding {} } func internalGetTokenAsync(forceRefresh: Bool = false) async throws -> String { - return try await withCheckedThrowingContinuation { continuation in - self.internalGetToken(forceRefresh: forceRefresh) { token, error in - if let error { - continuation.resume(throwing: error) - } else { - continuation.resume(returning: token!) + do { + let (token, tokenUpdated) = try await tokenService.fetchAccessToken( + user: self, + forcingRefresh: forceRefresh) + if tokenUpdated { + if let error = self.updateKeychain() { + throw error } } + return token! + } catch { + self.signOutIfTokenIsInvalid(withError: error) + throw error } } diff --git a/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift b/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift deleted file mode 100644 index 08f34585ba04..000000000000 --- a/FirebaseAuth/Tests/Unit/AuthDispatcherTests.swift +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2023 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 -import XCTest - -@testable import FirebaseAuth - -@available(iOS 13, tvOS 13, macOS 10.15, macCatalyst 13, watchOS 7, *) -class AuthDispatcherTests: XCTestCase { - let kTestDelay = 0.1 - let kMaxDifferenceBetweenTimeIntervals = 0.4 - - /** @fn testSharedInstance - @brief Tests @c sharedInstance returns the same object. - */ - func testSharedInstance() { - let instance1 = AuthDispatcher.shared - let instance2 = AuthDispatcher.shared - XCTAssert(instance1 === instance2) - } - - /** @fn testDispatchAfterDelay - @brief Tests @c dispatchAfterDelay indeed dispatches the specified task after the provided - delay. - */ - func testDispatchAfterDelay() { - let dispatcher = AuthDispatcher.shared - let testWorkQueue = DispatchQueue(label: "test.work.queue") - let expectation = self.expectation(description: #function) - let dateBeforeDispatch = Date() - dispatcher.dispatchAfterImplementation = nil - dispatcher.dispatch(afterDelay: kTestDelay, queue: testWorkQueue) { [self] in - let timeSinceDispatch = fabs(dateBeforeDispatch.timeIntervalSinceNow - self.kTestDelay) - XCTAssertLessThan(timeSinceDispatch, kMaxDifferenceBetweenTimeIntervals) - expectation.fulfill() - } - waitForExpectations(timeout: 5) - } - - /** @fn testSetDispatchAfterImplementation - @brief Tests that @c dispatchAfterImplementation indeed configures a custom implementation for - @c dispatchAfterDelay. - */ - func testSetDispatchAfterImplementation() { - let dispatcher = AuthDispatcher.shared - let testWorkQueue = DispatchQueue(label: "test.work.queue") - let expectation = self.expectation(description: #function) - dispatcher.dispatchAfterImplementation = { delay, queue, task in - XCTAssertEqual(self.kTestDelay, delay) - XCTAssertEqual(testWorkQueue, queue) - expectation.fulfill() - } - - dispatcher.dispatch(afterDelay: kTestDelay, queue: testWorkQueue) { - // Fail to ensure this code is never executed. - XCTFail("Should not execute this code") - } - waitForExpectations(timeout: 5) - } -} diff --git a/FirebaseAuth/Tests/Unit/AuthTests.swift b/FirebaseAuth/Tests/Unit/AuthTests.swift index b3464f67829e..68439de44cef 100644 --- a/FirebaseAuth/Tests/Unit/AuthTests.swift +++ b/FirebaseAuth/Tests/Unit/AuthTests.swift @@ -50,14 +50,6 @@ class AuthTests: RPCBaseTests { keychainStorageProvider: keychainStorageProvider ) - // Set authDispatcherCallback implementation in order to save the token refresh task for later - // execution. - AuthDispatcher.shared.dispatchAfterImplementation = { delay, queue, task in - XCTAssertNotNil(task) - XCTAssertGreaterThan(delay, 0) - XCTAssertEqual(kAuthGlobalWorkQueue, queue) - self.authDispatcherCallback = task - } // Wait until Auth initialization completes waitForAuthGlobalWorkQueueDrain() } @@ -507,6 +499,25 @@ class AuthTests: RPCBaseTests { waitForExpectations(timeout: 5) } + /** @fn testResetPasswordSuccessAsync + @brief Tests the flow of a successful @c confirmPasswordResetWithCode:newPassword: call. + */ + func testResetPasswordSuccessAsync() async throws { + // 1. Setup respond block to test and fake send request. + rpcIssuer.respondBlock = { + // 2. Validate the created Request instance. + let request = try XCTUnwrap(self.rpcIssuer.request as? ResetPasswordRequest) + XCTAssertEqual(request.oobCode, self.kFakeOobCode) + XCTAssertEqual(request.updatedPassword, self.kFakePassword) + XCTAssertEqual(request.apiKey, AuthTests.kFakeAPIKey) + + // 3. Send the response from the fake backend. + try self.rpcIssuer.respond(withJSON: [:]) + } + try await auth?.signOut() + try await auth?.confirmPasswordReset(withCode: kFakeOobCode, newPassword: kFakePassword) + } + /** @fn testResetPasswordFailure @brief Tests the flow of a failed @c confirmPasswordResetWithCode:newPassword:completion: call. @@ -1899,6 +1910,34 @@ class AuthTests: RPCBaseTests { waitForExpectations(timeout: 5) } + /** @fn testUpdateCurrentUserSuccessAsync + @brief Tests the flow of a successful @c updateCurrentUser:completion: + call with a network error. + */ + func testUpdateCurrentUserSuccessAsync() async throws { + // Sign in with the first user. + try await waitForSignInWithAccessTokenAsync() + let auth = try XCTUnwrap(auth) + let user1 = try XCTUnwrap(auth.currentUser) + let kTestAPIKey = "fakeAPIKey" + user1.requestConfiguration = AuthRequestConfiguration(apiKey: kTestAPIKey, + appID: kTestFirebaseAppID) + try await auth.signOut() + + let kTestAccessToken2 = "fakeAccessToken2" + try await waitForSignInWithAccessTokenAsync(fakeAccessToken: kTestAccessToken2) + let user2 = auth.currentUser + + // Current user should now be user2. + XCTAssertEqual(auth.currentUser, user2) + + try await auth.updateCurrentUser(user1) + + // Current user should now be user1. + XCTAssertEqual(auth.currentUser, user1) + XCTAssertNotEqual(auth.currentUser, user2) + } + /** @fn testRevokeTokenSuccess @brief Tests the flow of a successful @c revokeToken:completion. */ @@ -1957,6 +1996,19 @@ class AuthTests: RPCBaseTests { XCTAssertNil(auth.currentUser) } + /** @fn testSignOutAsync + @brief Tests the @c signOut: method. + */ + func testSignOutAsync() throws { + try waitForSignInWithAccessToken() + Task { + // Verify signing out succeeds and clears the current user. + let auth = try XCTUnwrap(auth) + try await auth.signOut() + XCTAssertNil(auth.currentUser) + } + } + /** @fn testIsSignInWithEmailLink @brief Tests the @c isSignInWithEmailLink: method. */ @@ -2092,6 +2144,18 @@ class AuthTests: RPCBaseTests { #endif } + /** @fn testUseEmulatorAsync + @brief Tests the @c useEmulatorWithHost:port: method. + */ + func testUseEmulatorAsync() async throws { + await auth.useEmulator(withHost: "host", port: 12345) + XCTAssertEqual("host:12345", auth.requestConfiguration.emulatorHostAndPort) + #if os(iOS) + let settings = try XCTUnwrap(auth.settings) + XCTAssertTrue(settings.isAppVerificationDisabledForTesting) + #endif + } + /** @fn testUseEmulatorNeverCalled @brief Tests that the emulatorHostAndPort stored in @c FIRAuthRequestConfiguration is nil if the @c useEmulatorWithHost:port: is not called. @@ -2124,6 +2188,7 @@ class AuthTests: RPCBaseTests { func testAutomaticTokenRefresh() throws { try auth.signOut() // Enable auto refresh + auth.fastTokenRefreshForTest = true enableAutoTokenRefresh() // Sign in a user. @@ -2135,19 +2200,11 @@ class AuthTests: RPCBaseTests { // refresh. XCTAssertEqual(AuthTests.kAccessToken, auth.currentUser?.rawAccessToken()) - // Execute saved token refresh task. - let expectation = self.expectation(description: #function) - kAuthGlobalWorkQueue.async { - XCTAssertNotNil(self.authDispatcherCallback) - self.authDispatcherCallback?() - expectation.fulfill() - } - waitForExpectations(timeout: 5) - waitForAuthGlobalWorkQueueDrain() + // Wait for automatic token refresh to execute saved token refresh task. + sleep(1) // Verify that current user's access token is the "new" access token provided in the mock secure // token response during automatic token refresh. - RPCBaseTests.waitSleep() XCTAssertEqual(AuthTests.kNewAccessToken, auth.currentUser?.rawAccessToken()) } @@ -2158,6 +2215,7 @@ class AuthTests: RPCBaseTests { func testAutomaticTokenRefreshInvalidTokenFailure() throws { try auth.signOut() // Enable auto refresh + auth.fastTokenRefreshForTest = true enableAutoTokenRefresh() // Sign in a user. @@ -2170,18 +2228,10 @@ class AuthTests: RPCBaseTests { // refresh. XCTAssertEqual(AuthTests.kAccessToken, auth.currentUser?.rawAccessToken()) - // Execute saved token refresh task. - let expectation = self.expectation(description: #function) - kAuthGlobalWorkQueue.async { - XCTAssertNotNil(self.authDispatcherCallback) - self.authDispatcherCallback?() - expectation.fulfill() - } - waitForExpectations(timeout: 5) - waitForAuthGlobalWorkQueueDrain() + // Wait for automatic token refresh to execute saved token refresh task. + sleep(1) // Verify that the user is nil after failed attempt to refresh tokens caused signed out. - RPCBaseTests.waitSleep() XCTAssertNil(auth.currentUser) } @@ -2193,6 +2243,7 @@ class AuthTests: RPCBaseTests { func testAutomaticTokenRefreshRetry() throws { try auth.signOut() // Enable auto refresh + auth.fastTokenRefreshForTest = true enableAutoTokenRefresh() // Sign in a user. @@ -2201,17 +2252,6 @@ class AuthTests: RPCBaseTests { // Set up expectation for secureToken RPC made by a failed attempt to refresh tokens. rpcIssuer.secureTokenNetworkError = NSError(domain: "ERROR", code: -1) - // Execute saved token refresh task. - let expectation = self.expectation(description: #function) - kAuthGlobalWorkQueue.async { - XCTAssertNotNil(self.authDispatcherCallback) - self.authDispatcherCallback?() - self.authDispatcherCallback = nil - expectation.fulfill() - } - waitForExpectations(timeout: 5) - waitForAuthGlobalWorkQueueDrain() - rpcIssuer.secureTokenNetworkError = nil setFakeSecureTokenService(fakeAccessToken: AuthTests.kNewAccessToken) @@ -2219,19 +2259,8 @@ class AuthTests: RPCBaseTests { // token (kNewAccessToken). XCTAssertEqual(AuthTests.kAccessToken, auth.currentUser?.rawAccessToken()) - // Execute saved token refresh task. - let expectation2 = self.expectation(description: "dispatchAfterExpectation") - kAuthGlobalWorkQueue.async { - RPCBaseTests.waitSleep() - XCTAssertNotNil(self.authDispatcherCallback) - self.authDispatcherCallback?() - expectation2.fulfill() - } - waitForExpectations(timeout: 5) - waitForAuthGlobalWorkQueueDrain() - - // Time for callback to run. - RPCBaseTests.waitSleep() + // Wait for automatic token refresh to execute saved token refresh task. + sleep(1) // Verify that current user's access token is the "new" access token provided in the mock secure // token response during automatic token refresh. @@ -2243,9 +2272,10 @@ class AuthTests: RPCBaseTests { @brief Tests that app foreground notification triggers the scheduling of an automatic token refresh task. */ - func testAutoRefreshAppForegroundedNotification() throws { + func SKIPtestAutoRefreshAppForegroundedNotification() throws { try auth.signOut() // Enable auto refresh + auth.fastTokenRefreshForTest = true enableAutoTokenRefresh() // Sign in a user. @@ -2260,18 +2290,8 @@ class AuthTests: RPCBaseTests { // token refresh. XCTAssertEqual(AuthTests.kAccessToken, auth.currentUser?.rawAccessToken()) - // Execute saved token refresh task. - let expectation = self.expectation(description: #function) - kAuthGlobalWorkQueue.async { - XCTAssertNotNil(self.authDispatcherCallback) - self.authDispatcherCallback?() - expectation.fulfill() - } - waitForExpectations(timeout: 5) - waitForAuthGlobalWorkQueueDrain() - - // Time for callback to run. - RPCBaseTests.waitSleep() + // Wait for automatic token refresh to execute saved token refresh task. + sleep(1) // Verify that current user's access token is the "new" access token provided in the mock // secure token response during automatic token refresh. @@ -2294,12 +2314,32 @@ class AuthTests: RPCBaseTests { } } let apnsToken = Data() - auth.tokenManager = FakeAuthTokenManager(withApplication: UIApplication.shared) + auth.tokenManagerInit(FakeAuthTokenManager(withApplication: UIApplication.shared)) auth.application(UIApplication.shared, didRegisterForRemoteNotificationsWithDeviceToken: apnsToken) - XCTAssertEqual(auth.tokenManager.token?.data, apnsToken) - XCTAssertEqual(auth.tokenManager.token?.type, .unknown) + XCTAssertEqual(auth.tokenManagerGet().token?.data, apnsToken) + XCTAssertEqual(auth.tokenManagerGet().token?.type, .unknown) + } + + func testAppDidRegisterForRemoteNotifications_APNSTokenUpdatedAsync() async { + class FakeAuthTokenManager: AuthAPNSTokenManager { + override var token: AuthAPNSToken? { + get { + return tokenStore + } + set(setToken) { + tokenStore = setToken + } + } } + let apnsToken = Data() + await auth.tokenManagerInit(FakeAuthTokenManager(withApplication: UIApplication.shared)) + await auth.application(UIApplication.shared, + didRegisterForRemoteNotificationsWithDeviceToken: apnsToken) + let manager = await auth.tokenManagerGet() + XCTAssertEqual(manager.token?.data, apnsToken) + XCTAssertEqual(manager.token?.type, .unknown) + } func testAppDidFailToRegisterForRemoteNotifications_TokenManagerCancels() { class FakeAuthTokenManager: AuthAPNSTokenManager { @@ -2310,13 +2350,29 @@ class AuthTests: RPCBaseTests { } let error = NSError(domain: "AuthTests", code: -1) let fakeTokenManager = FakeAuthTokenManager(withApplication: UIApplication.shared) - auth.tokenManager = fakeTokenManager + auth.tokenManagerInit(fakeTokenManager) XCTAssertFalse(fakeTokenManager.cancelled) auth.application(UIApplication.shared, didFailToRegisterForRemoteNotificationsWithError: error) XCTAssertTrue(fakeTokenManager.cancelled) } + func testAppDidFailToRegisterForRemoteNotifications_TokenManagerCancelsAsync() async { + class FakeAuthTokenManager: AuthAPNSTokenManager { + var cancelled = false + override func cancel(withError error: Error) { + cancelled = true + } + } + let error = NSError(domain: "AuthTests", code: -1) + let fakeTokenManager = await FakeAuthTokenManager(withApplication: UIApplication.shared) + await auth.tokenManagerInit(fakeTokenManager) + XCTAssertFalse(fakeTokenManager.cancelled) + await auth.application(UIApplication.shared, + didFailToRegisterForRemoteNotificationsWithError: error) + XCTAssertTrue(fakeTokenManager.cancelled) + } + func testAppDidReceiveRemoteNotificationWithCompletion_NotificationManagerHandleCanNotification() { class FakeNotificationManager: AuthNotificationManager { var canHandled = false @@ -2356,6 +2412,23 @@ class AuthTests: RPCBaseTests { XCTAssertTrue(auth.application(UIApplication.shared, open: url, options: [:])) XCTAssertTrue(fakeURLPresenter.canHandled) } + + func testAppOpenURL_AuthPresenterCanHandleURLAsync() async throws { + class FakeURLPresenter: AuthURLPresenter { + var canHandled = false + override func canHandle(url: URL) -> Bool { + canHandled = true + return true + } + } + let url = try XCTUnwrap(URL(string: "https://localhost")) + let fakeURLPresenter = FakeURLPresenter() + auth.authURLPresenter = fakeURLPresenter + XCTAssertFalse(fakeURLPresenter.canHandled) + let result = await auth.application(UIApplication.shared, open: url, options: [:]) + XCTAssertTrue(result) + XCTAssertTrue(fakeURLPresenter.canHandled) + } #endif // os(iOS) // MARK: Interoperability Tests @@ -2423,6 +2496,45 @@ class AuthTests: RPCBaseTests { assertUser(auth?.currentUser) } + private func waitForSignInWithAccessTokenAsync(fakeAccessToken: String = kAccessToken) async throws { + let kRefreshToken = "fakeRefreshToken" + setFakeGetAccountProvider() + setFakeSecureTokenService() + + // 1. Set up respondBlock to test request and send it to generate a fake response. + rpcIssuer.respondBlock = { + // 2. Validate the created Request instance. + let request = try XCTUnwrap(self.rpcIssuer.request as? VerifyPasswordRequest) + XCTAssertEqual(request.email, self.kEmail) + XCTAssertEqual(request.password, self.kFakePassword) + XCTAssertEqual(request.apiKey, AuthTests.kFakeAPIKey) + XCTAssertTrue(request.returnSecureToken) + + // 3. Send the response from the fake backend. + try self.rpcIssuer.respond(withJSON: ["idToken": fakeAccessToken, + "email": self.kEmail, + "isNewUser": true, + "expiresIn": "3600", + "refreshToken": kRefreshToken]) + } + let authResult = try await auth?.signIn(withEmail: kEmail, password: kFakePassword) + // 4. After the response triggers the callback, verify the returned result. + guard let user = authResult?.user else { + XCTFail("authResult.user is missing") + return + } + XCTAssertEqual(user.refreshToken, kRefreshToken) + XCTAssertFalse(user.isAnonymous) + XCTAssertEqual(user.email, self.kEmail) + guard let additionalUserInfo = authResult?.additionalUserInfo else { + XCTFail("authResult.additionalUserInfo is missing") + return + } + XCTAssertFalse(additionalUserInfo.isNewUser) + XCTAssertEqual(additionalUserInfo.providerID, EmailAuthProvider.id) + assertUser(auth?.currentUser) + } + private func assertUser(_ user: User?) { guard let user = user else { XCTFail("authResult.additionalUserInfo is missing") diff --git a/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift b/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift index d51ccd255dac..0326f7963f42 100644 --- a/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift +++ b/FirebaseAuth/Tests/Unit/Fakes/FakeBackendRPCIssuer.swift @@ -129,7 +129,7 @@ class FakeBackendRPCIssuer: NSObject, AuthBackendRPCIssuer { return } else if let json = fakeSecureTokenServiceJSON { guard let _ = try? respond(withJSON: json) else { - fatalError("fakeGetAccountProviderJSON respond failed") + fatalError("fakeSecureTokenServiceJSON respond failed") } return } diff --git a/FirebaseAuth/Tests/Unit/SwiftAPI.swift b/FirebaseAuth/Tests/Unit/SwiftAPI.swift index c5063ae11513..a20b0eccefe9 100644 --- a/FirebaseAuth/Tests/Unit/SwiftAPI.swift +++ b/FirebaseAuth/Tests/Unit/SwiftAPI.swift @@ -62,8 +62,8 @@ class AuthAPI_hOnlyTests: XCTestCase { let auth = FirebaseAuth.Auth.auth() let info = try await auth.checkActionCode("code") let _: ActionCodeOperation = info.operation - if let _: String = info.email, - let _: String = info.previousEmail {} + let _: String = info.email + if let _: String = info.previousEmail {} } func ActionCodeURL() {