firebase-tools 12.4.5 → 12.4.6

package/lib/apiv2.js

@@ -146,7 +146,7 @@ class Client {
         if (accessToken) {
             return accessToken;
         }
-        const data = (await auth.getAccessToken(refreshToken, []));
+        const data = await auth.getAccessToken(refreshToken, []);
         return data.access_token;
     }
     requestURL(options) {

package/lib/auth.js

@@ -509,7 +509,7 @@ async function refreshTokens(refreshToken, authScopes) {
     }
 }
 async function getAccessToken(refreshToken, authScopes) {
-    if (haveValidTokens(refreshToken, authScopes)) {
+    if (haveValidTokens(refreshToken, authScopes) && lastAccessToken) {
         return lastAccessToken;
     }
     return refreshTokens(refreshToken, authScopes);

package/lib/emulator/constants.js

@@ -88,6 +88,7 @@ exports.Constants = Constants;
 Constants.FAKE_PROJECT_ID_PREFIX = "demo-";
 Constants.FAKE_PROJECT_NUMBER = "0";
 Constants.DEFAULT_DATABASE_EMULATOR_NAMESPACE = "fake-server";
+Constants.FIREBASE_ENABLED_EXPERIMENTS = "FIREBASE_ENABLED_EXPERIMENTS";
 Constants.FIRESTORE_EMULATOR_HOST = "FIRESTORE_EMULATOR_HOST";
 Constants.FIRESTORE_EMULATOR_ENV_ALT = "FIREBASE_FIRESTORE_EMULATOR_ADDRESS";
 Constants.FIREBASE_DATABASE_EMULATOR_HOST = "FIREBASE_DATABASE_EMULATOR_HOST";

package/lib/emulator/ui.js

@@ -8,6 +8,7 @@ const error_1 = require("../error");
 const constants_1 = require("./constants");
 const track_1 = require("../track");
 const ExpressBasedEmulator_1 = require("./ExpressBasedEmulator");
+const experiments_1 = require("../experiments");
 class EmulatorUI {
     constructor(args) {
         this.args = args;
@@ -26,6 +27,8 @@ class EmulatorUI {
         if (session) {
             env[constants_1.Constants.FIREBASE_GA_SESSION] = JSON.stringify(session);
         }
+        const enabledExperiments = Object.keys(experiments_1.ALL_EXPERIMENTS).filter((experimentName) => (0, experiments_1.isEnabled)(experimentName));
+        env[constants_1.Constants.FIREBASE_ENABLED_EXPERIMENTS] = JSON.stringify(enabledExperiments);
         return downloadableEmulators.start(types_1.Emulators.UI, { auto_download: autoDownload }, env);
     }
     connect() {

package/lib/extensions/tos.js

@@ -39,36 +39,48 @@ async function acceptPublisherTOS(projectId, tosVersion) {
 }
 exports.acceptPublisherTOS = acceptPublisherTOS;
 async function acceptLatestPublisherTOS(options, projectId) {
-    logger_1.logger.debug(`Checking if latest publisher TOS has been accepted by ${projectId}...`);
-    const currentAcceptance = await getPublisherTOSStatus(projectId);
-    if (currentAcceptance.lastAcceptedVersion) {
-        logger_1.logger.debug(`Already accepted version ${currentAcceptance.lastAcceptedVersion} of Extensions publisher TOS.`);
-        return currentAcceptance;
-    }
-    else {
-        const tosLink = extensionsTosUrl("publisher");
-        logger_1.logger.info(`To continue, you must accept the Firebase Extensions Publisher Terms of Service: ${tosLink}`);
-        if (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions Publisher Terms of Service?" }))) {
-            return acceptPublisherTOS(projectId, currentAcceptance.latestTosVersion);
+    try {
+        logger_1.logger.debug(`Checking if latest publisher TOS has been accepted by ${projectId}...`);
+        const currentAcceptance = await getPublisherTOSStatus(projectId);
+        if (currentAcceptance.lastAcceptedVersion) {
+            logger_1.logger.debug(`Already accepted version ${currentAcceptance.lastAcceptedVersion} of Extensions publisher TOS.`);
+            return currentAcceptance;
+        }
+        else {
+            const tosLink = extensionsTosUrl("publisher");
+            logger_1.logger.info(`To continue, you must accept the Firebase Extensions Publisher Terms of Service: ${tosLink}`);
+            if (await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions Publisher Terms of Service?" }))) {
+                return acceptPublisherTOS(projectId, currentAcceptance.latestTosVersion);
+            }
         }
-        throw new error_1.FirebaseError("You must accept the terms of service to continue.");
     }
+    catch (err) {
+        logger_1.logger.debug(`Error when checking Publisher TOS for ${projectId}. This is expected if authenticated via a service account: ${err}`);
+        return;
+    }
+    throw new error_1.FirebaseError("You must accept the terms of service to continue.");
 }
 exports.acceptLatestPublisherTOS = acceptLatestPublisherTOS;
 async function acceptLatestAppDeveloperTOS(options, projectId, instanceIds) {
-    logger_1.logger.debug(`Checking if latest AppDeveloper TOS has been accepted by ${projectId}...`);
-    displayDeveloperTOSWarning();
-    const currentAcceptance = await getAppDeveloperTOSStatus(projectId);
-    if (currentAcceptance.lastAcceptedVersion) {
-        logger_1.logger.debug(`User Terms of Service aready accepted on project ${projectId}.`);
+    try {
+        logger_1.logger.debug(`Checking if latest AppDeveloper TOS has been accepted by ${projectId}...`);
+        displayDeveloperTOSWarning();
+        const currentAcceptance = await getAppDeveloperTOSStatus(projectId);
+        if (currentAcceptance.lastAcceptedVersion) {
+            logger_1.logger.debug(`User Terms of Service aready accepted on project ${projectId}.`);
+        }
+        else if (!(await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions User Terms of Service?" })))) {
+            throw new error_1.FirebaseError("You must accept the terms of service to continue.");
+        }
+        const tosPromises = instanceIds.map((instanceId) => {
+            return acceptAppDeveloperTOS(projectId, currentAcceptance.latestTosVersion, instanceId);
+        });
+        return Promise.all(tosPromises);
     }
-    else if (!(await (0, prompt_1.confirm)(Object.assign(Object.assign({}, options), { message: "Do you accept the Firebase Extensions User Terms of Service?" })))) {
-        throw new error_1.FirebaseError("You must accept the terms of service to continue.");
+    catch (err) {
+        logger_1.logger.debug(`Error when checking App Developer TOS for ${projectId}. This is expected if authenticated via a service account: ${err}`);
+        return [];
     }
-    const tosPromises = instanceIds.map((instanceId) => {
-        return acceptAppDeveloperTOS(projectId, currentAcceptance.latestTosVersion, instanceId);
-    });
-    return Promise.all(tosPromises);
 }
 exports.acceptLatestAppDeveloperTOS = acceptLatestAppDeveloperTOS;
 function displayDeveloperTOSWarning() {

package/lib/frameworks/next/utils.js

@@ -1,11 +1,4 @@
 "use strict";
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNextVersion = exports.getBuildId = exports.getHeadersFromMetaFiles = exports.getNonStaticServerComponents = exports.getNonStaticRoutes = exports.getMiddlewareMatcherRegexes = exports.allDependencyNames = exports.isUsingAppDirectory = exports.isUsingNextImageInAppDirectory = exports.isUsingImageOptimization = exports.isUsingMiddleware = exports.hasUnoptimizedImage = exports.usesNextImage = exports.usesAppDirRouter = exports.getNextjsRewritesToUse = exports.isHeaderSupportedByHosting = exports.isRedirectSupportedByHosting = exports.isRewriteSupportedByHosting = exports.cleanI18n = exports.cleanCustomRouteI18n = exports.cleanEscapedChars = exports.I18N_SOURCE = void 0;
 const fs_1 = require("fs");
@@ -108,31 +101,13 @@ async function isUsingImageOptimization(projectDir, distDir) {
 }
 exports.isUsingImageOptimization = isUsingImageOptimization;
 async function isUsingNextImageInAppDirectory(projectDir, nextDir) {
-    var _a, e_1, _b, _c;
-    const { found: files } = new glob_1.Glob((0, path_1.join)(projectDir, nextDir, "server", "**", "*client-reference-manifest.js"));
-    try {
-        for (var _d = true, files_1 = __asyncValues(files), files_1_1; files_1_1 = await files_1.next(), _a = files_1_1.done, !_a;) {
-            _c = files_1_1.value;
-            _d = false;
-            try {
-                const filepath = _c;
-                const fileContents = await (0, promises_1.readFile)(filepath);
-                if (fileContents.includes("node_modules/next/dist/client/image")) {
-                    return true;
-                }
-            }
-            finally {
-                _d = true;
-            }
+    const files = (0, glob_1.sync)((0, path_1.join)(projectDir, nextDir, "server", "**", "*client-reference-manifest.js"));
+    for (const filepath of files) {
+        const fileContents = await (0, promises_1.readFile)(filepath);
+        if (fileContents.includes("node_modules/next/dist/client/image")) {
+            return true;
         }
     }
-    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-    finally {
-        try {
-            if (!_d && !_a && (_b = files_1.return)) await _b.call(files_1);
-        }
-        finally { if (e_1) throw e_1.error; }
-    }
     return false;
 }
 exports.isUsingNextImageInAppDirectory = isUsingNextImageInAppDirectory;

package/package.json

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