@firebase/auth 1.3.0-canary.60e4a07d2 → 1.3.0-canary.698eeb67d

package/dist/esm5/index.js

@@ -1,4 +1,4 @@
-export { A as ActionCodeOperation, ah as ActionCodeURL, K as AuthCredential, H as AuthErrorCodes, L as EmailAuthCredential, U as EmailAuthProvider, V as FacebookAuthProvider, F as FactorId, X as GithubAuthProvider, W as GoogleAuthProvider, M as OAuthCredential, Y as OAuthProvider, O as OperationType, N as PhoneAuthCredential, P as PhoneAuthProvider, m as PhoneMultiFactorGenerator, p as ProviderId, R as RecaptchaVerifier, Z as SAMLAuthProvider, S as SignInMethod, T as TotpMultiFactorGenerator, n as TotpSecret, _ as TwitterAuthProvider, a6 as applyActionCode, x as beforeAuthStateChanged, b as browserLocalPersistence, k as browserPopupRedirectResolver, a as browserSessionPersistence, a7 as checkActionCode, a5 as confirmPasswordReset, J as connectAuthEmulator, a9 as createUserWithEmailAndPassword, E as debugErrorMap, D as deleteUser, ae as fetchSignInMethodsForEmail, ap as getAdditionalUserInfo, o as getAuth, am as getIdToken, an as getIdTokenResult, ar as getMultiFactorResolver, j as getRedirectResult, Q as inMemoryPersistence, i as indexedDBLocalPersistence, I as initializeAuth, t as initializeRecaptchaConfig, ac as isSignInWithEmailLink, a1 as linkWithCredential, l as linkWithPhoneNumber, d as linkWithPopup, g as linkWithRedirect, as as multiFactor, y as onAuthStateChanged, w as onIdTokenChanged, ai as parseActionCodeURL, G as prodErrorMap, a2 as reauthenticateWithCredential, r as reauthenticateWithPhoneNumber, e as reauthenticateWithPopup, h as reauthenticateWithRedirect, aq as reload, af as sendEmailVerification, a4 as sendPasswordResetEmail, ab as sendSignInLinkToEmail, q as setPersistence, $ as signInAnonymously, a0 as signInWithCredential, a3 as signInWithCustomToken, aa as signInWithEmailAndPassword, ad as signInWithEmailLink, s as signInWithPhoneNumber, c as signInWithPopup, f as signInWithRedirect, C as signOut, ao as unlink, B as updateCurrentUser, ak as updateEmail, al as updatePassword, u as updatePhoneNumber, aj as updateProfile, z as useDeviceLanguage, v as validatePassword, ag as verifyBeforeUpdateEmail, a8 as verifyPasswordResetCode } from './index-f6b0662a.js';
+export { A as ActionCodeOperation, ah as ActionCodeURL, K as AuthCredential, H as AuthErrorCodes, L as EmailAuthCredential, U as EmailAuthProvider, V as FacebookAuthProvider, F as FactorId, X as GithubAuthProvider, W as GoogleAuthProvider, M as OAuthCredential, Y as OAuthProvider, O as OperationType, N as PhoneAuthCredential, P as PhoneAuthProvider, m as PhoneMultiFactorGenerator, p as ProviderId, R as RecaptchaVerifier, Z as SAMLAuthProvider, S as SignInMethod, T as TotpMultiFactorGenerator, n as TotpSecret, _ as TwitterAuthProvider, a6 as applyActionCode, x as beforeAuthStateChanged, b as browserLocalPersistence, k as browserPopupRedirectResolver, a as browserSessionPersistence, a7 as checkActionCode, a5 as confirmPasswordReset, J as connectAuthEmulator, a9 as createUserWithEmailAndPassword, E as debugErrorMap, D as deleteUser, ae as fetchSignInMethodsForEmail, ap as getAdditionalUserInfo, o as getAuth, am as getIdToken, an as getIdTokenResult, ar as getMultiFactorResolver, j as getRedirectResult, Q as inMemoryPersistence, i as indexedDBLocalPersistence, I as initializeAuth, t as initializeRecaptchaConfig, ac as isSignInWithEmailLink, a1 as linkWithCredential, l as linkWithPhoneNumber, d as linkWithPopup, g as linkWithRedirect, as as multiFactor, y as onAuthStateChanged, w as onIdTokenChanged, ai as parseActionCodeURL, G as prodErrorMap, a2 as reauthenticateWithCredential, r as reauthenticateWithPhoneNumber, e as reauthenticateWithPopup, h as reauthenticateWithRedirect, aq as reload, af as sendEmailVerification, a4 as sendPasswordResetEmail, ab as sendSignInLinkToEmail, q as setPersistence, $ as signInAnonymously, a0 as signInWithCredential, a3 as signInWithCustomToken, aa as signInWithEmailAndPassword, ad as signInWithEmailLink, s as signInWithPhoneNumber, c as signInWithPopup, f as signInWithRedirect, C as signOut, ao as unlink, B as updateCurrentUser, ak as updateEmail, al as updatePassword, u as updatePhoneNumber, aj as updateProfile, z as useDeviceLanguage, v as validatePassword, ag as verifyBeforeUpdateEmail, a8 as verifyPasswordResetCode } from './index-6728b711.js';
 import 'tslib';
 import '@firebase/util';
 import '@firebase/app';

