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

package/dist/index.webworker.js

@@ -2,7 +2,6 @@ import { SDK_VERSION, _getProvider, _isFirebaseServerApp, _registerComponent, re
 import { ErrorFactory, deepEqual, getUA, isBrowserExtension, isMobileCordova, isReactNative, FirebaseError, querystring, isCloudflareWorker, isCloudWorkstation, getModularInstance, base64Decode, createSubscribe, pingServer, updateEmulatorBanner, querystringDecode, extractQuerystring } from '@firebase/util';
 import { Logger, LogLevel } from '@firebase/logger';
 import { Component } from '@firebase/component';
-import { __rest } from 'tslib';
 
 /**
  * @license
@@ -378,7 +377,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
@@ -507,7 +509,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 {
@@ -518,19 +520,19 @@ 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);
 }
 
 var name = "@firebase/auth";
-var version = "1.10.7";
+var version = "1.10.8-canary.25b60fdaa";
 
 /**
  * @license
@@ -595,7 +597,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];
         }
     }
@@ -685,15 +687,13 @@ function _getClientVersion(clientPlatform, frameworks = []) {
  * 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;
 }
 
 /**
@@ -1007,7 +1007,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;
 }
@@ -1025,14 +1028,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."
@@ -1048,7 +1057,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([
@@ -1283,7 +1292,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,
@@ -1291,7 +1300,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) {
@@ -1314,7 +1323,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;
     }
 }
@@ -1410,7 +1419,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 */);
@@ -1419,7 +1427,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);
         }
@@ -1440,7 +1448,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);
             }
@@ -1506,14 +1514,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);
@@ -1523,7 +1530,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,
@@ -1560,8 +1567,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 || '',
@@ -1753,8 +1759,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);
@@ -1802,12 +1807,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;
     }
@@ -1862,26 +1871,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);
@@ -1911,7 +1934,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;
@@ -1948,7 +1971,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.
@@ -1970,7 +1993,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;
@@ -2140,7 +2163,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)
@@ -2163,7 +2186,7 @@ class PersistenceUserManager {
                 try {
                     await persistence._remove(key);
                 }
-                catch (_a) { }
+                catch { }
             }
         }));
         return new PersistenceUserManager(selectedPersistence, auth, userKey);
@@ -2245,7 +2268,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
             });
         }
     }
@@ -2303,13 +2326,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;
@@ -2336,12 +2358,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
@@ -2350,12 +2371,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;
     }
     /**
@@ -2492,18 +2513,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);
@@ -2513,7 +2533,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;
             }
@@ -2558,7 +2578,6 @@ class AuthImpl {
         }
     }
     async initializeCurrentUser(popupRedirectResolver) {
-        var _a;
         if (_isFirebaseServerApp(this.app)) {
             const idToken = this.app.settings.authIdToken;
             if (idToken) {
@@ -2578,15 +2597,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;
             }
@@ -2661,7 +2680,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
@@ -2818,12 +2837,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) {
@@ -2844,16 +2862,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;
@@ -2889,12 +2906,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);
@@ -2979,7 +2995,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
@@ -2988,10 +3003,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;
         }
@@ -3003,20 +3019,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;
     }
 }
 /**
@@ -3063,9 +3079,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();
@@ -3082,7 +3097,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();
@@ -3181,8 +3196,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');
 }
 
 const STORAGE_AVAILABLE_KEY = '__sak';
@@ -3287,7 +3302,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({
@@ -3520,20 +3535,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;
@@ -3716,7 +3730,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) {
@@ -3728,8 +3741,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;
         }
     }
@@ -3755,7 +3768,7 @@ class IndexedDBLocalPersistence {
                 ? 800 /* _TimeoutDuration.LONG_ACK */
                 : 50 /* _TimeoutDuration.ACK */);
         }
-        catch (_a) {
+        catch {
             // This is a best effort approach. Ignore errors.
         }
     }
@@ -3769,7 +3782,7 @@ class IndexedDBLocalPersistence {
             await _deleteObject(db, STORAGE_AVAILABLE_KEY);
             return true;
         }
-        catch (_a) { }
+        catch { }
         return false;
     }
     async _withPendingWrite(write) {
@@ -4287,7 +4300,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) {
@@ -4329,10 +4342,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);
         }
@@ -4350,13 +4363,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 */}`) {
@@ -4432,7 +4446,7 @@ async function _initializeRecaptchaConfig(auth) {
 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}`;
@@ -4758,7 +4772,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);
             }
@@ -4918,7 +4932,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;
         }
@@ -5006,7 +5020,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_);
 }
 
@@ -5050,7 +5067,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) {
@@ -5178,19 +5198,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,
@@ -5206,7 +5225,7 @@ class ActionCodeURL {
         try {
             return new ActionCodeURL(actionLink);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -5496,13 +5515,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}.
@@ -5654,7 +5677,7 @@ class FacebookAuthProvider extends BaseOAuthProvider {
         try {
             return FacebookAuthProvider.credential(tokenResponse.oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -5776,7 +5799,7 @@ class GoogleAuthProvider extends BaseOAuthProvider {
         try {
             return GoogleAuthProvider.credential(oauthIdToken, oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -5887,7 +5910,7 @@ class GithubAuthProvider extends BaseOAuthProvider {
         try {
             return GithubAuthProvider.credential(tokenResponse.oauthAccessToken);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -6171,7 +6194,7 @@ class TwitterAuthProvider extends BaseOAuthProvider {
         try {
             return TwitterAuthProvider.credential(oauthAccessToken, oauthTokenSecret);
         }
-        catch (_a) {
+        catch {
             return null;
         }
     }
@@ -6287,13 +6310,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,
@@ -6327,7 +6349,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;
@@ -6335,7 +6356,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
         };
@@ -6466,7 +6487,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;
@@ -6691,8 +6712,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' ||
@@ -7053,7 +7073,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.
@@ -7426,7 +7446,6 @@ async function updateEmailOrPassword(user, email, password) {
  *
  */
 function _fromIdTokenResponse(idTokenResponse) {
-    var _a, _b;
     if (!idTokenResponse) {
         return null;
     }
@@ -7436,8 +7455,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 */
@@ -7486,7 +7505,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 {
@@ -7786,12 +7805,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);
             }
         }
@@ -7834,7 +7852,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 */:
@@ -7865,11 +7887,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);
 }