firebase-tools 13.2.1 → 13.3.0

package/lib/auth.js

@@ -307,7 +307,7 @@ async function loginRemotely() {
         const tokens = await getTokensFromAuthorizationCode(code, `${api_1.authProxyOrigin}/complete`, codeVerifier);
         void (0, track_1.trackGA4)("login", { method: "google_remote" });
         return {
-            user: jwt.decode(tokens.id_token),
+            user: jwt.decode(tokens.id_token, { json: true }),
             tokens: tokens,
             scopes: SCOPES,
         };
@@ -323,7 +323,7 @@ async function loginWithLocalhostGoogle(port, userHint) {
     const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokensFromAuthorizationCode);
     void (0, track_1.trackGA4)("login", { method: "google_localhost" });
     return {
-        user: jwt.decode(tokens.id_token),
+        user: jwt.decode(tokens.id_token, { json: true }),
         tokens: tokens,
         scopes: tokens.scopes,
     };
@@ -477,6 +477,15 @@ async function refreshTokens(refreshToken, authScopes) {
             skipLog: { body: true, queryParams: true, resBody: true },
             resolveOnHTTPError: true,
         });
+        const forceReauthErrs = [
+            { error: "invalid_grant", error_subtype: "invalid_rapt" },
+        ];
+        const matches = (a, b) => {
+            return a.error === b.error && a.error_subtype === b.error_subtype;
+        };
+        if (forceReauthErrs.some((a) => matches(a, res.body))) {
+            throw invalidCredentialError();
+        }
         if (res.status === 401 || res.status === 400) {
             return { access_token: refreshToken };
         }

package/lib/commands/apphosting-backends-list.js