package/dist/esm5/internal.js

@@ -1,5 +1,5 @@
-import { at as _isIOS, au as _isAndroid, av as _fail, aw as _getRedirectUrl, ax as debugAssert, ay as _getProjectConfig, az as _isIOS7Or8, aA as _assert, aB as _createError, aC as AuthEventManager, aD as _getInstance, b as browserLocalPersistence, aE as _persistenceKeyName, aF as _clearRedirectOutcomes, a as browserSessionPersistence, aG as _getRedirectResult, aH as _overrideRedirectResult, aI as _castAuth } from './index-f6b0662a.js';
-export { A as ActionCodeOperation, ah as ActionCodeURL, K as AuthCredential, H as AuthErrorCodes, aK as AuthImpl, aN as AuthPopup, L as EmailAuthCredential, U as EmailAuthProvider, V as FacebookAuthProvider, F as FactorId, aO as FetchProvider, X as GithubAuthProvider, W as GoogleAuthProvider, M as OAuthCredential, Y as OAuthProvider, O as OperationType, N as PhoneAuthCredential, P as PhoneAuthProvider, m as PhoneMultiFactorGenerator, p as ProviderId, R as RecaptchaVerifier, aP as SAMLAuthCredential, Z as SAMLAuthProvider, S as SignInMethod, T as TotpMultiFactorGenerator, n as TotpSecret, _ as TwitterAuthProvider, aJ as UserImpl, aA as _assert, aI as _castAuth, av as _fail, aM as _generateEventId, aL as _getClientVersion, aD as _getInstance, aG as _getRedirectResult, aH as _overrideRedirectResult, aE as _persistenceKeyName, a6 as applyActionCode, x as beforeAuthStateChanged, b as browserLocalPersistence, k as browserPopupRedirectResolver, a as browserSessionPersistence, a7 as checkActionCode, a5 as confirmPasswordReset, J as connectAuthEmulator, a9 as createUserWithEmailAndPassword, E as debugErrorMap, D as deleteUser, ae as fetchSignInMethodsForEmail, ap as getAdditionalUserInfo, o as getAuth, am as getIdToken, an as getIdTokenResult, ar as getMultiFactorResolver, j as getRedirectResult, Q as inMemoryPersistence, i as indexedDBLocalPersistence, I as initializeAuth, t as initializeRecaptchaConfig, ac as isSignInWithEmailLink, a1 as linkWithCredential, l as linkWithPhoneNumber, d as linkWithPopup, g as linkWithRedirect, as as multiFactor, y as onAuthStateChanged, w as onIdTokenChanged, ai as parseActionCodeURL, G as prodErrorMap, a2 as reauthenticateWithCredential, r as reauthenticateWithPhoneNumber, e as reauthenticateWithPopup, h as reauthenticateWithRedirect, aq as reload, af as sendEmailVerification, a4 as sendPasswordResetEmail, ab as sendSignInLinkToEmail, q as setPersistence, $ as signInAnonymously, a0 as signInWithCredential, a3 as signInWithCustomToken, aa as signInWithEmailAndPassword, ad as signInWithEmailLink, s as signInWithPhoneNumber, c as signInWithPopup, f as signInWithRedirect, C as signOut, ao as unlink, B as updateCurrentUser, ak as updateEmail, al as updatePassword, u as updatePhoneNumber, aj as updateProfile, z as useDeviceLanguage, v as validatePassword, ag as verifyBeforeUpdateEmail, a8 as verifyPasswordResetCode } from './index-f6b0662a.js';
+import { at as _isIOS, au as _isAndroid, av as _fail, aw as _getRedirectUrl, ax as debugAssert, ay as _getProjectConfig, az as _isIOS7Or8, aA as _assert, aB as _createError, aC as AuthEventManager, aD as _getInstance, b as browserLocalPersistence, aE as _persistenceKeyName, aF as _clearRedirectOutcomes, a as browserSessionPersistence, aG as _getRedirectResult, aH as _overrideRedirectResult, aI as _castAuth } from './index-6728b711.js';
+export { A as ActionCodeOperation, ah as ActionCodeURL, K as AuthCredential, H as AuthErrorCodes, aK as AuthImpl, aN as AuthPopup, L as EmailAuthCredential, U as EmailAuthProvider, V as FacebookAuthProvider, F as FactorId, aO as FetchProvider, X as GithubAuthProvider, W as GoogleAuthProvider, M as OAuthCredential, Y as OAuthProvider, O as OperationType, N as PhoneAuthCredential, P as PhoneAuthProvider, m as PhoneMultiFactorGenerator, p as ProviderId, R as RecaptchaVerifier, aP as SAMLAuthCredential, Z as SAMLAuthProvider, S as SignInMethod, T as TotpMultiFactorGenerator, n as TotpSecret, _ as TwitterAuthProvider, aJ as UserImpl, aA as _assert, aI as _castAuth, av as _fail, aM as _generateEventId, aL as _getClientVersion, aD as _getInstance, aG as _getRedirectResult, aH as _overrideRedirectResult, aE as _persistenceKeyName, a6 as applyActionCode, x as beforeAuthStateChanged, b as browserLocalPersistence, k as browserPopupRedirectResolver, a as browserSessionPersistence, a7 as checkActionCode, a5 as confirmPasswordReset, J as connectAuthEmulator, a9 as createUserWithEmailAndPassword, E as debugErrorMap, D as deleteUser, ae as fetchSignInMethodsForEmail, ap as getAdditionalUserInfo, o as getAuth, am as getIdToken, an as getIdTokenResult, ar as getMultiFactorResolver, j as getRedirectResult, Q as inMemoryPersistence, i as indexedDBLocalPersistence, I as initializeAuth, t as initializeRecaptchaConfig, ac as isSignInWithEmailLink, a1 as linkWithCredential, l as linkWithPhoneNumber, d as linkWithPopup, g as linkWithRedirect, as as multiFactor, y as onAuthStateChanged, w as onIdTokenChanged, ai as parseActionCodeURL, G as prodErrorMap, a2 as reauthenticateWithCredential, r as reauthenticateWithPhoneNumber, e as reauthenticateWithPopup, h as reauthenticateWithRedirect, aq as reload, af as sendEmailVerification, a4 as sendPasswordResetEmail, ab as sendSignInLinkToEmail, q as setPersistence, $ as signInAnonymously, a0 as signInWithCredential, a3 as signInWithCustomToken, aa as signInWithEmailAndPassword, ad as signInWithEmailLink, s as signInWithPhoneNumber, c as signInWithPopup, f as signInWithRedirect, C as signOut, ao as unlink, B as updateCurrentUser, ak as updateEmail, al as updatePassword, u as updatePhoneNumber, aj as updateProfile, z as useDeviceLanguage, v as validatePassword, ag as verifyBeforeUpdateEmail, a8 as verifyPasswordResetCode } from './index-6728b711.js';
 import { __awaiter, __generator, __extends } from 'tslib';
 import { querystringDecode } from '@firebase/util';
 import '@firebase/app';

