@firebase/auth 1.10.7 → 1.10.8-canary.25b60fdaa

package/dist/cordova/{popup_redirect-2822224b.js → popup_redirect-6226898d.js}

@@ -1,6 +1,5 @@
 import { ErrorFactory, isBrowserExtension, isMobileCordova, isReactNative, FirebaseError, querystring, isCloudflareWorker, isCloudWorkstation, getModularInstance, base64Decode, getUA, isIE, createSubscribe, deepEqual, pingServer, updateEmulatorBanner, querystringDecode, extractQuerystring, isEmpty } from '@firebase/util';
 import { SDK_VERSION, _isFirebaseServerApp, _getProvider, _registerComponent, registerVersion } from '@firebase/app';
-import { __rest } from 'tslib';
 import { Component } from '@firebase/component';
 import { Logger, LogLevel } from '@firebase/logger';
 
@@ -106,7 +105,7 @@ class Receiver {
         const messageEvent = event;
         const { eventId, eventType, data } = messageEvent.data;
         const handlers = this.handlersMap[eventType];
-        if (!(handlers === null || handlers === void 0 ? void 0 : handlers.size)) {
+        if (!handlers?.size) {
             return;
         }
         messageEvent.ports[0].postMessage({
@@ -342,20 +341,19 @@ function _isWorker() {
         typeof _window()['importScripts'] === 'function');
 }
 async function _getActiveServiceWorker() {
-    if (!(navigator === null || navigator === void 0 ? void 0 : navigator.serviceWorker)) {
+    if (!navigator?.serviceWorker) {
         return null;
     }
     try {
         const registration = await navigator.serviceWorker.ready;
         return registration.active;
     }
-    catch (_a) {
+    catch {
         return null;
     }
 }
 function _getServiceWorkerController() {
-    var _a;
-    return ((_a = navigator === null || navigator === void 0 ? void 0 : navigator.serviceWorker) === null || _a === void 0 ? void 0 : _a.controller) || null;
+    return navigator?.serviceWorker?.controller || null;
 }
 function _getWorkerGlobalScope() {
     return _isWorker() ? self : null;
@@ -538,7 +536,6 @@ class IndexedDBLocalPersistence {
      * may not resolve.
      */
     async initializeSender() {
-        var _a, _b;
         // Check to see if there's an active service worker.
         this.activeServiceWorker = await _getActiveServiceWorker();
         if (!this.activeServiceWorker) {
@@ -550,8 +547,8 @@ class IndexedDBLocalPersistence {
         if (!results) {
             return;
         }
-        if (((_a = results[0]) === null || _a === void 0 ? void 0 : _a.fulfilled) &&
-            ((_b = results[0]) === null || _b === void 0 ? void 0 : _b.value.includes("keyChanged" /* _EventType.KEY_CHANGED */))) {
+        if (results[0]?.fulfilled &&
+            results[0]?.value.includes("keyChanged" /* _EventType.KEY_CHANGED */)) {
             this.serviceWorkerReceiverAvailable = true;
         }
     }
@@ -577,7 +574,7 @@ class IndexedDBLocalPersistence {
                 ? 800 /* _TimeoutDuration.LONG_ACK */
                 : 50 /* _TimeoutDuration.ACK */);
         }
-        catch (_a) {
+        catch {
             // This is a best effort approach. Ignore errors.
         }
     }
@@ -591,7 +588,7 @@ class IndexedDBLocalPersistence {
             await _deleteObject(db, STORAGE_AVAILABLE_KEY);
             return true;
         }
-        catch (_a) { }
+        catch { }
         return false;
     }
     async _withPendingWrite(write) {
@@ -1080,7 +1077,10 @@ function _createError(authOrCode, ...rest) {
     return createErrorInternal(authOrCode, ...rest);
 }
 function _errorWithCustomMessage(auth, code, message) {
-    const errorMap = Object.assign(Object.assign({}, prodErrorMap()), { [code]: message });
+    const errorMap = {
+        ...prodErrorMap(),
+        [code]: message
+    };
     const factory = new ErrorFactory('auth', 'Firebase', errorMap);
     return factory.create(code, {
         appName: auth.name
@@ -1161,15 +1161,13 @@ function debugAssert(assertion, message) {
  * limitations under the License.
  */
 function _getCurrentUrl() {
-    var _a;
-    return (typeof self !== 'undefined' && ((_a = self.location) === null || _a === void 0 ? void 0 : _a.href)) || '';
+    return (typeof self !== 'undefined' && self.location?.href) || '';
 }
 function _isHttpOrHttps() {
     return _getCurrentScheme() === 'http:' || _getCurrentScheme() === 'https:';
 }
 function _getCurrentScheme() {
-    var _a;
-    return (typeof self !== 'undefined' && ((_a = self.location) === null || _a === void 0 ? void 0 : _a.protocol)) || null;
+    return (typeof self !== 'undefined' && self.location?.protocol) || null;
 }
 
 /**
@@ -1483,7 +1481,10 @@ const CookieAuthProxiedEndpoints = [
 const DEFAULT_API_TIMEOUT_MS = new Delay(30000, 60000);
 function _addTidIfNecessary(auth, request) {
     if (auth.tenantId && !request.tenantId) {
-        return Object.assign(Object.assign({}, request), { tenantId: auth.tenantId });
+        return {
+            ...request,
+            tenantId: auth.tenantId
+        };
     }
     return request;
 }
@@ -1501,14 +1502,20 @@ async function _performApiRequest(auth, method, path, request, customErrorMap =
                 };
             }
         }
-        const query = querystring(Object.assign({ key: auth.config.apiKey }, params)).slice(1);
+        const query = querystring({
+            key: auth.config.apiKey,
+            ...params
+        }).slice(1);
         const headers = await auth._getAdditionalHeaders();
         headers["Content-Type" /* HttpHeader.CONTENT_TYPE */] = 'application/json';
         if (auth.languageCode) {
             headers["X-Firebase-Locale" /* HttpHeader.X_FIREBASE_LOCALE */] = auth.languageCode;
         }
-        const fetchArgs = Object.assign({ method,
-            headers }, body);
+        const fetchArgs = {
+            method,
+            headers,
+            ...body
+        };
         /* Security-conscious server-side frameworks tend to have built in mitigations for referrer
            problems". See the Cloudflare GitHub issue #487: Error: The 'referrerPolicy' field on
            'RequestInitializerDict' is not implemented."
@@ -1524,7 +1531,7 @@ async function _performApiRequest(auth, method, path, request, customErrorMap =
 }
 async function _performFetchWithErrorHandling(auth, customErrorMap, fetchFn) {
     auth._canInitEmulator = false;
-    const errorMap = Object.assign(Object.assign({}, SERVER_ERROR_MAP), customErrorMap);
+    const errorMap = { ...SERVER_ERROR_MAP, ...customErrorMap };
     try {
         const networkTimeout = new NetworkTimeout(auth);
         const response = await Promise.race([
@@ -1865,7 +1872,7 @@ async function getIdTokenResult(user, forceRefresh = false) {
     const claims = _parseToken(token);
     _assert(claims && claims.exp && claims.auth_time && claims.iat, userInternal.auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
     const firebase = typeof claims.firebase === 'object' ? claims.firebase : undefined;
-    const signInProvider = firebase === null || firebase === void 0 ? void 0 : firebase['sign_in_provider'];
+    const signInProvider = firebase?.['sign_in_provider'];
     return {
         claims,
         token,
@@ -1873,7 +1880,7 @@ async function getIdTokenResult(user, forceRefresh = false) {
         issuedAtTime: utcTimestampToDateString(secondsStringToMilliseconds(claims.iat)),
         expirationTime: utcTimestampToDateString(secondsStringToMilliseconds(claims.exp)),
         signInProvider: signInProvider || null,
-        signInSecondFactor: (firebase === null || firebase === void 0 ? void 0 : firebase['sign_in_second_factor']) || null
+        signInSecondFactor: firebase?.['sign_in_second_factor'] || null
     };
 }
 function secondsStringToMilliseconds(seconds) {
@@ -1896,7 +1903,7 @@ function _parseToken(token) {
         return JSON.parse(decoded);
     }
     catch (e) {
-        _logError('Caught error parsing JWT payload as JSON', e === null || e === void 0 ? void 0 : e.toString());
+        _logError('Caught error parsing JWT payload as JSON', e?.toString());
         return null;
     }
 }
@@ -1992,7 +1999,6 @@ class ProactiveRefresh {
         }
     }
     getInterval(wasError) {
-        var _a;
         if (wasError) {
             const interval = this.errorBackoff;
             this.errorBackoff = Math.min(this.errorBackoff * 2, 960000 /* Duration.RETRY_BACKOFF_MAX */);
@@ -2001,7 +2007,7 @@ class ProactiveRefresh {
         else {
             // Reset the error backoff
             this.errorBackoff = 30000 /* Duration.RETRY_BACKOFF_MIN */;
-            const expTime = (_a = this.user.stsTokenManager.expirationTime) !== null && _a !== void 0 ? _a : 0;
+            const expTime = this.user.stsTokenManager.expirationTime ?? 0;
             const interval = expTime - Date.now() - 300000 /* Duration.OFFSET */;
             return Math.max(0, interval);
         }
@@ -2022,7 +2028,7 @@ class ProactiveRefresh {
         }
         catch (e) {
             // Only retry on network errors
-            if ((e === null || e === void 0 ? void 0 : e.code) ===
+            if (e?.code ===
                 `auth/${"network-request-failed" /* AuthErrorCode.NETWORK_REQUEST_FAILED */}`) {
                 this.schedule(/* wasError */ true);
             }
@@ -2088,14 +2094,13 @@ class UserMetadata {
  * limitations under the License.
  */
 async function _reloadWithoutSaving(user) {
-    var _a;
     const auth = user.auth;
     const idToken = await user.getIdToken();
     const response = await _logoutIfInvalidated(user, getAccountInfo(auth, { idToken }));
-    _assert(response === null || response === void 0 ? void 0 : response.users.length, auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
+    _assert(response?.users.length, auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
     const coreAccount = response.users[0];
     user._notifyReloadListener(coreAccount);
-    const newProviderData = ((_a = coreAccount.providerUserInfo) === null || _a === void 0 ? void 0 : _a.length)
+    const newProviderData = coreAccount.providerUserInfo?.length
         ? extractProviderData(coreAccount.providerUserInfo)
         : [];
     const providerData = mergeProviderData(user.providerData, newProviderData);
@@ -2105,7 +2110,7 @@ async function _reloadWithoutSaving(user) {
     // On the other hand, if it was not anonymous before, it should never be
     // considered anonymous now.
     const oldIsAnonymous = user.isAnonymous;
-    const newIsAnonymous = !(user.email && coreAccount.passwordHash) && !(providerData === null || providerData === void 0 ? void 0 : providerData.length);
+    const newIsAnonymous = !(user.email && coreAccount.passwordHash) && !providerData?.length;
     const isAnonymous = !oldIsAnonymous ? false : newIsAnonymous;
     const updates = {
         uid: coreAccount.localId,
@@ -2142,8 +2147,7 @@ function mergeProviderData(original, newData) {
     return [...deduped, ...newData];
 }
 function extractProviderData(providers) {
-    return providers.map((_a) => {
-        var { providerId } = _a, provider = __rest(_a, ["providerId"]);
+    return providers.map(({ providerId, ...provider }) => {
         return {
             providerId,
             uid: provider.rawId || '',
@@ -2335,8 +2339,7 @@ function assertStringOrUndefined(assertion, appName) {
     _assert(typeof assertion === 'string' || typeof assertion === 'undefined', "internal-error" /* AuthErrorCode.INTERNAL_ERROR */, { appName });
 }
 class UserImpl {
-    constructor(_a) {
-        var { uid, auth, stsTokenManager } = _a, opt = __rest(_a, ["uid", "auth", "stsTokenManager"]);
+    constructor({ uid, auth, stsTokenManager, ...opt }) {
         // For the user object, provider is always Firebase.
         this.providerId = "firebase" /* ProviderId.FIREBASE */;
         this.proactiveRefresh = new ProactiveRefresh(this);
@@ -2384,12 +2387,16 @@ class UserImpl {
         this.phoneNumber = user.phoneNumber;
         this.isAnonymous = user.isAnonymous;
         this.tenantId = user.tenantId;
-        this.providerData = user.providerData.map(userInfo => (Object.assign({}, userInfo)));
+        this.providerData = user.providerData.map(userInfo => ({ ...userInfo }));
         this.metadata._copy(user.metadata);
         this.stsTokenManager._assign(user.stsTokenManager);
     }
     _clone(auth) {
-        const newUser = new UserImpl(Object.assign(Object.assign({}, this), { auth, stsTokenManager: this.stsTokenManager._clone() }));
+        const newUser = new UserImpl({
+            ...this,
+            auth,
+            stsTokenManager: this.stsTokenManager._clone()
+        });
         newUser.metadata._copy(this.metadata);
         return newUser;
     }
@@ -2444,26 +2451,40 @@ class UserImpl {
         return this.auth.signOut();
     }
     toJSON() {
-        return Object.assign(Object.assign({ uid: this.uid, email: this.email || undefined, emailVerified: this.emailVerified, displayName: this.displayName || undefined, isAnonymous: this.isAnonymous, photoURL: this.photoURL || undefined, phoneNumber: this.phoneNumber || undefined, tenantId: this.tenantId || undefined, providerData: this.providerData.map(userInfo => (Object.assign({}, userInfo))), stsTokenManager: this.stsTokenManager.toJSON(), 
+        return {
+            uid: this.uid,
+            email: this.email || undefined,
+            emailVerified: this.emailVerified,
+            displayName: this.displayName || undefined,
+            isAnonymous: this.isAnonymous,
+            photoURL: this.photoURL || undefined,
+            phoneNumber: this.phoneNumber || undefined,
+            tenantId: this.tenantId || undefined,
+            providerData: this.providerData.map(userInfo => ({ ...userInfo })),
+            stsTokenManager: this.stsTokenManager.toJSON(),
             // Redirect event ID must be maintained in case there is a pending
             // redirect event.
-            _redirectEventId: this._redirectEventId }, this.metadata.toJSON()), { 
+            _redirectEventId: this._redirectEventId,
+            ...this.metadata.toJSON(),
             // Required for compatibility with the legacy SDK (go/firebase-auth-sdk-persistence-parsing):
-            apiKey: this.auth.config.apiKey, appName: this.auth.name });
+            apiKey: this.auth.config.apiKey,
+            appName: this.auth.name
+            // Missing authDomain will be tolerated by the legacy SDK.
+            // stsTokenManager.apiKey isn't actually required (despite the legacy SDK persisting it).
+        };
     }
     get refreshToken() {
         return this.stsTokenManager.refreshToken || '';
     }
     static _fromJSON(auth, object) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const displayName = (_a = object.displayName) !== null && _a !== void 0 ? _a : undefined;
-        const email = (_b = object.email) !== null && _b !== void 0 ? _b : undefined;
-        const phoneNumber = (_c = object.phoneNumber) !== null && _c !== void 0 ? _c : undefined;
-        const photoURL = (_d = object.photoURL) !== null && _d !== void 0 ? _d : undefined;
-        const tenantId = (_e = object.tenantId) !== null && _e !== void 0 ? _e : undefined;
-        const _redirectEventId = (_f = object._redirectEventId) !== null && _f !== void 0 ? _f : undefined;
-        const createdAt = (_g = object.createdAt) !== null && _g !== void 0 ? _g : undefined;
-        const lastLoginAt = (_h = object.lastLoginAt) !== null && _h !== void 0 ? _h : undefined;
+        const displayName = object.displayName ?? undefined;
+        const email = object.email ?? undefined;
+        const phoneNumber = object.phoneNumber ?? undefined;
+        const photoURL = object.photoURL ?? undefined;
+        const tenantId = object.tenantId ?? undefined;
+        const _redirectEventId = object._redirectEventId ?? undefined;
+        const createdAt = object.createdAt ?? undefined;
+        const lastLoginAt = object.lastLoginAt ?? undefined;
         const { uid, emailVerified, isAnonymous, providerData, stsTokenManager: plainObjectTokenManager } = object;
         _assert(uid && plainObjectTokenManager, auth, "internal-error" /* AuthErrorCode.INTERNAL_ERROR */);
         const stsTokenManager = StsTokenManager.fromJSON(this.name, plainObjectTokenManager);
@@ -2493,7 +2514,7 @@ class UserImpl {
             lastLoginAt
         });
         if (providerData && Array.isArray(providerData)) {
-            user.providerData = providerData.map(userInfo => (Object.assign({}, userInfo)));
+            user.providerData = providerData.map(userInfo => ({ ...userInfo }));
         }
         if (_redirectEventId) {
             user._redirectEventId = _redirectEventId;
@@ -2530,7 +2551,7 @@ class UserImpl {
         const providerData = coreAccount.providerUserInfo !== undefined
             ? extractProviderData(coreAccount.providerUserInfo)
             : [];
-        const isAnonymous = !(coreAccount.email && coreAccount.passwordHash) && !(providerData === null || providerData === void 0 ? void 0 : providerData.length);
+        const isAnonymous = !(coreAccount.email && coreAccount.passwordHash) && !providerData?.length;
         const stsTokenManager = new StsTokenManager();
         stsTokenManager.updateFromIdToken(idToken);
         // Initialize the Firebase Auth user.
@@ -2552,7 +2573,7 @@ class UserImpl {
             providerData,
             metadata: new UserMetadata(coreAccount.createdAt, coreAccount.lastLoginAt),
             isAnonymous: !(coreAccount.email && coreAccount.passwordHash) &&
-                !(providerData === null || providerData === void 0 ? void 0 : providerData.length)
+                !providerData?.length
         };
         Object.assign(user, updates);
         return user;
@@ -2751,7 +2772,7 @@ class PersistenceUserManager {
                     break;
                 }
             }
-            catch (_a) { }
+            catch { }
         }
         // If we find the user in a persistence that does support migration, use
         // that migration path (of only persistences that support migration)
@@ -2774,7 +2795,7 @@ class PersistenceUserManager {
                 try {
                     await persistence._remove(key);
                 }
-                catch (_a) { }
+                catch { }
             }
         }));
         return new PersistenceUserManager(selectedPersistence, auth, userKey);
@@ -2844,7 +2865,7 @@ function _getBrowserName(userAgent) {
         // Most modern browsers have name/version at end of user agent string.
         const re = /([a-zA-Z\d\.]+)\/[a-zA-Z\d\.]*$/;
         const matches = userAgent.match(re);
-        if ((matches === null || matches === void 0 ? void 0 : matches.length) === 2) {
+        if (matches?.length === 2) {
             return matches[1];
         }
     }
@@ -2884,8 +2905,7 @@ function _isIOS7Or8(ua = getUA()) {
         /(iPad|iPhone|iPod).*OS 8_\d/i.test(ua));
 }
 function _isIOSStandalone(ua = getUA()) {
-    var _a;
-    return _isIOS(ua) && !!((_a = window.navigator) === null || _a === void 0 ? void 0 : _a.standalone);
+    return _isIOS(ua) && !!window.navigator?.standalone;
 }
 function _isIE10() {
     return isIE() && document.documentMode === 10;
@@ -3016,7 +3036,7 @@ class AuthMiddlewareQueue {
                 }
             }
             throw this.auth._errorFactory.create("login-blocked" /* AuthErrorCode.LOGIN_BLOCKED */, {
-                originalMessage: e === null || e === void 0 ? void 0 : e.message
+                originalMessage: e?.message
             });
         }
     }
@@ -3074,13 +3094,12 @@ const MINIMUM_MIN_PASSWORD_LENGTH = 6;
  */
 class PasswordPolicyImpl {
     constructor(response) {
-        var _a, _b, _c, _d;
         // Only include custom strength options defined in the response.
         const responseOptions = response.customStrengthOptions;
         this.customStrengthOptions = {};
         // TODO: Remove once the backend is updated to include the minimum min password length instead of undefined when there is no minimum length set.
         this.customStrengthOptions.minPasswordLength =
-            (_a = responseOptions.minPasswordLength) !== null && _a !== void 0 ? _a : MINIMUM_MIN_PASSWORD_LENGTH;
+            responseOptions.minPasswordLength ?? MINIMUM_MIN_PASSWORD_LENGTH;
         if (responseOptions.maxPasswordLength) {
             this.customStrengthOptions.maxPasswordLength =
                 responseOptions.maxPasswordLength;
@@ -3107,12 +3126,11 @@ class PasswordPolicyImpl {
         }
         // Use an empty string if no non-alphanumeric characters are specified in the response.
         this.allowedNonAlphanumericCharacters =
-            (_c = (_b = response.allowedNonAlphanumericCharacters) === null || _b === void 0 ? void 0 : _b.join('')) !== null && _c !== void 0 ? _c : '';
-        this.forceUpgradeOnSignin = (_d = response.forceUpgradeOnSignin) !== null && _d !== void 0 ? _d : false;
+            response.allowedNonAlphanumericCharacters?.join('') ?? '';
+        this.forceUpgradeOnSignin = response.forceUpgradeOnSignin ?? false;
         this.schemaVersion = response.schemaVersion;
     }
     validatePassword(password) {
-        var _a, _b, _c, _d, _e, _f;
         const status = {
             isValid: true,
             passwordPolicy: this
@@ -3121,12 +3139,12 @@ class PasswordPolicyImpl {
         this.validatePasswordLengthOptions(password, status);
         this.validatePasswordCharacterOptions(password, status);
         // Combine the status into single isValid property.
-        status.isValid && (status.isValid = (_a = status.meetsMinPasswordLength) !== null && _a !== void 0 ? _a : true);
-        status.isValid && (status.isValid = (_b = status.meetsMaxPasswordLength) !== null && _b !== void 0 ? _b : true);
-        status.isValid && (status.isValid = (_c = status.containsLowercaseLetter) !== null && _c !== void 0 ? _c : true);
-        status.isValid && (status.isValid = (_d = status.containsUppercaseLetter) !== null && _d !== void 0 ? _d : true);
-        status.isValid && (status.isValid = (_e = status.containsNumericCharacter) !== null && _e !== void 0 ? _e : true);
-        status.isValid && (status.isValid = (_f = status.containsNonAlphanumericCharacter) !== null && _f !== void 0 ? _f : true);
+        status.isValid && (status.isValid = status.meetsMinPasswordLength ?? true);
+        status.isValid && (status.isValid = status.meetsMaxPasswordLength ?? true);
+        status.isValid && (status.isValid = status.containsLowercaseLetter ?? true);
+        status.isValid && (status.isValid = status.containsUppercaseLetter ?? true);
+        status.isValid && (status.isValid = status.containsNumericCharacter ?? true);
+        status.isValid && (status.isValid = status.containsNonAlphanumericCharacter ?? true);
         return status;
     }
     /**
@@ -3263,18 +3281,17 @@ class AuthImpl {
         // Have to check for app deletion throughout initialization (after each
         // promise resolution)
         this._initializationPromise = this.queue(async () => {
-            var _a, _b, _c;
             if (this._deleted) {
                 return;
             }
             this.persistenceManager = await PersistenceUserManager.create(this, persistenceHierarchy);
-            (_a = this._resolvePersistenceManagerAvailable) === null || _a === void 0 ? void 0 : _a.call(this);
+            this._resolvePersistenceManagerAvailable?.();
             if (this._deleted) {
                 return;
             }
             // Initialize the resolver early if necessary (only applicable to web:
             // this will cause the iframe to load immediately in certain cases)
-            if ((_b = this._popupRedirectResolver) === null || _b === void 0 ? void 0 : _b._shouldInitProactively) {
+            if (this._popupRedirectResolver?._shouldInitProactively) {
                 // If this fails, don't halt auth loading
                 try {
                     await this._popupRedirectResolver._initialize(this);
@@ -3284,7 +3301,7 @@ class AuthImpl {
                 }
             }
             await this.initializeCurrentUser(popupRedirectResolver);
-            this.lastNotifiedUid = ((_c = this.currentUser) === null || _c === void 0 ? void 0 : _c.uid) || null;
+            this.lastNotifiedUid = this.currentUser?.uid || null;
             if (this._deleted) {
                 return;
             }
@@ -3329,7 +3346,6 @@ class AuthImpl {
         }
     }
     async initializeCurrentUser(popupRedirectResolver) {
-        var _a;
         if (_isFirebaseServerApp(this.app)) {
             const idToken = this.app.settings.authIdToken;
             if (idToken) {
@@ -3349,15 +3365,15 @@ class AuthImpl {
         let needsTocheckMiddleware = false;
         if (popupRedirectResolver && this.config.authDomain) {
             await this.getOrInitRedirectPersistenceManager();
-            const redirectUserEventId = (_a = this.redirectUser) === null || _a === void 0 ? void 0 : _a._redirectEventId;
-            const storedUserEventId = futureCurrentUser === null || futureCurrentUser === void 0 ? void 0 : futureCurrentUser._redirectEventId;
+            const redirectUserEventId = this.redirectUser?._redirectEventId;
+            const storedUserEventId = futureCurrentUser?._redirectEventId;
             const result = await this.tryRedirectSignIn(popupRedirectResolver);
             // If the stored user (i.e. the old "currentUser") has a redirectId that
             // matches the redirect user, then we want to initially sign in with the
             // new user object from result.
             // TODO(samgho): More thoroughly test all of this
             if ((!redirectUserEventId || redirectUserEventId === storedUserEventId) &&
-                (result === null || result === void 0 ? void 0 : result.user)) {
+                result?.user) {
                 futureCurrentUser = result.user;
                 needsTocheckMiddleware = true;
             }
@@ -3432,7 +3448,7 @@ class AuthImpl {
             await _reloadWithoutSaving(user);
         }
         catch (e) {
-            if ((e === null || e === void 0 ? void 0 : e.code) !==
+            if (e?.code !==
                 `auth/${"network-request-failed" /* AuthErrorCode.NETWORK_REQUEST_FAILED */}`) {
                 // Something's wrong with the user's token. Log them out and remove
                 // them from storage
@@ -3589,12 +3605,11 @@ class AuthImpl {
         }
     }
     toJSON() {
-        var _a;
         return {
             apiKey: this.config.apiKey,
             authDomain: this.config.authDomain,
             appName: this.name,
-            currentUser: (_a = this._currentUser) === null || _a === void 0 ? void 0 : _a.toJSON()
+            currentUser: this._currentUser?.toJSON()
         };
     }
     async _setRedirectUser(user, popupRedirectResolver) {
@@ -3615,16 +3630,15 @@ class AuthImpl {
         return this.redirectPersistenceManager;
     }
     async _redirectUserForId(id) {
-        var _a, _b;
         // Make sure we've cleared any pending persistence actions if we're not in
         // the initializer
         if (this._isInitialized) {
             await this.queue(async () => { });
         }
-        if (((_a = this._currentUser) === null || _a === void 0 ? void 0 : _a._redirectEventId) === id) {
+        if (this._currentUser?._redirectEventId === id) {
             return this._currentUser;
         }
-        if (((_b = this.redirectUser) === null || _b === void 0 ? void 0 : _b._redirectEventId) === id) {
+        if (this.redirectUser?._redirectEventId === id) {
             return this.redirectUser;
         }
         return null;
@@ -3660,12 +3674,11 @@ class AuthImpl {
         return this.currentUser;
     }
     notifyAuthListeners() {
-        var _a, _b;
         if (!this._isInitialized) {
             return;
         }
         this.idTokenSubscription.next(this.currentUser);
-        const currentUid = (_b = (_a = this.currentUser) === null || _a === void 0 ? void 0 : _a.uid) !== null && _b !== void 0 ? _b : null;
+        const currentUid = this.currentUser?.uid ?? null;
         if (this.lastNotifiedUid !== currentUid) {
             this.lastNotifiedUid = currentUid;
             this.authStateSubscription.next(this.currentUser);
@@ -3750,7 +3763,6 @@ class AuthImpl {
         return this.frameworks;
     }
     async _getAdditionalHeaders() {
-        var _a;
         // Additional headers on every request
         const headers = {
             ["X-Client-Version" /* HttpHeader.X_CLIENT_VERSION */]: this.clientVersion
@@ -3759,10 +3771,11 @@ class AuthImpl {
             headers["X-Firebase-gmpid" /* HttpHeader.X_FIREBASE_GMPID */] = this.app.options.appId;
         }
         // If the heartbeat service exists, add the heartbeat string
-        const heartbeatsHeader = await ((_a = this.heartbeatServiceProvider
+        const heartbeatsHeader = await this.heartbeatServiceProvider
             .getImmediate({
             optional: true
-        })) === null || _a === void 0 ? void 0 : _a.getHeartbeatsHeader());
+        })
+            ?.getHeartbeatsHeader();
         if (heartbeatsHeader) {
             headers["X-Firebase-Client" /* HttpHeader.X_FIREBASE_CLIENT */] = heartbeatsHeader;
         }
@@ -3774,20 +3787,20 @@ class AuthImpl {
         return headers;
     }
     async _getAppCheckToken() {
-        var _a;
         if (_isFirebaseServerApp(this.app) && this.app.settings.appCheckToken) {
             return this.app.settings.appCheckToken;
         }
-        const appCheckTokenResult = await ((_a = this.appCheckServiceProvider
-            .getImmediate({ optional: true })) === null || _a === void 0 ? void 0 : _a.getToken());
-        if (appCheckTokenResult === null || appCheckTokenResult === void 0 ? void 0 : appCheckTokenResult.error) {
+        const appCheckTokenResult = await this.appCheckServiceProvider
+            .getImmediate({ optional: true })
+            ?.getToken();
+        if (appCheckTokenResult?.error) {
             // Context: appCheck.getToken() will never throw even if an error happened.
             // In the error case, a dummy token will be returned along with an error field describing
             // the error. In general, we shouldn't care about the error condition and just use
             // the token (actual or dummy) to send requests.
             _logWarn(`Error while retrieving App Check token: ${appCheckTokenResult.error}`);
         }
-        return appCheckTokenResult === null || appCheckTokenResult === void 0 ? void 0 : appCheckTokenResult.token;
+        return appCheckTokenResult?.token;
     }
 }
 /**
@@ -3887,20 +3900,17 @@ class MockReCaptcha {
         return id;
     }
     reset(optWidgetId) {
-        var _a;
         const id = optWidgetId || _WIDGET_ID_START;
-        void ((_a = this._widgets.get(id)) === null || _a === void 0 ? void 0 : _a.delete());
+        void this._widgets.get(id)?.delete();
         this._widgets.delete(id);
     }
     getResponse(optWidgetId) {
-        var _a;
         const id = optWidgetId || _WIDGET_ID_START;
-        return ((_a = this._widgets.get(id)) === null || _a === void 0 ? void 0 : _a.getResponse()) || '';
+        return this._widgets.get(id)?.getResponse() || '';
     }
     async execute(optWidgetId) {
-        var _a;
         const id = optWidgetId || _WIDGET_ID_START;
-        void ((_a = this._widgets.get(id)) === null || _a === void 0 ? void 0 : _a.execute());
+        void this._widgets.get(id)?.execute();
         return '';
     }
 }
@@ -4140,7 +4150,7 @@ async function injectRecaptchaFields(auth, request, action, isCaptchaResp = fals
             captchaResponse = await verifier.verify(action, true);
         }
     }
-    const newRequest = Object.assign({}, request);
+    const newRequest = { ...request };
     if (action === "mfaSmsEnrollment" /* RecaptchaActionName.MFA_SMS_ENROLLMENT */ ||
         action === "mfaSmsSignIn" /* RecaptchaActionName.MFA_SMS_SIGNIN */) {
         if ('phoneEnrollmentInfo' in newRequest) {
@@ -4182,10 +4192,10 @@ async function injectRecaptchaFields(auth, request, action, isCaptchaResp = fals
     return newRequest;
 }
 async function handleRecaptchaFlow(authInstance, request, actionName, actionMethod, recaptchaAuthProvider) {
-    var _a, _b;
     if (recaptchaAuthProvider === "EMAIL_PASSWORD_PROVIDER" /* RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER */) {
-        if ((_a = authInstance
-            ._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.isProviderEnabled("EMAIL_PASSWORD_PROVIDER" /* RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER */)) {
+        if (authInstance
+            ._getRecaptchaConfig()
+            ?.isProviderEnabled("EMAIL_PASSWORD_PROVIDER" /* RecaptchaAuthProvider.EMAIL_PASSWORD_PROVIDER */)) {
             const requestWithRecaptcha = await injectRecaptchaFields(authInstance, request, actionName, actionName === "getOobCode" /* RecaptchaActionName.GET_OOB_CODE */);
             return actionMethod(authInstance, requestWithRecaptcha);
         }
@@ -4203,13 +4213,14 @@ async function handleRecaptchaFlow(authInstance, request, actionName, actionMeth
         }
     }
     else if (recaptchaAuthProvider === "PHONE_PROVIDER" /* RecaptchaAuthProvider.PHONE_PROVIDER */) {
-        if ((_b = authInstance
-            ._getRecaptchaConfig()) === null || _b === void 0 ? void 0 : _b.isProviderEnabled("PHONE_PROVIDER" /* RecaptchaAuthProvider.PHONE_PROVIDER */)) {
+        if (authInstance
+            ._getRecaptchaConfig()
+            ?.isProviderEnabled("PHONE_PROVIDER" /* RecaptchaAuthProvider.PHONE_PROVIDER */)) {
             const requestWithRecaptcha = await injectRecaptchaFields(authInstance, request, actionName);
             return actionMethod(authInstance, requestWithRecaptcha).catch(async (error) => {
-                var _a;
-                if (((_a = authInstance
-                    ._getRecaptchaConfig()) === null || _a === void 0 ? void 0 : _a.getProviderEnforcementState("PHONE_PROVIDER" /* RecaptchaAuthProvider.PHONE_PROVIDER */)) === "AUDIT" /* EnforcementState.AUDIT */) {
+                if (authInstance
+                    ._getRecaptchaConfig()
+                    ?.getProviderEnforcementState("PHONE_PROVIDER" /* RecaptchaAuthProvider.PHONE_PROVIDER */) === "AUDIT" /* EnforcementState.AUDIT */) {
                     // AUDIT mode
                     if (error.code === `auth/${"missing-recaptcha-token" /* AuthErrorCode.MISSING_RECAPTCHA_TOKEN */}` ||
                         error.code === `auth/${"invalid-app-credential" /* AuthErrorCode.INVALID_APP_CREDENTIAL */}`) {
@@ -4306,7 +4317,7 @@ function initializeAuth(app, deps) {
     if (provider.isInitialized()) {
         const auth = provider.getImmediate();
         const initialOptions = provider.getOptions();
-        if (deepEqual(initialOptions, deps !== null && deps !== void 0 ? deps : {})) {
+        if (deepEqual(initialOptions, deps ?? {})) {
             return auth;
         }
         else {
@@ -4317,15 +4328,15 @@ function initializeAuth(app, deps) {
     return auth;
 }
 function _initializeAuthInstance(auth, deps) {
-    const persistence = (deps === null || deps === void 0 ? void 0 : deps.persistence) || [];
+    const persistence = deps?.persistence || [];
     const hierarchy = (Array.isArray(persistence) ? persistence : [persistence]).map(_getInstance);
-    if (deps === null || deps === void 0 ? void 0 : deps.errorMap) {
+    if (deps?.errorMap) {
         auth._updateErrorMap(deps.errorMap);
     }
     // This promise is intended to float; auth initialization happens in the
     // background, meanwhile the auth object may be used by the app.
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
-    auth._initializeWithPersistence(hierarchy, deps === null || deps === void 0 ? void 0 : deps.popupRedirectResolver);
+    auth._initializeWithPersistence(hierarchy, deps?.popupRedirectResolver);
 }
 
 /**
@@ -4353,7 +4364,7 @@ function _initializeAuthInstance(auth, deps) {
 function connectAuthEmulator(auth, url, options) {
     const authInternal = _castAuth(auth);
     _assert(/^https?:\/\//.test(url), authInternal, "invalid-emulator-scheme" /* AuthErrorCode.INVALID_EMULATOR_SCHEME */);
-    const disableWarnings = !!(options === null || options === void 0 ? void 0 : options.disableWarnings);
+    const disableWarnings = !!options?.disableWarnings;
     const protocol = extractProtocol(url);
     const { host, port } = extractHostAndPort(url);
     const portStr = port === null ? '' : `:${port}`;
@@ -4679,7 +4690,7 @@ class EmailAuthCredential extends AuthCredential {
      */
     static fromJSON(json) {
         const obj = typeof json === 'string' ? JSON.parse(json) : json;
-        if ((obj === null || obj === void 0 ? void 0 : obj.email) && (obj === null || obj === void 0 ? void 0 : obj.password)) {
+        if (obj?.email && obj?.password) {
             if (obj.signInMethod === "password" /* SignInMethod.EMAIL_PASSWORD */) {
                 return this._fromEmailAndPassword(obj.email, obj.password);
             }
@@ -4839,7 +4850,7 @@ class OAuthCredential extends AuthCredential {
      */
     static fromJSON(json) {
         const obj = typeof json === 'string' ? JSON.parse(json) : json;
-        const { providerId, signInMethod } = obj, rest = __rest(obj, ["providerId", "signInMethod"]);
+        const { providerId, signInMethod, ...rest } = obj;
         if (!providerId || !signInMethod) {
             return null;
         }
@@ -4930,7 +4941,10 @@ const VERIFY_PHONE_NUMBER_FOR_EXISTING_ERROR_MAP_ = {
     ["USER_NOT_FOUND" /* ServerError.USER_NOT_FOUND */]: "user-not-found" /* AuthErrorCode.USER_DELETED */
 };
 async function verifyPhoneNumberForExisting(auth, request) {
-    const apiRequest = Object.assign(Object.assign({}, request), { operation: 'REAUTH' });
+    const apiRequest = {
+        ...request,
+        operation: 'REAUTH'
+    };
     return _performSignInRequest(auth, "POST" /* HttpMethod.POST */, "/v1/accounts:signInWithPhoneNumber" /* Endpoint.SIGN_IN_WITH_PHONE_NUMBER */, _addTidIfNecessary(auth, apiRequest), VERIFY_PHONE_NUMBER_FOR_EXISTING_ERROR_MAP_);
 }
 
@@ -4974,7 +4988,10 @@ class PhoneAuthCredential extends AuthCredential {
     }
     /** @internal */
     _linkToIdToken(auth, idToken) {
-        return linkWithPhoneNumber(auth, Object.assign({ idToken }, this._makeVerificationRequest()));
+        return linkWithPhoneNumber(auth, {
+            idToken,
+            ...this._makeVerificationRequest()
+        });
     }
     /** @internal */
     _getReauthenticationResolver(auth) {
@@ -5102,19 +5119,18 @@ class ActionCodeURL {
      * @internal
      */
     constructor(actionLink) {
-        var _a, _b, _c, _d, _e, _f;
         const searchParams = querystringDecode(extractQuerystring(actionLink));
-        const apiKey = (_a = searchParams["apiKey" /* QueryField.API_KEY */]) !== null && _a !== void 0 ? _a : null;
-        const code = (_b = searchParams["oobCode" /* QueryField.CODE */]) !== null && _b !== void 0 ? _b : null;
-        const operation = parseMode((_c = searchParams["mode" /* QueryField.MODE */]) !== null && _c !== void 0 ? _c : null);
+        const apiKey = searchParams["apiKey" /* QueryField.API_KEY */] ?? null;
+        const code = searchParams["oobCode" /* QueryField.CODE */] ?? null;
+        const operation = parseMode(searchParams["mode" /* QueryField.MODE */] ?? null);
         // Validate API key, code and mode.
         _assert(apiKey && code && operation, "argument-error" /* AuthErrorCode.ARGUMENT_ERROR */);
         this.apiKey = apiKey;
         this.operation = operation;
         this.code = code;
-        this.continueUrl = (_d = searchParams["continueUrl" /* QueryField.CONTINUE_URL */]) !== null && _d !== void 0 ? _d : null;
-        this.languageCode = (_e = searchParams["lang" /* QueryField.LANGUAGE_CODE */]) !== null && _e !== void 0 ? _e : null;
-        this.tenantId = (_f = searchParams["tenantId" /* QueryField.TENANT_ID */]) !== null && _f !== void 0 ? _f : null;
+        this.continueUrl = searchParams["continueUrl" /* QueryField.CONTINUE_URL */] ?? null;
+        this.languageCode = searchParams["lang" /* QueryField.LANGUAGE_CODE */] ?? null;
+        this.tenantId = searchParams["tenantId" /* QueryField.TENANT_ID */] ?? null;
     }
     /**
      * Parses the email action link string and returns an {@link ActionCodeURL} if the link is valid,
@@ -5130,7 +5146,7 @@ class ActionCodeURL {
         try {
             return new ActionCodeURL(actionLink);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -5420,13 +5436,17 @@ class OAuthProvider extends BaseOAuthProvider {
      * or the ID token string.
      */
     credential(params) {
-        return this._credential(Object.assign(Object.assign({}, params), { nonce: params.rawNonce }));
+        return this._credential({ ...params, nonce: params.rawNonce });
     }
     /** An internal credential method that accepts more permissive options */
     _credential(params) {
         _assert(params.idToken || params.accessToken, "argument-error" /* AuthErrorCode.ARGUMENT_ERROR */);
         // For OAuthCredential, sign in method is same as providerId.
-        return OAuthCredential._fromParams(Object.assign(Object.assign({}, params), { providerId: this.providerId, signInMethod: this.providerId }));
+        return OAuthCredential._fromParams({
+            ...params,
+            providerId: this.providerId,
+            signInMethod: this.providerId
+        });
     }
     /**
      * Used to extract the underlying {@link OAuthCredential} from a {@link UserCredential}.
@@ -5578,7 +5598,7 @@ class FacebookAuthProvider extends BaseOAuthProvider {
         try {
             return FacebookAuthProvider.credential(tokenResponse.oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -5700,7 +5720,7 @@ class GoogleAuthProvider extends BaseOAuthProvider {
         try {
             return GoogleAuthProvider.credential(oauthIdToken, oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -5811,7 +5831,7 @@ class GithubAuthProvider extends BaseOAuthProvider {
         try {
             return GithubAuthProvider.credential(tokenResponse.oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -6095,7 +6115,7 @@ class TwitterAuthProvider extends BaseOAuthProvider {
         try {
             return TwitterAuthProvider.credential(oauthAccessToken, oauthTokenSecret);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -6211,13 +6231,12 @@ function providerIdForResponse(response) {
  * @public
  */
 async function signInAnonymously(auth) {
-    var _a;
     if (_isFirebaseServerApp(auth.app)) {
         return Promise.reject(_serverAppCurrentUserOperationNotSupportedError(auth));
     }
     const authInternal = _castAuth(auth);
     await authInternal._initializationPromise;
-    if ((_a = authInternal.currentUser) === null || _a === void 0 ? void 0 : _a.isAnonymous) {
+    if (authInternal.currentUser?.isAnonymous) {
         // If an anonymous user is already signed in, no need to sign them in again.
         return new UserCredentialImpl({
             user: authInternal.currentUser,
@@ -6251,7 +6270,6 @@ async function signInAnonymously(auth) {
  */
 class MultiFactorError extends FirebaseError {
     constructor(auth, error, operationType, user) {
-        var _a;
         super(error.code, error.message);
         this.operationType = operationType;
         this.user = user;
@@ -6259,7 +6277,7 @@ class MultiFactorError extends FirebaseError {
         Object.setPrototypeOf(this, MultiFactorError.prototype);
         this.customData = {
             appName: auth.name,
-            tenantId: (_a = auth.tenantId) !== null && _a !== void 0 ? _a : undefined,
+            tenantId: auth.tenantId ?? undefined,
             _serverResponse: error.customData._serverResponse,
             operationType
         };
@@ -6390,7 +6408,7 @@ async function _reauthenticate(user, credential, bypassAuthState = false) {
     }
     catch (e) {
         // Convert user deleted error into user mismatch
-        if ((e === null || e === void 0 ? void 0 : e.code) === `auth/${"user-not-found" /* AuthErrorCode.USER_DELETED */}`) {
+        if (e?.code === `auth/${"user-not-found" /* AuthErrorCode.USER_DELETED */}`) {
             _fail(auth, "user-mismatch" /* AuthErrorCode.USER_MISMATCH */);
         }
         throw e;
@@ -6615,8 +6633,7 @@ class TotpMultiFactorInfoImpl extends MultiFactorInfoImpl {
  * limitations under the License.
  */
 function _setActionCodeSettingsOnRequest(auth, request, actionCodeSettings) {
-    var _a;
-    _assert(((_a = actionCodeSettings.url) === null || _a === void 0 ? void 0 : _a.length) > 0, auth, "invalid-continue-uri" /* AuthErrorCode.INVALID_CONTINUE_URI */);
+    _assert(actionCodeSettings.url?.length > 0, auth, "invalid-continue-uri" /* AuthErrorCode.INVALID_CONTINUE_URI */);
     _assert(typeof actionCodeSettings.dynamicLinkDomain === 'undefined' ||
         actionCodeSettings.dynamicLinkDomain.length > 0, auth, "invalid-dynamic-link-domain" /* AuthErrorCode.INVALID_DYNAMIC_LINK_DOMAIN */);
     _assert(typeof actionCodeSettings.linkDomain === 'undefined' ||
@@ -6977,7 +6994,7 @@ async function sendSignInLinkToEmail(auth, email, actionCodeSettings) {
  */
 function isSignInWithEmailLink(auth, emailLink) {
     const actionCodeUrl = ActionCodeURL.parseLink(emailLink);
-    return (actionCodeUrl === null || actionCodeUrl === void 0 ? void 0 : actionCodeUrl.operation) === "EMAIL_SIGNIN" /* ActionCodeOperation.EMAIL_SIGNIN */;
+    return actionCodeUrl?.operation === "EMAIL_SIGNIN" /* ActionCodeOperation.EMAIL_SIGNIN */;
 }
 /**
  * Asynchronously signs in using an email and sign-in email link.
@@ -7350,7 +7367,6 @@ async function updateEmailOrPassword(user, email, password) {
  *
  */
 function _fromIdTokenResponse(idTokenResponse) {
-    var _a, _b;
     if (!idTokenResponse) {
         return null;
     }
@@ -7360,8 +7376,8 @@ function _fromIdTokenResponse(idTokenResponse) {
         : {};
     const isNewUser = idTokenResponse.isNewUser ||
         idTokenResponse.kind === "identitytoolkit#SignupNewUserResponse" /* IdTokenResponseKind.SignupNewUser */;
-    if (!providerId && (idTokenResponse === null || idTokenResponse === void 0 ? void 0 : idTokenResponse.idToken)) {
-        const signInProvider = (_b = (_a = _parseToken(idTokenResponse.idToken)) === null || _a === void 0 ? void 0 : _a.firebase) === null || _b === void 0 ? void 0 : _b['sign_in_provider'];
+    if (!providerId && idTokenResponse?.idToken) {
+        const signInProvider = _parseToken(idTokenResponse.idToken)?.firebase?.['sign_in_provider'];
         if (signInProvider) {
             const filteredProviderId = signInProvider !== "anonymous" /* ProviderId.ANONYMOUS */ &&
                 signInProvider !== "custom" /* ProviderId.CUSTOM */
@@ -7410,7 +7426,7 @@ class FacebookAdditionalUserInfo extends GenericAdditionalUserInfo {
 }
 class GithubAdditionalUserInfo extends FederatedAdditionalUserInfoWithUsername {
     constructor(isNewUser, profile) {
-        super(isNewUser, "github.com" /* ProviderId.GITHUB */, profile, typeof (profile === null || profile === void 0 ? void 0 : profile.login) === 'string' ? profile === null || profile === void 0 ? void 0 : profile.login : null);
+        super(isNewUser, "github.com" /* ProviderId.GITHUB */, profile, typeof profile?.login === 'string' ? profile?.login : null);
     }
 }
 class GoogleAdditionalUserInfo extends GenericAdditionalUserInfo {
@@ -7710,12 +7726,11 @@ class MultiFactorSessionImpl {
         };
     }
     static fromJSON(obj) {
-        var _a, _b;
-        if (obj === null || obj === void 0 ? void 0 : obj.multiFactorSession) {
-            if ((_a = obj.multiFactorSession) === null || _a === void 0 ? void 0 : _a.pendingCredential) {
+        if (obj?.multiFactorSession) {
+            if (obj.multiFactorSession?.pendingCredential) {
                 return MultiFactorSessionImpl._fromMfaPendingCredential(obj.multiFactorSession.pendingCredential);
             }
-            else if ((_b = obj.multiFactorSession) === null || _b === void 0 ? void 0 : _b.idToken) {
+            else if (obj.multiFactorSession?.idToken) {
                 return MultiFactorSessionImpl._fromIdtoken(obj.multiFactorSession.idToken);
             }
         }
@@ -7758,7 +7773,11 @@ class MultiFactorResolverImpl {
             delete serverResponse.mfaInfo;
             delete serverResponse.mfaPendingCredential;
             // Use in the new token & refresh token in the old response
-            const idTokenResponse = Object.assign(Object.assign({}, serverResponse), { idToken: mfaResponse.idToken, refreshToken: mfaResponse.refreshToken });
+            const idTokenResponse = {
+                ...serverResponse,
+                idToken: mfaResponse.idToken,
+                refreshToken: mfaResponse.refreshToken
+            };
             // TODO: we should collapse this switch statement into UserCredentialImpl._forOperation and have it support the SIGN_IN case
             switch (error.operationType) {
                 case "signIn" /* OperationType.SIGN_IN */:
@@ -7789,11 +7808,10 @@ class MultiFactorResolverImpl {
  * @public
  */
 function getMultiFactorResolver(auth, error) {
-    var _a;
     const authModular = getModularInstance(auth);
     const errorInternal = error;
     _assert(error.customData.operationType, authModular, "argument-error" /* AuthErrorCode.ARGUMENT_ERROR */);
-    _assert((_a = errorInternal.customData._serverResponse) === null || _a === void 0 ? void 0 : _a.mfaPendingCredential, authModular, "argument-error" /* AuthErrorCode.ARGUMENT_ERROR */);
+    _assert(errorInternal.customData._serverResponse?.mfaPendingCredential, authModular, "argument-error" /* AuthErrorCode.ARGUMENT_ERROR */);
     return MultiFactorResolverImpl._fromError(authModular, errorInternal);
 }
 
@@ -7899,7 +7917,7 @@ function multiFactor(user) {
 }
 
 var name = "@firebase/auth";
-var version = "1.10.7";
+var version = "1.10.8-canary.25b60fdaa";
 
 /**
  * @license
@@ -7923,9 +7941,8 @@ class AuthInterop {
         this.internalListeners = new Map();
     }
     getUid() {
-        var _a;
         this.assertAuthConfigured();
-        return ((_a = this.auth.currentUser) === null || _a === void 0 ? void 0 : _a.uid) || null;
+        return this.auth.currentUser?.uid || null;
     }
     async getToken(forceRefresh) {
         this.assertAuthConfigured();
@@ -7942,7 +7959,7 @@ class AuthInterop {
             return;
         }
         const unsubscribe = this.auth.onIdTokenChanged(user => {
-            listener((user === null || user === void 0 ? void 0 : user.stsTokenManager.accessToken) || null);
+            listener(user?.stsTokenManager.accessToken || null);
         });
         this.internalListeners.set(listener, unsubscribe);
         this.updateProactiveRefresh();
@@ -8041,8 +8058,8 @@ function registerAuth(clientPlatform) {
         return (auth => new AuthInterop(auth))(auth);
     }, "PRIVATE" /* ComponentType.PRIVATE */).setInstantiationMode("EXPLICIT" /* InstantiationMode.EXPLICIT */));
     registerVersion(name, version, getVersionForPlatform(clientPlatform));
-    // BUILD_TARGET will be replaced by values like esm2017, cjs2017, etc during the compilation
-    registerVersion(name, version, 'esm2017');
+    // BUILD_TARGET will be replaced by values like esm, cjs, etc during the compilation
+    registerVersion(name, version, 'esm2020');
 }
 
 /**
@@ -8177,7 +8194,7 @@ class BrowserPersistenceClass {
             this.storage.removeItem(STORAGE_AVAILABLE_KEY);
             return Promise.resolve(true);
         }
-        catch (_a) {
+        catch {
             return Promise.resolve(false);
         }
     }
@@ -9112,7 +9129,6 @@ const REDIRECT_TIMEOUT_MS = 2000;
  * Generates the URL for the OAuth handler.
  */
 async function _generateHandlerUrl(auth, event, provider) {
-    var _a;
     // Get the cordova plugins
     const { BuildInfo } = _cordovaWindow();
     debugAssert(event.sessionId, 'AuthEvent did not contain a session ID');
@@ -9135,7 +9151,7 @@ async function _generateHandlerUrl(auth, event, provider) {
     }
     // Attached the hashed session ID
     additionalParams['sessionId'] = sessionDigest;
-    return _getRedirectUrl(auth, provider, event.type, undefined, (_a = event.eventId) !== null && _a !== void 0 ? _a : undefined, additionalParams);
+    return _getRedirectUrl(auth, provider, event.type, undefined, event.eventId ?? undefined, additionalParams);
 }
 /**
  * Validates that this app is valid for this project configuration
@@ -9187,17 +9203,16 @@ async function _waitForAppResume(auth, eventListener, iabRef) {
             let onCloseTimer = null;
             // DEFINE ALL THE CALLBACKS =====
             function authEventSeen() {
-                var _a;
                 // Auth event was detected. Resolve this promise and close the extra
                 // window if it's still open.
                 resolve();
-                const closeBrowserTab = (_a = cordova.plugins.browsertab) === null || _a === void 0 ? void 0 : _a.close;
+                const closeBrowserTab = cordova.plugins.browsertab?.close;
                 if (typeof closeBrowserTab === 'function') {
                     closeBrowserTab();
                 }
                 // Close inappbrowser embedded webview in iOS7 and 8 case if still
                 // open.
-                if (typeof (iabRef === null || iabRef === void 0 ? void 0 : iabRef.close) === 'function') {
+                if (typeof iabRef?.close === 'function') {
                     iabRef.close();
                 }
             }
@@ -9212,7 +9227,7 @@ async function _waitForAppResume(auth, eventListener, iabRef) {
                 }, REDIRECT_TIMEOUT_MS);
             }
             function visibilityChanged() {
-                if ((document === null || document === void 0 ? void 0 : document.visibilityState) === 'visible') {
+                if (document?.visibilityState === 'visible') {
                     resumed();
                 }
             }
@@ -9245,29 +9260,28 @@ async function _waitForAppResume(auth, eventListener, iabRef) {
  * missing plugin.
  */
 function _checkCordovaConfiguration(auth) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const win = _cordovaWindow();
     // Check all dependencies installed.
     // https://github.com/nordnet/cordova-universal-links-plugin
     // Note that cordova-universal-links-plugin has been abandoned.
     // A fork with latest fixes is available at:
     // https://www.npmjs.com/package/cordova-universal-links-plugin-fix
-    _assert(typeof ((_a = win === null || win === void 0 ? void 0 : win.universalLinks) === null || _a === void 0 ? void 0 : _a.subscribe) === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
+    _assert(typeof win?.universalLinks?.subscribe === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
         missingPlugin: 'cordova-universal-links-plugin-fix'
     });
     // https://www.npmjs.com/package/cordova-plugin-buildinfo
-    _assert(typeof ((_b = win === null || win === void 0 ? void 0 : win.BuildInfo) === null || _b === void 0 ? void 0 : _b.packageName) !== 'undefined', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
+    _assert(typeof win?.BuildInfo?.packageName !== 'undefined', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
         missingPlugin: 'cordova-plugin-buildInfo'
     });
     // https://github.com/google/cordova-plugin-browsertab
-    _assert(typeof ((_e = (_d = (_c = win === null || win === void 0 ? void 0 : win.cordova) === null || _c === void 0 ? void 0 : _c.plugins) === null || _d === void 0 ? void 0 : _d.browsertab) === null || _e === void 0 ? void 0 : _e.openUrl) === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
+    _assert(typeof win?.cordova?.plugins?.browsertab?.openUrl === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
         missingPlugin: 'cordova-plugin-browsertab'
     });
-    _assert(typeof ((_h = (_g = (_f = win === null || win === void 0 ? void 0 : win.cordova) === null || _f === void 0 ? void 0 : _f.plugins) === null || _g === void 0 ? void 0 : _g.browsertab) === null || _h === void 0 ? void 0 : _h.isAvailable) === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
+    _assert(typeof win?.cordova?.plugins?.browsertab?.isAvailable === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
         missingPlugin: 'cordova-plugin-browsertab'
     });
     // https://cordova.apache.org/docs/en/latest/reference/cordova-plugin-inappbrowser/
-    _assert(typeof ((_k = (_j = win === null || win === void 0 ? void 0 : win.cordova) === null || _j === void 0 ? void 0 : _j.InAppBrowser) === null || _k === void 0 ? void 0 : _k.open) === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
+    _assert(typeof win?.cordova?.InAppBrowser?.open === 'function', auth, "invalid-cordova-configuration" /* AuthErrorCode.INVALID_CORDOVA_CONFIGURATION */, {
         missingPlugin: 'cordova-plugin-inappbrowser'
     });
 }
@@ -9368,9 +9382,8 @@ class AuthEventManager {
         return handled;
     }
     sendToConsumer(event, consumer) {
-        var _a;
         if (event.error && !isNullRedirectEvent(event)) {
-            const code = ((_a = event.error.code) === null || _a === void 0 ? void 0 : _a.split('auth/')[1]) ||
+            const code = event.error.code?.split('auth/')[1] ||
                 "internal-error" /* AuthErrorCode.INTERNAL_ERROR */;
             consumer.onError(_createError(this.auth, code));
         }
@@ -9400,7 +9413,7 @@ function eventUid(e) {
 }
 function isNullRedirectEvent({ type, error }) {
     return (type === "unknown" /* AuthEventType.UNKNOWN */ &&
-        (error === null || error === void 0 ? void 0 : error.code) === `auth/${"no-auth-event" /* AuthErrorCode.NO_AUTH_EVENT */}`);
+        error?.code === `auth/${"no-auth-event" /* AuthErrorCode.NO_AUTH_EVENT */}`);
 }
 function isRedirectEvent(event) {
     switch (event.type) {
@@ -9488,7 +9501,6 @@ async function _getAndRemoveEvent(auth) {
     return event;
 }
 function _eventFromPartialAndUrl(partialEvent, url) {
-    var _a, _b;
     // Parse the deep link within the dynamic link URL.
     const callbackUrl = _getDeepLinkFromCallback(url);
     // Confirm it is actually a callback URL.
@@ -9505,7 +9517,7 @@ function _eventFromPartialAndUrl(partialEvent, url) {
         const errorObject = params['firebaseError']
             ? parseJsonOrNull(decodeURIComponent(params['firebaseError']))
             : null;
-        const code = (_b = (_a = errorObject === null || errorObject === void 0 ? void 0 : errorObject['code']) === null || _a === void 0 ? void 0 : _a.split('auth/')) === null || _b === void 0 ? void 0 : _b[1];
+        const code = errorObject?.['code']?.split('auth/')?.[1];
         const error = code ? _createError(code) : null;
         if (error) {
             return {
@@ -9572,7 +9584,7 @@ function _getDeepLinkFromCallback(url) {
  * empty search params object.
  */
 function searchParamsOrEmpty(url) {
-    if (!(url === null || url === void 0 ? void 0 : url.includes('?'))) {
+    if (!url?.includes('?')) {
         return {};
     }
     const [_, ...rest] = url.split('?');
@@ -9662,7 +9674,7 @@ class CordovaPopupRedirectResolver {
             clearTimeout(noEventTimeout);
             const partialEvent = await _getAndRemoveEvent(auth);
             let finalEvent = null;
-            if (partialEvent && (eventData === null || eventData === void 0 ? void 0 : eventData['url'])) {
+            if (partialEvent && eventData?.['url']) {
                 finalEvent = _eventFromPartialAndUrl(partialEvent, eventData['url']);
             }
             // If finalEvent is never filled, trigger with no event
@@ -9719,4 +9731,4 @@ function generateNoEvent() {
 }
 
 export { signInWithEmailAndPassword as $, ActionCodeOperation as A, PhoneAuthCredential as B, inMemoryPersistence as C, EmailAuthProvider as D, EmailAuthCredential as E, FactorId as F, FacebookAuthProvider as G, GoogleAuthProvider as H, GithubAuthProvider as I, OAuthProvider as J, SAMLAuthProvider as K, signInAnonymously as L, signInWithCredential as M, linkWithCredential as N, OperationType as O, ProviderId as P, reauthenticateWithCredential as Q, signInWithCustomToken as R, SignInMethod as S, TwitterAuthProvider as T, sendPasswordResetEmail as U, confirmPasswordReset as V, applyActionCode as W, checkActionCode as X, verifyPasswordResetCode as Y, createUserWithEmailAndPassword as Z, _signInWithRedirect as _, _reauthenticateWithRedirect as a, debugFail as a$, sendSignInLinkToEmail as a0, isSignInWithEmailLink as a1, signInWithEmailLink as a2, fetchSignInMethodsForEmail as a3, sendEmailVerification as a4, verifyBeforeUpdateEmail as a5, ActionCodeURL as a6, parseActionCodeURL as a7, updateProfile as a8, updateEmail as a9, FAKE_TOKEN as aA, startEnrollPhoneMfa as aB, handleRecaptchaFlow as aC, sendPhoneVerificationCode as aD, _link$1 as aE, _assertInstanceOf as aF, _withDefaultResolver as aG, AbstractPopupRedirectOperation as aH, debugAssert as aI, _generateEventId as aJ, FederatedAuthProvider as aK, _getProjectConfig as aL, _fail as aM, _getCurrentUrl as aN, _gapiScriptUrl as aO, _emulatorUrl as aP, _isChromeIOS as aQ, _isFirefox as aR, _isIOSStandalone as aS, _getRedirectResult as aT, _overrideRedirectResult as aU, _getRedirectUrl as aV, _setWindowLocation as aW, _isMobileBrowser as aX, _isSafari as aY, _isIOS as aZ, AuthEventManager as a_, updatePassword as aa, getIdToken as ab, getIdTokenResult as ac, unlink as ad, getAdditionalUserInfo as ae, reload as af, getMultiFactorResolver as ag, multiFactor as ah, _performApiRequest as ai, _addTidIfNecessary as aj, Delay as ak, _window as al, _assert as am, isV2 as an, _createError as ao, _recaptchaV2ScriptUrl as ap, _loadJS as aq, MockReCaptcha as ar, _generateCallbackName as as, _castAuth as at, _isHttpOrHttps as au, _isWorker as av, getRecaptchaParams as aw, _serverAppCurrentUserOperationNotSupportedError as ax, _assertLinkedStatus as ay, _initializeRecaptchaConfig as az, _linkWithRedirect as b, finalizeEnrollPhoneMfa as b0, startEnrollTotpMfa as b1, finalizeEnrollTotpMfa as b2, _setExternalJSProvider as b3, _persistenceKeyName as b4, UserImpl as b5, _getInstance as b6, AuthImpl as b7, _getClientVersion as b8, FetchProvider as b9, SAMLAuthCredential as ba, signInWithRedirect as bb, linkWithRedirect as bc, reauthenticateWithRedirect as bd, indexedDBLocalPersistence as c, cordovaPopupRedirectResolver as d, browserLocalPersistence as e, browserSessionPersistence as f, getRedirectResult as g, initializeRecaptchaConfig as h, initializeAuth as i, beforeAuthStateChanged as j, onAuthStateChanged as k, updateCurrentUser as l, signOut as m, revokeAccessToken as n, onIdTokenChanged as o, deleteUser as p, debugErrorMap as q, registerAuth as r, setPersistence as s, prodErrorMap as t, useDeviceLanguage as u, validatePassword as v, AUTH_ERROR_CODES_MAP_DO_NOT_USE_INTERNALLY as w, connectAuthEmulator as x, AuthCredential as y, OAuthCredential as z };
-//# sourceMappingURL=popup_redirect-2822224b.js.map
+//# sourceMappingURL=popup_redirect-6226898d.js.map