@firebase/auth 0.19.3 → 0.19.4-canary.a185b1431

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

@@ -27,7 +27,8 @@ export declare const enum HttpMethod {
 export declare const enum HttpHeader {
     CONTENT_TYPE = "Content-Type",
     X_FIREBASE_LOCALE = "X-Firebase-Locale",
-    X_CLIENT_VERSION = "X-Client-Version"
+    X_CLIENT_VERSION = "X-Client-Version",
+    X_FIREBASE_GMPID = "X-Firebase-gmpid"
 }
 export declare const enum Endpoint {
     CREATE_AUTH_URI = "/v1/accounts:createAuthUri",

package/dist/cordova/src/core/auth/auth_impl.d.ts

@@ -95,7 +95,7 @@ export declare class AuthImpl implements AuthInternal, _FirebaseService {
     private clientVersion;
     _logFramework(framework: string): void;
     _getFrameworks(): readonly string[];
-    _getSdkClientVersion(): string;
+    _getAdditionalHeaders(): Promise<Record<string, string>>;
 }
 /**
  * Method to be used to cast down to our private implmentation of Auth.

package/dist/cordova/src/model/auth.d.ts

@@ -63,7 +63,7 @@ export interface AuthInternal extends Auth {
     _getPersistence(): string;
     _logFramework(framework: string): void;
     _getFrameworks(): readonly string[];
-    _getSdkClientVersion(): string;
+    _getAdditionalHeaders(): Promise<Record<string, string>>;
     readonly name: AppName;
     readonly config: ConfigInternal;
     languageCode: string | null;

package/dist/cordova/src/model/public_types.d.ts

@@ -934,8 +934,7 @@ export interface User extends UserInfo {
     toJSON(): object;
 }
 /**
- * A structure containing a {@link User}, an {@link AuthCredential}, the {@link OperationType},
- * and any additional user information that was returned from the identity provider.
+ * A structure containing a {@link User}, the {@link OperationType}, and the provider ID.
  *
  * @remarks
  * `operationType` could be {@link OperationType}.SIGN_IN for a sign-in operation,

package/dist/esm2017/{index-8593558d.js → index-e0ba4728.js}

@@ -910,7 +910,7 @@ function _addTidIfNecessary(auth, request) {
     return request;
 }
 async function _performApiRequest(auth, method, path, request, customErrorMap = {}) {
-    return _performFetchWithErrorHandling(auth, customErrorMap, () => {
+    return _performFetchWithErrorHandling(auth, customErrorMap, async () => {
         let body = {};
         let params = {};
         if (request) {
@@ -924,11 +924,10 @@ async function _performApiRequest(auth, method, path, request, customErrorMap =
             }
         }
         const query = querystring(Object.assign({ key: auth.config.apiKey }, params)).slice(1);
-        const headers = new (FetchProvider.headers())();
-        headers.set("Content-Type" /* CONTENT_TYPE */, 'application/json');
-        headers.set("X-Client-Version" /* X_CLIENT_VERSION */, auth._getSdkClientVersion());
+        const headers = await auth._getAdditionalHeaders();
+        headers["Content-Type" /* CONTENT_TYPE */] = 'application/json';
         if (auth.languageCode) {
-            headers.set("X-Firebase-Locale" /* X_FIREBASE_LOCALE */, auth.languageCode);
+            headers["X-Firebase-Locale" /* X_FIREBASE_LOCALE */] = auth.languageCode;
         }
         return FetchProvider.fetch()(_getFinalTarget(auth, auth.config.apiHost, path, query), Object.assign({ method,
             headers, referrerPolicy: 'no-referrer' }, body));
@@ -1446,19 +1445,18 @@ function extractProviderData(providers) {
  * limitations under the License.
  */
 async function requestStsToken(auth, refreshToken) {
-    const response = await _performFetchWithErrorHandling(auth, {}, () => {
+    const response = await _performFetchWithErrorHandling(auth, {}, async () => {
         const body = querystring({
             'grant_type': 'refresh_token',
             'refresh_token': refreshToken
         }).slice(1);
         const { tokenApiHost, apiKey } = auth.config;
         const url = _getFinalTarget(auth, tokenApiHost, "/v1/token" /* TOKEN */, `key=${apiKey}`);
+        const headers = await auth._getAdditionalHeaders();
+        headers["Content-Type" /* CONTENT_TYPE */] = 'application/x-www-form-urlencoded';
         return FetchProvider.fetch()(url, {
             method: "POST" /* POST */,
-            headers: {
-                'X-Client-Version': auth._getSdkClientVersion(),
-                'Content-Type': 'application/x-www-form-urlencoded'
-            },
+            headers,
             body
         });
     });
@@ -2185,7 +2183,11 @@ class AuthImpl {
             // Initialize the resolver early if necessary (only applicable to web:
             // this will cause the iframe to load immediately in certain cases)
             if ((_a = this._popupRedirectResolver) === null || _a === void 0 ? void 0 : _a._shouldInitProactively) {
-                await this._popupRedirectResolver._initialize(this);
+                // If this fails, don't halt auth loading
+                try {
+                    await this._popupRedirectResolver._initialize(this);
+                }
+                catch (e) { /* Ignore the error */ }
             }
             await this.initializeCurrentUser(popupRedirectResolver);
             this.lastNotifiedUid = ((_b = this.currentUser) === null || _b === void 0 ? void 0 : _b.uid) || null;
@@ -2501,8 +2503,15 @@ class AuthImpl {
     _getFrameworks() {
         return this.frameworks;
     }
-    _getSdkClientVersion() {
-        return this.clientVersion;
+    async _getAdditionalHeaders() {
+        // Additional headers on every request
+        const headers = {
+            ["X-Client-Version" /* X_CLIENT_VERSION */]: this.clientVersion,
+        };
+        if (this.app.options.appId) {
+            headers["X-Firebase-gmpid" /* X_FIREBASE_GMPID */] = this.app.options.appId;
+        }
+        return headers;
     }
 }
 /**
@@ -8685,7 +8694,7 @@ function loadGapi(auth) {
                 }
             };
             // Load GApi loader.
-            return _loadJS(`https://apis.google.com/js/api.js?onload=${cbName}`);
+            return _loadJS(`https://apis.google.com/js/api.js?onload=${cbName}`).catch(e => reject(e));
         }
     }).catch(error => {
         // Reset cached promise to allow for retrial.
@@ -9006,6 +9015,11 @@ class BrowserPopupRedirectResolver {
         }
         const promise = this.initAndGetManager(auth);
         this.eventManagers[key] = { promise };
+        // If the promise is rejected, the key should be removed so that the
+        // operation can be retried later.
+        promise.catch(() => {
+            delete this.eventManagers[key];
+        });
         return promise;
     }
     async initAndGetManager(auth) {
@@ -9122,7 +9136,7 @@ class PhoneMultiFactorGenerator {
 PhoneMultiFactorGenerator.FACTOR_ID = 'phone';
 
 var name = "@firebase/auth";
-var version = "0.19.3";
+var version = "0.19.4-canary.a185b1431";
 
 /**
  * @license
@@ -9312,4 +9326,4 @@ function getAuth(app = getApp()) {
 registerAuth("Browser" /* BROWSER */);
 
 export { sendPasswordResetEmail as $, ActionCodeOperation as A, prodErrorMap as B, AUTH_ERROR_CODES_MAP_DO_NOT_USE_INTERNALLY as C, initializeAuth as D, connectAuthEmulator as E, FactorId as F, AuthCredential as G, EmailAuthCredential as H, OAuthCredential as I, PhoneAuthCredential as J, inMemoryPersistence as K, EmailAuthProvider as L, FacebookAuthProvider as M, GoogleAuthProvider as N, OperationType as O, PhoneAuthProvider as P, GithubAuthProvider as Q, RecaptchaVerifier as R, SignInMethod as S, OAuthProvider as T, SAMLAuthProvider as U, TwitterAuthProvider as V, signInAnonymously as W, signInWithCredential as X, linkWithCredential as Y, reauthenticateWithCredential as Z, signInWithCustomToken as _, browserSessionPersistence as a, confirmPasswordReset as a0, applyActionCode as a1, checkActionCode as a2, verifyPasswordResetCode as a3, createUserWithEmailAndPassword as a4, signInWithEmailAndPassword as a5, sendSignInLinkToEmail as a6, isSignInWithEmailLink as a7, signInWithEmailLink as a8, fetchSignInMethodsForEmail as a9, _getRedirectResult as aA, _clearRedirectOutcomes as aB, _castAuth as aC, UserImpl as aD, AuthImpl as aE, _getClientVersion as aF, _generateEventId as aG, AuthPopup as aH, FetchProvider as aI, SAMLAuthCredential as aJ, sendEmailVerification as aa, verifyBeforeUpdateEmail as ab, ActionCodeURL as ac, parseActionCodeURL as ad, updateProfile as ae, updateEmail as af, updatePassword as ag, getIdToken as ah, getIdTokenResult as ai, unlink as aj, getAdditionalUserInfo as ak, reload as al, getMultiFactorResolver as am, multiFactor as an, _isIOS7Or8 as ao, debugAssert as ap, _isIOS as aq, _isAndroid as ar, _fail as as, _getRedirectUrl as at, _getProjectConfig as au, _createError as av, _assert as aw, _getInstance as ax, _persistenceKeyName as ay, AuthEventManager as az, browserLocalPersistence as b, signInWithPopup as c, linkWithPopup as d, reauthenticateWithPopup as e, signInWithRedirect as f, linkWithRedirect as g, reauthenticateWithRedirect as h, indexedDBLocalPersistence as i, getRedirectResult as j, browserPopupRedirectResolver as k, linkWithPhoneNumber as l, PhoneMultiFactorGenerator as m, getAuth as n, ProviderId as o, setPersistence as p, onIdTokenChanged as q, reauthenticateWithPhoneNumber as r, signInWithPhoneNumber as s, onAuthStateChanged as t, updatePhoneNumber as u, useDeviceLanguage as v, updateCurrentUser as w, signOut as x, deleteUser as y, debugErrorMap as z };
-//# sourceMappingURL=index-8593558d.js.map
+//# sourceMappingURL=index-e0ba4728.js.map