package/dist/esm5/src/api/authentication/recaptcha.d.ts

@@ -22,13 +22,13 @@ interface GetRecaptchaConfigRequest {
     clientType?: RecaptchaClientType;
     version?: RecaptchaVersion;
 }
-interface RecaptchaEnforcementState {
+export interface RecaptchaEnforcementProviderState {
     provider: string;
     enforcementState: string;
 }
 export interface GetRecaptchaConfigResponse {
     recaptchaKey: string;
-    recaptchaEnforcementState: RecaptchaEnforcementState[];
+    recaptchaEnforcementState: RecaptchaEnforcementProviderState[];
 }
 export declare function getRecaptchaConfig(auth: Auth, request: GetRecaptchaConfigRequest): Promise<GetRecaptchaConfigResponse>;
 export {};

package/dist/esm5/src/api/index.d.ts

@@ -69,6 +69,15 @@ export declare const enum RecaptchaActionName {
     GET_OOB_CODE = "getOobCode",
     SIGN_UP_PASSWORD = "signUpPassword"
 }
+export declare const enum EnforcementState {
+    ENFORCE = "ENFORCE",
+    AUDIT = "AUDIT",
+    OFF = "OFF",
+    ENFORCEMENT_STATE_UNSPECIFIED = "ENFORCEMENT_STATE_UNSPECIFIED"
+}
+export declare const enum RecaptchaProvider {
+    EMAIL_PASSWORD_PROVIDER = "EMAIL_PASSWORD_PROVIDER"
+}
 export declare const DEFAULT_API_TIMEOUT_MS: Delay;
 export declare function _addTidIfNecessary<T extends {
     tenantId?: string;
@@ -77,6 +86,7 @@ export declare function _performApiRequest<T, V>(auth: Auth, method: HttpMethod,
 export declare function _performFetchWithErrorHandling<V>(auth: Auth, customErrorMap: Partial<ServerErrorMap<ServerError>>, fetchFn: () => Promise<Response>): Promise<V>;
 export declare function _performSignInRequest<T, V extends IdTokenResponse>(auth: Auth, method: HttpMethod, path: Endpoint, request?: T, customErrorMap?: Partial<ServerErrorMap<ServerError>>): Promise<V>;
 export declare function _getFinalTarget(auth: Auth, host: string, path: string, query: string): string;
+export declare function _parseEnforcementState(enforcementStateStr: string): EnforcementState;
 interface PotentialResponse extends IdTokenResponse {
     email?: string;
     phoneNumber?: string;

package/dist/esm5/src/platform_browser/recaptcha/recaptcha.d.ts

@@ -15,7 +15,8 @@
  * limitations under the License.
  */
 import { RecaptchaParameters } from '../../model/public_types';
-import { GetRecaptchaConfigResponse } from '../../api/authentication/recaptcha';
+import { GetRecaptchaConfigResponse, RecaptchaEnforcementProviderState } from '../../api/authentication/recaptcha';
+import { EnforcementState } from '../../api/index';
 export interface Recaptcha {
     render: (container: HTMLElement, parameters: RecaptchaParameters) => number;
     getResponse: (id: number) => string;
@@ -49,8 +50,22 @@ export declare class RecaptchaConfig {
      */
     siteKey: string;
     /**
-     * The reCAPTCHA enablement status of the {@link EmailAuthProvider} for the current tenant.
+     * The list of providers and their enablement status for reCAPTCHA Enterprise.
      */
-    emailPasswordEnabled: boolean;
+    recaptchaEnforcementState: RecaptchaEnforcementProviderState[];
     constructor(response: GetRecaptchaConfigResponse);
+    /**
+     * Returns the reCAPTCHA Enterprise enforcement state for the given provider.
+     *
+     * @param providerStr - The provider whose enforcement state is to be returned.
+     * @returns The reCAPTCHA Enterprise enforcement state for the given provider.
+     */
+    getProviderEnforcementState(providerStr: string): EnforcementState | null;
+    /**
+     * Returns true if the reCAPTCHA Enterprise enforcement state for the provider is set to ENFORCE or AUDIT.
+     *
+     * @param providerStr - The provider whose enablement state is to be returned.
+     * @returns Whether or not reCAPTCHA Enterprise protection is enabled for the given provider.
+     */
+    isProviderEnabled(providerStr: string): boolean;
 }

package/dist/esm5/src/platform_browser/recaptcha/recaptcha_enterprise_verifier.d.ts

@@ -39,4 +39,7 @@ export declare class RecaptchaEnterpriseVerifier {
     verify(action?: string, forceRefresh?: boolean): Promise<string>;
 }
 export declare function injectRecaptchaFields<T>(auth: AuthInternal, request: T, action: RecaptchaActionName, captchaResp?: boolean): Promise<T>;
+declare type ActionMethod<TRequest, TResponse> = (auth: Auth, request: TRequest) => Promise<TResponse>;
+export declare function handleRecaptchaFlow<TRequest, TResponse>(authInstance: AuthInternal, request: TRequest, actionName: RecaptchaActionName, actionMethod: ActionMethod<TRequest, TResponse>): Promise<TResponse>;
 export declare function _initializeRecaptchaConfig(auth: Auth): Promise<void>;
+export {};

package/dist/index.webworker.esm5.js

@@ -551,7 +551,7 @@ function _initializeAuthInstance(auth, deps) {
 }
 
 var name = "@firebase/auth";
-var version = "1.3.0-canary.60e4a07d2";
+var version = "1.3.0-canary.698eeb67d";
 
 /**
  * @license
@@ -1148,6 +1148,18 @@ function _getFinalTarget(auth, host, path, query) {
     }
     return _emulatorUrl(auth.config, base);
 }
+function _parseEnforcementState(enforcementStateStr) {
+    switch (enforcementStateStr) {
+        case 'ENFORCE':
+            return "ENFORCE" /* EnforcementState.ENFORCE */;
+        case 'AUDIT':
+            return "AUDIT" /* EnforcementState.AUDIT */;
+        case 'OFF':
+            return "OFF" /* EnforcementState.OFF */;
+        default:
+            return "ENFORCEMENT_STATE_UNSPECIFIED" /* EnforcementState.ENFORCEMENT_STATE_UNSPECIFIED */;
+    }
+}
 var NetworkTimeout = /** @class */ (function () {
     function NetworkTimeout(auth) {
         var _this = this;
@@ -4617,19 +4629,47 @@ var RecaptchaConfig = /** @class */ (function () {
          */
         this.siteKey = '';
         /**
-         * The reCAPTCHA enablement status of the {@link EmailAuthProvider} for the current tenant.
+         * The list of providers and their enablement status for reCAPTCHA Enterprise.
          */
-        this.emailPasswordEnabled = false;
+        this.recaptchaEnforcementState = [];
         if (response.recaptchaKey === undefined) {
             throw new Error('recaptchaKey undefined');
         }
         // Example response.recaptchaKey: "projects/proj123/keys/sitekey123"
         this.siteKey = response.recaptchaKey.split('/')[3];
-        this.emailPasswordEnabled = response.recaptchaEnforcementState.some(function (enforcementState) {
-            return enforcementState.provider === 'EMAIL_PASSWORD_PROVIDER' &&
-                enforcementState.enforcementState !== 'OFF';
-        });
+        this.recaptchaEnforcementState = response.recaptchaEnforcementState;
     }
+    /**
+     * Returns the reCAPTCHA Enterprise enforcement state for the given provider.
+     *
+     * @param providerStr - The provider whose enforcement state is to be returned.
+     * @returns The reCAPTCHA Enterprise enforcement state for the given provider.
+     */
+    RecaptchaConfig.prototype.getProviderEnforcementState = function (providerStr) {
+        if (!this.recaptchaEnforcementState ||
+            this.recaptchaEnforcementState.length === 0) {
+            return null;
+        }
+        for (var _i = 0, _a = this.recaptchaEnforcementState; _i < _a.length; _i++) {
+            var recaptchaEnforcementState = _a[_i];
+            if (recaptchaEnforcementState.provider &&
+                recaptchaEnforcementState.provider === providerStr) {
+                return _parseEnforcementState(recaptchaEnforcementState.enforcementState);
+            }
+        }
+        return null;
+    };
+    /**
+     * Returns true if the reCAPTCHA Enterprise enforcement state for the provider is set to ENFORCE or AUDIT.
+     *
+     * @param providerStr - The provider whose enablement state is to be returned.
+     * @returns Whether or not reCAPTCHA Enterprise protection is enabled for the given provider.
+     */
+    RecaptchaConfig.prototype.isProviderEnabled = function (providerStr) {
+        return (this.getProviderEnforcementState(providerStr) ===
+            "ENFORCE" /* EnforcementState.ENFORCE */ ||
+            this.getProviderEnforcementState(providerStr) === "AUDIT" /* EnforcementState.AUDIT */);
+    };
     return RecaptchaConfig;
 }());
 
@@ -4850,6 +4890,39 @@ function injectRecaptchaFields(auth, request, action, captchaResp) {
         });
     });
 }
+function handleRecaptchaFlow(authInstance, request, actionName, actionMethod) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function () {
+        var requestWithRecaptcha;
+        var _this = this;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (!((_a = authInstance
+                        ._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.isProviderEnabled("EMAIL_PASSWORD_PROVIDER" /* RecaptchaProvider.EMAIL_PASSWORD_PROVIDER */))) return [3 /*break*/, 2];
+                    return [4 /*yield*/, injectRecaptchaFields(authInstance, request, actionName, actionName === "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */)];
+                case 1:
+                    requestWithRecaptcha = _b.sent();
+                    return [2 /*return*/, actionMethod(authInstance, requestWithRecaptcha)];
+                case 2: return [2 /*return*/, actionMethod(authInstance, request).catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
+                        var requestWithRecaptcha;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0:
+                                    if (!(error.code === "auth/".concat("missing-recaptcha-token" /* AuthErrorCode.MISSING_RECAPTCHA_TOKEN */))) return [3 /*break*/, 2];
+                                    console.log("".concat(actionName, " is protected by reCAPTCHA Enterprise for this project. Automatically triggering the reCAPTCHA flow and restarting the flow."));
+                                    return [4 /*yield*/, injectRecaptchaFields(authInstance, request, actionName, actionName === "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */)];
+                                case 1:
+                                    requestWithRecaptcha = _a.sent();
+                                    return [2 /*return*/, actionMethod(authInstance, requestWithRecaptcha)];
+                                case 2: return [2 /*return*/, Promise.reject(error)];
+                            }
+                        });
+                    }); })];
+            }
+        });
+    });
+}
 function _initializeRecaptchaConfig(auth) {
     return __awaiter(this, void 0, void 0, function () {
         var authInternal, response, config, verifier;
@@ -4870,7 +4943,7 @@ function _initializeRecaptchaConfig(auth) {
                     else {
                         authInternal._tenantRecaptchaConfigs[authInternal.tenantId] = config;
                     }
-                    if (config.emailPasswordEnabled) {
+                    if (config.isProviderEnabled("EMAIL_PASSWORD_PROVIDER" /* RecaptchaProvider.EMAIL_PASSWORD_PROVIDER */)) {
                         verifier = new RecaptchaEnterpriseVerifier(authInternal);
                         void verifier.verify();
                     }
@@ -5268,55 +5341,27 @@ var EmailAuthCredential = /** @class */ (function (_super) {
     };
     /** @internal */
     EmailAuthCredential.prototype._getIdTokenResponse = function (auth) {
-        var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, request_1, requestWithRecaptcha;
-            var _this = this;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _b = this.signInMethod;
-                        switch (_b) {
-                            case "password" /* SignInMethod.EMAIL_PASSWORD */: return [3 /*break*/, 1];
-                            case "emailLink" /* SignInMethod.EMAIL_LINK */: return [3 /*break*/, 4];
-                        }
-                        return [3 /*break*/, 5];
-                    case 1:
-                        request_1 = {
+            var request;
+            return __generator(this, function (_a) {
+                switch (this.signInMethod) {
+                    case "password" /* SignInMethod.EMAIL_PASSWORD */:
+                        request = {
                             returnSecureToken: true,
                             email: this._email,
                             password: this._password,
                             clientType: "CLIENT_TYPE_WEB" /* RecaptchaClientType.WEB */
                         };
-                        if (!((_a = auth._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.emailPasswordEnabled)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, injectRecaptchaFields(auth, request_1, "signInWithPassword" /* RecaptchaActionName.SIGN_IN_WITH_PASSWORD */)];
-                    case 2:
-                        requestWithRecaptcha = _c.sent();
-                        return [2 /*return*/, signInWithPassword(auth, requestWithRecaptcha)];
-                    case 3: return [2 /*return*/, signInWithPassword(auth, request_1).catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
-                            var requestWithRecaptcha;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        if (!(error.code === "auth/".concat("missing-recaptcha-token" /* AuthErrorCode.MISSING_RECAPTCHA_TOKEN */))) return [3 /*break*/, 2];
-                                        console.log('Sign-in with email address and password is protected by reCAPTCHA for this project. Automatically triggering the reCAPTCHA flow and restarting the sign-in flow.');
-                                        return [4 /*yield*/, injectRecaptchaFields(auth, request_1, "signInWithPassword" /* RecaptchaActionName.SIGN_IN_WITH_PASSWORD */)];
-                                    case 1:
-                                        requestWithRecaptcha = _a.sent();
-                                        return [2 /*return*/, signInWithPassword(auth, requestWithRecaptcha)];
-                                    case 2: return [2 /*return*/, Promise.reject(error)];
-                                }
-                            });
-                        }); })];
-                    case 4: return [2 /*return*/, signInWithEmailLink$1(auth, {
-                            email: this._email,
-                            oobCode: this._password
-                        })];
-                    case 5:
+                        return [2 /*return*/, handleRecaptchaFlow(auth, request, "signInWithPassword" /* RecaptchaActionName.SIGN_IN_WITH_PASSWORD */, signInWithPassword)];
+                    case "emailLink" /* SignInMethod.EMAIL_LINK */:
+                        return [2 /*return*/, signInWithEmailLink$1(auth, {
+                                email: this._email,
+                                oobCode: this._password
+                            })];
+                    default:
                         _fail(auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
-                        _c.label = 6;
-                    case 6: return [2 /*return*/];
                 }
+                return [2 /*return*/];
             });
         });
     };
