@firebase/auth 0.19.3 → 0.19.4-canary.31db4b706

package/dist/node/{index-057dcc31.js → index-abd97249.js}

@@ -954,30 +954,38 @@ function _addTidIfNecessary(auth, request) {
 function _performApiRequest(auth, method, path, request, customErrorMap) {
     if (customErrorMap === void 0) { customErrorMap = {}; }
     return tslib.__awaiter(this, void 0, void 0, function () {
+        var _this = this;
         return tslib.__generator(this, function (_a) {
-            return [2 /*return*/, _performFetchWithErrorHandling(auth, customErrorMap, function () {
-                    var body = {};
-                    var params = {};
-                    if (request) {
-                        if (method === "GET" /* GET */) {
-                            params = request;
-                        }
-                        else {
-                            body = {
-                                body: JSON.stringify(request)
-                            };
+            return [2 /*return*/, _performFetchWithErrorHandling(auth, customErrorMap, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var body, params, query, headers;
+                    return tslib.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                body = {};
+                                params = {};
+                                if (request) {
+                                    if (method === "GET" /* GET */) {
+                                        params = request;
+                                    }
+                                    else {
+                                        body = {
+                                            body: JSON.stringify(request)
+                                        };
+                                    }
+                                }
+                                query = util.querystring(tslib.__assign({ key: auth.config.apiKey }, params)).slice(1);
+                                return [4 /*yield*/, auth._getAdditionalHeaders()];
+                            case 1:
+                                headers = _a.sent();
+                                headers["Content-Type" /* CONTENT_TYPE */] = 'application/json';
+                                if (auth.languageCode) {
+                                    headers["X-Firebase-Locale" /* X_FIREBASE_LOCALE */] = auth.languageCode;
+                                }
+                                return [2 /*return*/, FetchProvider.fetch()(_getFinalTarget(auth, auth.config.apiHost, path, query), tslib.__assign({ method: method,
+                                        headers: headers, referrerPolicy: 'no-referrer' }, body))];
                         }
-                    }
-                    var query = util.querystring(tslib.__assign({ key: auth.config.apiKey }, params)).slice(1);
-                    var headers = new (FetchProvider.headers())();
-                    headers.set("Content-Type" /* CONTENT_TYPE */, 'application/json');
-                    headers.set("X-Client-Version" /* X_CLIENT_VERSION */, auth._getSdkClientVersion());
-                    if (auth.languageCode) {
-                        headers.set("X-Firebase-Locale" /* X_FIREBASE_LOCALE */, auth.languageCode);
-                    }
-                    return FetchProvider.fetch()(_getFinalTarget(auth, auth.config.apiHost, path, query), tslib.__assign({ method: method,
-                        headers: headers, referrerPolicy: 'no-referrer' }, body));
-                })];
+                    });
+                }); })];
         });
     });
 }