@@ -14,7 +14,7 @@ exports.command = new command_1.Command("apphosting:backends:list")
     .option("-l, --location <location>", "App Backend location", "-")
     .before(apphosting.ensureApiEnabled)
     .action(async (options) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
     const table = new Table({ head: TABLE_HEAD, style: { head: ["green"] } });
@@ -25,12 +25,12 @@ exports.command = new command_1.Command("apphosting:backends:list")
     catch (err) {
         throw new error_1.FirebaseError(`Unable to list backends present for project: ${projectId}. Please check the parameters you have provided.`, { original: err });
     }
-    const backends = backendRes === null || backendRes === void 0 ? void 0 : backendRes.backends;
+    const backends = (_a = backendRes.backends) !== null && _a !== void 0 ? _a : [];
     for (const backend of backends) {
         const [backendLocation, , backendId] = backend.name.split("/").slice(3, 6);
         table.push([
             backendId,
-            (_c = (_b = (_a = backend.codebase) === null || _a === void 0 ? void 0 : _a.repository) === null || _b === void 0 ? void 0 : _b.split("/").pop()) !== null && _c !== void 0 ? _c : "",
+            (_d = (_c = (_b = backend.codebase) === null || _b === void 0 ? void 0 : _b.repository) === null || _c === void 0 ? void 0 : _c.split("/").pop()) !== null && _d !== void 0 ? _d : "",
             backendLocation,
             backend.uri.startsWith("https:") ? backend.uri : "https://" + backend.uri,
             (0, utils_1.datetimeString)(new Date(backend.createTime)),

package/lib/commands/apphosting-builds-create.js

@@ -12,15 +12,16 @@ exports.command = new command_1.Command("apphosting:builds:create <backendId>")
     .option("-b, --branch <branch>", "Repository branch to deploy. Defaults to 'main'", "main")
     .before(apphosting.ensureApiEnabled)
     .action(async (backendId, options) => {
+    var _a;
     const projectId = (0, projectUtils_1.needProjectId)(options);
     const location = options.location;
     const buildId = options.buildId ||
         (await apphosting.getNextRolloutId(projectId, location, backendId));
-    const branch = options.branch;
+    const branch = (_a = options.branch) !== null && _a !== void 0 ? _a : "main";
     const op = await apphosting.createBuild(projectId, location, backendId, buildId, {
         source: {
             codebase: {
-                branch: "main",
+                branch,
             },
         },
     });

package/lib/commands/index.js

@@ -144,7 +144,7 @@ function load(client) {
         client.internaltesting.functions = {};
         client.internaltesting.functions.discover = loadCommand("internaltesting-functions-discover");
     }
-    if (experiments.isEnabled("internalframeworks")) {
+    if (experiments.isEnabled("apphosting")) {
         client.apphosting = {};
         client.apphosting.backends = {};
         client.apphosting.backends.list = loadCommand("apphosting-backends-list");

package/lib/commands/init.js

@@ -69,10 +69,10 @@ const choices = [
         checked: false,
     },
 ];
-if ((0, experiments_1.isEnabled)("internalframeworks")) {
+if ((0, experiments_1.isEnabled)("apphosting")) {
     choices.push({
-        value: "internalframeworks",
-        name: "Frameworks: Get started with Frameworks projects.",
+        value: "apphosting",
+        name: "App Hosting: Get started with App Hosting projects.",
         checked: false,
     });
 }

package/lib/deploy/functions/runtimes/index.js

@@ -14,6 +14,7 @@ const RUNTIMES = [
     "nodejs20",
     "python310",
     "python311",
+    "python312",
 ];
 const EXPERIMENTAL_RUNTIMES = [];
 const DEPRECATED_RUNTIMES = ["nodejs6", "nodejs8"];
@@ -36,6 +37,7 @@ const MESSAGE_FRIENDLY_RUNTIMES = {
     nodejs20: "Node.js 20",
     python310: "Python 3.10",
     python311: "Python 3.11",
+    python312: "Python 3.12",
 };
 function getHumanFriendlyRuntimeName(runtime) {
     return MESSAGE_FRIENDLY_RUNTIMES[runtime] || runtime;

package/lib/deploy/functions/runtimes/python/index.js

@@ -11,7 +11,7 @@ const discovery = require("../discovery");
 const logger_1 = require("../../../../logger");
 const python_1 = require("../../../../functions/python");
 const error_1 = require("../../../../error");
-exports.LATEST_VERSION = "python311";
+exports.LATEST_VERSION = "python312";
 async function tryCreateDelegate(context) {
     const requirementsTextPath = path.join(context.sourceDir, "requirements.txt");
     if (!(await (0, util_1.promisify)(fs.exists)(requirementsTextPath))) {
@@ -35,6 +35,9 @@ function getPythonBinary(runtime) {
     else if (runtime === "python311") {
         return "python3.11";
     }
+    else if (runtime === "python312") {
+        return "python3.12";
+    }
     return "python";
 }
 exports.getPythonBinary = getPythonBinary;

package/lib/deploy/functions/services/firestore.js

@@ -9,7 +9,7 @@ async function getDatabase(project, databaseId) {
     if (dbCache.has(key)) {
         return dbCache.get(key);
     }
-    const db = await firestore.getDatabase(project, databaseId);
+    const db = await firestore.getDatabase(project, databaseId, false);
     dbCache.set(key, db);
     return db;
 }

package/lib/emulator/storage/rules/runtime.js

@@ -331,7 +331,7 @@ function createAuthExpressionValue(opts) {
         return toExpressionValue(null);
     }
     else {
-        const tokenPayload = jwt.decode(opts.token);
+        const tokenPayload = jwt.decode(opts.token, { json: true });
         const jsonValue = {
             uid: tokenPayload.user_id,
             token: tokenPayload,

package/lib/experiments.js

@@ -72,9 +72,9 @@ exports.ALL_EXPERIMENTS = experiments({
             "These commands are not meant for public consumption and may break or disappear " +
             "without a notice.",
     },
-    internalframeworks: {
+    apphosting: {
         shortDescription: "Allow CLI option for Frameworks",
-        default: true,
+        default: false,
         public: false,
     },
 });

package/lib/firestore/delete.js

@@ -219,7 +219,7 @@ class FirestoreDelete {
             }
             numPendingDeletes++;
             firestore
-                .deleteDocuments(this.project, toDelete)
+                .deleteDocuments(this.project, toDelete, true)
                 .then((numDeleted) => {
                 FirestoreDelete.progressBar.tick(numDeleted);
                 numDocsDeleted += numDeleted;
@@ -280,7 +280,7 @@ class FirestoreDelete {
         let initialDelete;
         if (this.isDocumentPath) {
             const doc = { name: this.root + "/" + this.path };
-            initialDelete = firestore.deleteDocument(doc).catch((err) => {
+            initialDelete = firestore.deleteDocument(doc, true).catch((err) => {
                 logger_1.logger.debug("deletePath:initialDelete:error", err);
                 if (this.allDescendants) {
                     return Promise.resolve();
@@ -297,7 +297,7 @@ class FirestoreDelete {
     }
     deleteDatabase() {
         return firestore
-            .listCollectionIds(this.project)
+            .listCollectionIds(this.project, true)
             .catch((err) => {
             logger_1.logger.debug("deleteDatabase:listCollectionIds:error", err);
             return utils.reject("Unable to list collection IDs");

package/lib/gcp/apphosting.js

@@ -8,6 +8,7 @@ const api_1 = require("../api");
 const ensureApiEnabled_1 = require("../ensureApiEnabled");
 const deploymentTool = require("../deploymentTool");
 const error_1 = require("../error");
+const metaprogramming_1 = require("../metaprogramming");
 exports.API_HOST = new URL(api_1.apphostingOrigin).host;
 exports.API_VERSION = "v1alpha";
 exports.client = new apiv2_1.Client({
@@ -15,6 +16,10 @@ exports.client = new apiv2_1.Client({
     auth: true,
     apiVersion: exports.API_VERSION,
 });
+(0, metaprogramming_1.assertImplements)();
+(0, metaprogramming_1.assertImplements)();
+(0, metaprogramming_1.assertImplements)();
+(0, metaprogramming_1.assertImplements)();
 async function createBackend(projectId, location, backendReqBoby, backendId) {
     const res = await exports.client.post(`projects/${projectId}/locations/${location}/backends`, Object.assign(Object.assign({}, backendReqBoby), { labels: Object.assign(Object.assign({}, backendReqBoby.labels), deploymentTool.labels()) }), { queryParams: { backendId } });
     return res.body;
@@ -92,11 +97,7 @@ async function listRollouts(projectId, location, backendId) {
 }
 exports.listRollouts = listRollouts;
 async function updateTraffic(projectId, location, backendId, traffic) {
-    const trafficCopy = Object.assign({}, traffic);
-    if ("rolloutPolicy" in traffic) {
-        trafficCopy.rolloutPolicy = {};
-    }
-    const fieldMasks = proto.fieldMasks(trafficCopy);
+    const fieldMasks = proto.fieldMasks(traffic, "rolloutPolicy");
     const queryParams = {
         updateMask: fieldMasks.join(","),
     };
@@ -125,7 +126,7 @@ async function listLocations(projectId) {
 exports.listLocations = listLocations;
 async function ensureApiEnabled(options) {
     const projectId = (0, projectUtils_1.needProjectId)(options);
-    return await (0, ensureApiEnabled_1.ensure)(projectId, exports.API_HOST, "frameworks", true);
+    return await (0, ensureApiEnabled_1.ensure)(projectId, exports.API_HOST, "app hosting", true);
 }
 exports.ensureApiEnabled = ensureApiEnabled;
 async function getNextRolloutId(projectId, location, backendId, counter) {
@@ -133,7 +134,7 @@ async function getNextRolloutId(projectId, location, backendId, counter) {
     const date = new Date();
     const year = date.getUTCFullYear();
     const month = String(date.getUTCMonth() + 1).padStart(2, "0");
-    const day = String(date.getUTCDay()).padStart(2, "0");
+    const day = String(date.getUTCDate()).padStart(2, "0");
     if (counter) {
         return `build-${year}-${month}-${day}-${String(counter).padStart(3, "0")}`;
     }

package/lib/gcp/firestore.js

@@ -4,12 +4,18 @@ exports.deleteDocuments = exports.deleteDocument = exports.listCollectionIds = e
 const api_1 = require("../api");
 const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
-const apiClient = new apiv2_1.Client({
+const prodOnlyClient = new apiv2_1.Client({
     auth: true,
     apiVersion: "v1",
     urlPrefix: api_1.firestoreOrigin,
 });
-async function getDatabase(project, database) {
+const emuOrProdClient = new apiv2_1.Client({
+    auth: true,
+    apiVersion: "v1",
+    urlPrefix: api_1.firestoreOriginOrEmulator,
+});
+async function getDatabase(project, database, allowEmulator = false) {
+    const apiClient = allowEmulator ? emuOrProdClient : prodOnlyClient;
     const url = `projects/${project}/databases/${database}`;
     try {
         const resp = await apiClient.get(url);
@@ -21,7 +27,8 @@ async function getDatabase(project, database) {
     }
 }
 exports.getDatabase = getDatabase;
-function listCollectionIds(project) {
+function listCollectionIds(project, allowEmulator = false) {
+    const apiClient = allowEmulator ? emuOrProdClient : prodOnlyClient;
     const url = "projects/" + project + "/databases/(default)/documents:listCollectionIds";
     const data = {
         pageSize: 2147483647,
@@ -31,11 +38,13 @@ function listCollectionIds(project) {
     });
 }
 exports.listCollectionIds = listCollectionIds;
-async function deleteDocument(doc) {
+async function deleteDocument(doc, allowEmulator = false) {
+    const apiClient = allowEmulator ? emuOrProdClient : prodOnlyClient;
     return apiClient.delete(doc.name);
 }
 exports.deleteDocument = deleteDocument;
-async function deleteDocuments(project, docs) {
+async function deleteDocuments(project, docs, allowEmulator = false) {
+    const apiClient = allowEmulator ? emuOrProdClient : prodOnlyClient;
     const url = "projects/" + project + "/databases/(default)/documents:commit";
     const writes = docs.map((doc) => {
         return { delete: doc.name };

package/lib/hosting/options.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const optionsAreHostingOptions = true;
+const metaprogramming_1 = require("../metaprogramming");
+(0, metaprogramming_1.assertImplements)();

package/lib/metaprogramming.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertImplements = void 0;
+function assertImplements() { }
+exports.assertImplements = assertImplements;

package/package.json

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