@@ -7526,12 +7571,10 @@ function recachePasswordPolicy(auth) {
  * @public
  */
 function sendPasswordResetEmail(auth, email, actionCodeSettings) {
-    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var authInternal, request, requestWithRecaptcha;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var authInternal, request;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     authInternal = _castAuth(auth);
                     request = {
@@ -7539,48 +7582,13 @@ function sendPasswordResetEmail(auth, email, actionCodeSettings) {
                         email: email,
                         clientType: "CLIENT_TYPE_WEB" /* RecaptchaClientType.WEB */
                     };
-                    if (!((_a = authInternal._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.emailPasswordEnabled)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, injectRecaptchaFields(authInternal, request, "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */, true)];
-                case 1:
-                    requestWithRecaptcha = _b.sent();
-                    if (actionCodeSettings) {
-                        _setActionCodeSettingsOnRequest(authInternal, requestWithRecaptcha, actionCodeSettings);
-                    }
-                    return [4 /*yield*/, sendPasswordResetEmail$1(authInternal, requestWithRecaptcha)];
-                case 2:
-                    _b.sent();
-                    return [3 /*break*/, 5];
-                case 3:
                     if (actionCodeSettings) {
                         _setActionCodeSettingsOnRequest(authInternal, request, actionCodeSettings);
                     }
-                    return [4 /*yield*/, sendPasswordResetEmail$1(authInternal, request)
-                            .catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
-                            var requestWithRecaptcha;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        if (!(error.code === "auth/".concat("missing-recaptcha-token" /* AuthErrorCode.MISSING_RECAPTCHA_TOKEN */))) return [3 /*break*/, 3];
-                                        console.log('Password resets are protected by reCAPTCHA for this project. Automatically triggering the reCAPTCHA flow and restarting the password reset flow.');
-                                        return [4 /*yield*/, injectRecaptchaFields(authInternal, request, "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */, true)];
-                                    case 1:
-                                        requestWithRecaptcha = _a.sent();
-                                        if (actionCodeSettings) {
-                                            _setActionCodeSettingsOnRequest(authInternal, requestWithRecaptcha, actionCodeSettings);
-                                        }
-                                        return [4 /*yield*/, sendPasswordResetEmail$1(authInternal, requestWithRecaptcha)];
-                                    case 2:
-                                        _a.sent();
-                                        return [3 /*break*/, 4];
-                                    case 3: return [2 /*return*/, Promise.reject(error)];
-                                    case 4: return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 4:
-                    _b.sent();
-                    _b.label = 5;
-                case 5: return [2 /*return*/];
+                    return [4 /*yield*/, handleRecaptchaFlow(authInternal, request, "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */, sendPasswordResetEmail$1)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
             }
         });
     });
@@ -7735,12 +7743,10 @@ function verifyPasswordResetCode(auth, code) {
  * @public
  */
 function createUserWithEmailAndPassword(auth, email, password) {
-    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var authInternal, request, signUpResponse, requestWithRecaptcha, response, userCredential;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var authInternal, request, signUpResponse, response, userCredential;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     authInternal = _castAuth(auth);
                     request = {
@@ -7749,43 +7755,21 @@ function createUserWithEmailAndPassword(auth, email, password) {
                         password: password,
                         clientType: "CLIENT_TYPE_WEB" /* RecaptchaClientType.WEB */
                     };
-                    if (!((_a = authInternal._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.emailPasswordEnabled)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, injectRecaptchaFields(authInternal, request, "signUpPassword" /* RecaptchaActionName.SIGN_UP_PASSWORD */)];
-                case 1:
-                    requestWithRecaptcha = _b.sent();
-                    signUpResponse = signUp(authInternal, requestWithRecaptcha);
-                    return [3 /*break*/, 3];
-                case 2:
-                    signUpResponse = signUp(authInternal, request).catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
-                        var requestWithRecaptcha;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    if (!(error.code === "auth/".concat("missing-recaptcha-token" /* AuthErrorCode.MISSING_RECAPTCHA_TOKEN */))) return [3 /*break*/, 2];
-                                    console.log('Sign-up is protected by reCAPTCHA for this project. Automatically triggering the reCAPTCHA flow and restarting the sign-up flow.');
-                                    return [4 /*yield*/, injectRecaptchaFields(authInternal, request, "signUpPassword" /* RecaptchaActionName.SIGN_UP_PASSWORD */)];
-                                case 1:
-                                    requestWithRecaptcha = _a.sent();
-                                    return [2 /*return*/, signUp(authInternal, requestWithRecaptcha)];
-                                case 2: throw error;
+                    signUpResponse = handleRecaptchaFlow(authInternal, request, "signUpPassword" /* RecaptchaActionName.SIGN_UP_PASSWORD */, signUp);
+                    return [4 /*yield*/, signUpResponse.catch(function (error) {
+                            if (error.code === "auth/".concat("password-does-not-meet-requirements" /* AuthErrorCode.PASSWORD_DOES_NOT_MEET_REQUIREMENTS */)) {
+                                void recachePasswordPolicy(auth);
                             }
-                        });
-                    }); });
-                    _b.label = 3;
-                case 3: return [4 /*yield*/, signUpResponse.catch(function (error) {
-                        if (error.code === "auth/".concat("password-does-not-meet-requirements" /* AuthErrorCode.PASSWORD_DOES_NOT_MEET_REQUIREMENTS */)) {
-                            void recachePasswordPolicy(auth);
-                        }
-                        throw error;
-                    })];
-                case 4:
-                    response = _b.sent();
+                            throw error;
+                        })];
+                case 1:
+                    response = _a.sent();
                     return [4 /*yield*/, UserCredentialImpl._fromIdTokenResponse(authInternal, "signIn" /* OperationType.SIGN_IN */, response)];
-                case 5:
-                    userCredential = _b.sent();
+                case 2:
+                    userCredential = _a.sent();
                     return [4 /*yield*/, authInternal._updateCurrentUser(userCredential.user)];
-                case 6:
-                    _b.sent();
+                case 3:
+                    _a.sent();
                     return [2 /*return*/, userCredential];
             }
         });
@@ -7874,7 +7858,6 @@ function signInWithEmailAndPassword(auth, email, password) {
  * @public
  */
 function sendSignInLinkToEmail(auth, email, actionCodeSettings) {
-    var _a;
     return __awaiter(this, void 0, void 0, function () {
         function setActionCodeSettings(request, actionCodeSettings) {
             _assert(actionCodeSettings.handleCodeInApp, authInternal, "argument-error" /* AuthErrorCode.ARGUMENT_ERROR */);
@@ -7882,10 +7865,9 @@ function sendSignInLinkToEmail(auth, email, actionCodeSettings) {
                 _setActionCodeSettingsOnRequest(authInternal, request, actionCodeSettings);
             }
         }
-        var authInternal, request, requestWithRecaptcha;
-        var _this = this;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+        var authInternal, request;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     authInternal = _castAuth(auth);
                     request = {
@@ -7893,42 +7875,11 @@ function sendSignInLinkToEmail(auth, email, actionCodeSettings) {
                         email: email,
                         clientType: "CLIENT_TYPE_WEB" /* RecaptchaClientType.WEB */
                     };
-                    if (!((_a = authInternal._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.emailPasswordEnabled)) return [3 /*break*/, 3];
-                    return [4 /*yield*/, injectRecaptchaFields(authInternal, request, "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */, true)];
-                case 1:
-                    requestWithRecaptcha = _b.sent();
-                    setActionCodeSettings(requestWithRecaptcha, actionCodeSettings);
-                    return [4 /*yield*/, sendSignInLinkToEmail$1(authInternal, requestWithRecaptcha)];
-                case 2:
-                    _b.sent();
-                    return [3 /*break*/, 5];
-                case 3:
                     setActionCodeSettings(request, actionCodeSettings);
-                    return [4 /*yield*/, sendSignInLinkToEmail$1(authInternal, request)
-                            .catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
-                            var requestWithRecaptcha;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        if (!(error.code === "auth/".concat("missing-recaptcha-token" /* AuthErrorCode.MISSING_RECAPTCHA_TOKEN */))) return [3 /*break*/, 3];
-                                        console.log('Email link sign-in is protected by reCAPTCHA for this project. Automatically triggering the reCAPTCHA flow and restarting the sign-in flow.');
-                                        return [4 /*yield*/, injectRecaptchaFields(authInternal, request, "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */, true)];
-                                    case 1:
-                                        requestWithRecaptcha = _a.sent();
-                                        setActionCodeSettings(requestWithRecaptcha, actionCodeSettings);
-                                        return [4 /*yield*/, sendSignInLinkToEmail$1(authInternal, requestWithRecaptcha)];
-                                    case 2:
-                                        _a.sent();
-                                        return [3 /*break*/, 4];
-                                    case 3: return [2 /*return*/, Promise.reject(error)];
-                                    case 4: return [2 /*return*/];
-                                }
-                            });
-                        }); })];
-                case 4:
-                    _b.sent();
-                    _b.label = 5;
-                case 5: return [2 /*return*/];
+                    return [4 /*yield*/, handleRecaptchaFlow(authInternal, request, "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */, sendSignInLinkToEmail$1)];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
             }
         });
     });