firebase-tools 13.20.0 → 13.20.1

package/lib/apiv2.js

@@ -34,7 +34,9 @@ function setAccessToken(token = "") {
 }
 exports.setAccessToken = setAccessToken;
 async function getAccessToken() {
-    if (accessToken) {
+    const valid = auth.haveValidTokens(refreshToken, []);
+    const usingADC = !auth.loggedIn();
+    if (accessToken && (valid || usingADC)) {
         return accessToken;
     }
     const data = await auth.getAccessToken(refreshToken, []);
@@ -295,6 +297,11 @@ class Client {
                 }
                 this.logResponse(res, body, options);
                 if (res.status >= 400) {
+                    if (res.status === 401 && this.opts.auth) {
+                        logger_1.logger.debug("Got a 401 Unauthenticated error for a call that required authentication. Refreshing tokens.");
+                        setAccessToken();
+                        setAccessToken(await getAccessToken());
+                    }
                     if ((_a = options.retryCodes) === null || _a === void 0 ? void 0 : _a.includes(res.status)) {
                         const err = (0, responseToError_1.responseToError)({ statusCode: res.status }, body) || undefined;
                         if (operation.retry(err)) {

package/lib/auth.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
+exports.addAdditionalAccount = exports.logout = exports.getAccessToken = exports.haveValidTokens = exports.loggedIn = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("colorette");
 const FormData = require("form-data");
 const http = require("http");
@@ -394,6 +394,10 @@ function findAccountByEmail(email) {
     return getAllAccounts().find((a) => a.user.email === email);
 }
 exports.findAccountByEmail = findAccountByEmail;
+function loggedIn() {
+    return !!lastAccessToken;
+}
+exports.loggedIn = loggedIn;
 function haveValidTokens(refreshToken, authScopes) {
     var _a;
     if (!(lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.access_token)) {
@@ -407,8 +411,16 @@ function haveValidTokens(refreshToken, authScopes) {
     const newScopesJSON = JSON.stringify(authScopes.sort());
     const hasSameScopes = oldScopesJSON === newScopesJSON;
     const isExpired = ((lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at) || 0) < Date.now() + FIFTEEN_MINUTES_IN_MS;
-    return hasTokens && hasSameScopes && !isExpired;
+    const valid = hasTokens && hasSameScopes && !isExpired;
+    if (hasTokens) {
+        logger_1.logger.debug(`Checked if tokens are valid: ${valid}, expires at: ${lastAccessToken === null || lastAccessToken === void 0 ? void 0 : lastAccessToken.expires_at}`);
+    }
+    else {
+        logger_1.logger.debug("No OAuth tokens found");
+    }
+    return valid;
 }
+exports.haveValidTokens = haveValidTokens;
 function deleteAccount(account) {
     const defaultAccount = getGlobalDefaultAccount();
     if (account.user.email === (defaultAccount === null || defaultAccount === void 0 ? void 0 : defaultAccount.user.email)) {

package/lib/dataconnect/dataplaneClient.js

@@ -1,16 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.executeGraphQL = void 0;
+exports.executeGraphQL = exports.dataconnectDataplaneClient = exports.DATACONNECT_API_VERSION = void 0;
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
-const DATACONNECT_API_VERSION = "v1beta";
-const dataconnectDataplaneClient = () => new apiv2_1.Client({
-    urlPrefix: (0, api_1.dataconnectOrigin)(),
-    apiVersion: DATACONNECT_API_VERSION,
-    auth: true,
-});
-async function executeGraphQL(servicePath, body) {
-    const res = await dataconnectDataplaneClient().post(`${servicePath}:executeGraphql`, body, { resolveOnHTTPError: true });
+exports.DATACONNECT_API_VERSION = "v1beta";
+function dataconnectDataplaneClient() {
+    return new apiv2_1.Client({
+        urlPrefix: (0, api_1.dataconnectOrigin)(),
+        apiVersion: exports.DATACONNECT_API_VERSION,
+        auth: true,
+    });
+}
+exports.dataconnectDataplaneClient = dataconnectDataplaneClient;
+async function executeGraphQL(client, servicePath, body) {
+    const res = await client.post(`${servicePath}:executeGraphql`, body, { resolveOnHTTPError: true });
     return res;
 }
 exports.executeGraphQL = executeGraphQL;

package/lib/emulator/downloadableEmulators.js

@@ -48,20 +48,20 @@ const EMULATOR_UPDATE_DETAILS = {
     },
     dataconnect: process.platform === "darwin"
         ? {
-            version: "1.4.2",
+            version: "1.4.3",
             expectedSize: 25125632,
-            expectedChecksum: "25c7dfe5816f4bfba82f002bcab10340",
+            expectedChecksum: "1edc7180b101b1b3653429ecb8312d2d",
         }
         : process.platform === "win32"
             ? {
-                version: "1.4.2",
+                version: "1.4.3",
                 expectedSize: 25548800,
-                expectedChecksum: "854ddf17fd9adeafd19531282ccc2a46",
+                expectedChecksum: "16b31831577778e8842c8715f35b4faa",
             }
             : {
-                version: "1.4.2",
+                version: "1.4.3",
                 expectedSize: 25034904,
-                expectedChecksum: "ed21d946879647f24fade5cdd93c9eb3",
+                expectedChecksum: "c959f7bd2ed3221c509cb7ad22956de3",
             },
 };
 exports.DownloadDetails = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-tools",
-  "version": "13.20.0",
+  "version": "13.20.1",
   "description": "Command-Line Interface for Firebase",
   "main": "./lib/index.js",
   "bin": {