@@ -1608,24 +1616,32 @@ function extractProviderData(providers) {
 function requestStsToken(auth, refreshToken) {
     return tslib.__awaiter(this, void 0, void 0, function () {
         var response;
+        var _this = this;
         return tslib.__generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, _performFetchWithErrorHandling(auth, {}, function () {
-                        var body = util.querystring({
-                            'grant_type': 'refresh_token',
-                            'refresh_token': refreshToken
-                        }).slice(1);
-                        var _a = auth.config, tokenApiHost = _a.tokenApiHost, apiKey = _a.apiKey;
-                        var url = _getFinalTarget(auth, tokenApiHost, "/v1/token" /* TOKEN */, "key=" + apiKey);
-                        return FetchProvider.fetch()(url, {
-                            method: "POST" /* POST */,
-                            headers: {
-                                'X-Client-Version': auth._getSdkClientVersion(),
-                                'Content-Type': 'application/x-www-form-urlencoded'
-                            },
-                            body: body
+                case 0: return [4 /*yield*/, _performFetchWithErrorHandling(auth, {}, function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                        var body, _a, tokenApiHost, apiKey, url, headers;
+                        return tslib.__generator(this, function (_b) {
+                            switch (_b.label) {
+                                case 0:
+                                    body = util.querystring({
+                                        'grant_type': 'refresh_token',
+                                        'refresh_token': refreshToken
+                                    }).slice(1);
+                                    _a = auth.config, tokenApiHost = _a.tokenApiHost, apiKey = _a.apiKey;
+                                    url = _getFinalTarget(auth, tokenApiHost, "/v1/token" /* TOKEN */, "key=" + apiKey);
+                                    return [4 /*yield*/, auth._getAdditionalHeaders()];
+                                case 1:
+                                    headers = _b.sent();
+                                    headers["Content-Type" /* CONTENT_TYPE */] = 'application/x-www-form-urlencoded';
+                                    return [2 /*return*/, FetchProvider.fetch()(url, {
+                                            method: "POST" /* POST */,
+                                            headers: headers,
+                                            body: body
+                                        })];
+                            }
                         });
-                    })];
+                    }); })];
                 case 1:
                     response = _a.sent();
                     // The response comes back in snake_case. Convert to camel:
@@ -2527,13 +2543,19 @@ var AuthImpl = /** @class */ (function () {
                         if (this._deleted) {
                             return [2 /*return*/];
                         }
-                        if (!((_b = this._popupRedirectResolver) === null || _b === void 0 ? void 0 : _b._shouldInitProactively)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this._popupRedirectResolver._initialize(this)];
+                        if (!((_b = this._popupRedirectResolver) === null || _b === void 0 ? void 0 : _b._shouldInitProactively)) return [3 /*break*/, 5];
+                        _d.label = 2;
                     case 2:
+                        _d.trys.push([2, 4, , 5]);
+                        return [4 /*yield*/, this._popupRedirectResolver._initialize(this)];
+                    case 3:
                         _d.sent();
-                        _d.label = 3;
-                    case 3: return [4 /*yield*/, this.initializeCurrentUser(popupRedirectResolver)];
+                        return [3 /*break*/, 5];
                     case 4:
+                        _d.sent();
+                        return [3 /*break*/, 5];
+                    case 5: return [4 /*yield*/, this.initializeCurrentUser(popupRedirectResolver)];
+                    case 6:
                         _d.sent();
                         this.lastNotifiedUid = ((_c = this.currentUser) === null || _c === void 0 ? void 0 : _c.uid) || null;
                         if (this._deleted) {
@@ -2674,7 +2696,7 @@ var AuthImpl = /** @class */ (function () {
     };
     AuthImpl.prototype.reloadAndSetCurrentUserOrClear = function (user) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var e_2;
+            var e_3;
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -2684,8 +2706,8 @@ var AuthImpl = /** @class */ (function () {
                         _a.sent();
                         return [3 /*break*/, 3];
                     case 2:
-                        e_2 = _a.sent();
-                        if (e_2.code !== "auth/" + "network-request-failed" /* NETWORK_REQUEST_FAILED */) {
+                        e_3 = _a.sent();
+                        if (e_3.code !== "auth/" + "network-request-failed" /* NETWORK_REQUEST_FAILED */) {
                             // Something's wrong with the user's token. Log them out and remove
                             // them from storage
                             return [2 /*return*/, this.directlySetCurrentUser(null)];
@@ -2994,8 +3016,20 @@ var AuthImpl = /** @class */ (function () {
     AuthImpl.prototype._getFrameworks = function () {
         return this.frameworks;
     };
-    AuthImpl.prototype._getSdkClientVersion = function () {
-        return this.clientVersion;
+    AuthImpl.prototype._getAdditionalHeaders = function () {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var headers;
+            var _a;
+            return tslib.__generator(this, function (_b) {
+                headers = (_a = {},
+                    _a["X-Client-Version" /* X_CLIENT_VERSION */] = this.clientVersion,
+                    _a);
+                if (this.app.options.appId) {
+                    headers["X-Firebase-gmpid" /* X_FIREBASE_GMPID */] = this.app.options.appId;
+                }
+                return [2 /*return*/, headers];
+            });
+        });
     };
     return AuthImpl;
 }());
@@ -6846,7 +6880,7 @@ function multiFactor(user) {
 }
 
 var name = "@firebase/auth";
-var version = "0.19.3";
+var version = "0.19.4-canary.31db4b706";
 
 /**
  * @license
@@ -7201,4 +7235,4 @@ exports.updateProfile = updateProfile;
 exports.useDeviceLanguage = useDeviceLanguage;
 exports.verifyBeforeUpdateEmail = verifyBeforeUpdateEmail;
 exports.verifyPasswordResetCode = verifyPasswordResetCode;
-//# sourceMappingURL=index-057dcc31.js.map
+//# sourceMappingURL=index-abd97249.js.map