firebase-tools 11.16.1 → 11.17.0

package/lib/emulator/auth/operations.js

@@ -1126,7 +1126,8 @@ async function signInWithIdp(state, reqBody) {
         oauthExpiresIn: coercePrimitiveToString(response.oauthExpireIn),
     };
     if (response.isNewUser) {
-        let updates = Object.assign(Object.assign({}, accountUpdates.fields), { lastLoginAt: Date.now().toString(), providerUserInfo: [providerUserInfo], tenantId: state instanceof state_1.TenantProjectState ? state.tenantId : undefined });
+        const timestamp = new Date();
+        let updates = Object.assign(Object.assign({}, accountUpdates.fields), { createdAt: timestamp.getTime().toString(), lastLoginAt: timestamp.getTime().toString(), providerUserInfo: [providerUserInfo], tenantId: state instanceof state_1.TenantProjectState ? state.tenantId : undefined });
         const localId = state.generateLocalId();
         const userBeforeCreate = Object.assign({ localId }, updates);
         const blockingResponse = await fetchBlockingFunction(state, state_1.BlockingFunctionEvents.BEFORE_CREATE, userBeforeCreate, {
@@ -1187,7 +1188,8 @@ async function signInWithIdp(state, reqBody) {
 async function signInWithPassword(state, reqBody) {
     (0, errors_1.assert)(!state.disableAuth, "PROJECT_DISABLED");
     (0, errors_1.assert)(state.allowPasswordSignup, "PASSWORD_LOGIN_DISABLED");
-    (0, errors_1.assert)(reqBody.email, "MISSING_EMAIL");
+    (0, errors_1.assert)(reqBody.email !== undefined, "MISSING_EMAIL");
+    (0, errors_1.assert)((0, utils_1.isValidEmailAddress)(reqBody.email), "INVALID_EMAIL");
     (0, errors_1.assert)(reqBody.password, "MISSING_PASSWORD");
     if (reqBody.captchaResponse || reqBody.captchaChallenge) {
         throw new errors_1.NotImplementedError("captcha unimplemented");

package/lib/emulator/auth/server.js

@@ -97,14 +97,24 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
     registerLegacyRoutes(app);
     (0, handlers_1.registerHandlers)(app, (apiKey, tenantId) => getProjectStateById(getProjectIdByApiKey(apiKey), tenantId));
     const apiKeyAuthenticator = (ctx, info) => {
-        if (info.in !== "query") {
-            throw new Error('apiKey must be defined as in: "query" in API spec.');
-        }
         if (!info.name) {
-            throw new Error("apiKey param name is undefined in API spec.");
+            throw new Error("apiKey param/header name is undefined in API spec.");
+        }
+        let key;
+        const req = ctx.req;
+        switch (info.in) {
+            case "header":
+                key = req.get(info.name);
+                break;
+            case "query": {
+                const q = req.query[info.name];
+                key = typeof q === "string" ? q : undefined;
+                break;
+            }
+            default:
+                throw new Error('apiKey must be defined as in: "query" or "header" in API spec.');
         }
-        const key = ctx.req.query[info.name];
-        if (typeof key === "string" && key.length > 0) {
+        if (key) {
             return { type: "success", user: getProjectIdByApiKey(key) };
         }
         else {
@@ -138,7 +148,8 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
     const apis = await exegesisExpress.middleware(specForRouter(), {
         controllers: { auth: toExegesisController(operations_1.authOperations, getProjectStateById) },
         authenticators: {
-            apiKey: apiKeyAuthenticator,
+            apiKeyQuery: apiKeyAuthenticator,
+            apiKeyHeader: apiKeyAuthenticator,
             Oauth2: oauth2Authenticator,
         },
         autoHandleHttpErrors(err) {
@@ -206,7 +217,7 @@ async function createApp(defaultProjectId, singleProjectMode = index_1.SinglePro
                         postController(ctx) {
                             if (ctx.res.statusCode === 401) {
                                 const requirements = ctx.api.operationObject.security;
-                                if (requirements === null || requirements === void 0 ? void 0 : requirements.some((req) => req.apiKey)) {
+                                if (requirements === null || requirements === void 0 ? void 0 : requirements.some((req) => req.apiKeyQuery || req.apiKeyHeader)) {
                                     throw new errors_2.PermissionDeniedError("The request is missing a valid API key.");
                                 }
                                 else {

package/lib/emulator/eventarcEmulator.js

@@ -8,6 +8,7 @@ const utils_1 = require("../utils");
 const emulatorLogger_1 = require("./emulatorLogger");
 const registry_1 = require("./registry");
 const error_1 = require("../error");
+const eventarcEmulatorUtils_1 = require("./eventarcEmulatorUtils");
 class EventarcEmulator {
     constructor(args) {
         this.args = args;
@@ -89,7 +90,7 @@ class EventarcEmulator {
             .request({
             method: "POST",
             path: `/functions/projects/${trigger.projectId}/triggers/${trigger.triggerName}`,
-            body: JSON.stringify(event),
+            body: JSON.stringify((0, eventarcEmulatorUtils_1.cloudEventFromProtoToJson)(event)),
             responseType: "stream",
             resolveOnHTTPError: true,
         })

package/lib/emulator/eventarcEmulatorUtils.js

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloudEventFromProtoToJson = void 0;
+const error_1 = require("../error");
+const BUILT_IN_ATTRS = ["time", "datacontenttype", "subject"];
+function cloudEventFromProtoToJson(ce) {
+    if (ce["id"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'id' is required.");
+    }
+    if (ce["type"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'type' is required.");
+    }
+    if (ce["specVersion"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'specVersion' is required.");
+    }
+    if (ce["source"] === undefined) {
+        throw new error_1.FirebaseError("CloudEvent 'source' is required.");
+    }
+    const out = {
+        id: ce["id"],
+        type: ce["type"],
+        specversion: ce["specVersion"],
+        source: ce["source"],
+        subject: getOptionalAttribute(ce, "subject", "ceString"),
+        time: getRequiredAttribute(ce, "time", "ceTimestamp"),
+        data: getData(ce),
+        datacontenttype: getRequiredAttribute(ce, "datacontenttype", "ceString"),
+    };
+    for (const attr in ce["attributes"]) {
+        if (BUILT_IN_ATTRS.includes(attr)) {
+            continue;
+        }
+        out[attr] = getRequiredAttribute(ce, attr, "ceString");
+    }
+    return out;
+}
+exports.cloudEventFromProtoToJson = cloudEventFromProtoToJson;
+function getOptionalAttribute(ce, attr, type) {
+    return ce["attributes"][attr][type];
+}
+function getRequiredAttribute(ce, attr, type) {
+    const val = ce["attributes"][attr][type];
+    if (val === undefined) {
+        throw new error_1.FirebaseError("CloudEvent must contain " + attr + " attribute");
+    }
+    return val;
+}
+function getData(ce) {
+    const contentType = getRequiredAttribute(ce, "datacontenttype", "ceString");
+    switch (contentType) {
+        case "application/json":
+            return JSON.parse(ce["textData"]);
+        case "text/plain":
+            return ce["textData"];
+        case undefined:
+            return undefined;
+        default:
+            throw new error_1.FirebaseError("Unsupported content type: " + contentType);
+    }
+}

package/lib/emulator/functionsEmulator.js

@@ -334,7 +334,7 @@ class FunctionsEmulator {
                         added = await this.addFirestoreTrigger(this.args.projectId, key, definition.eventTrigger);
                         break;
                     case constants_1.Constants.SERVICE_REALTIME_DATABASE:
-                        added = await this.addRealtimeDatabaseTrigger(this.args.projectId, key, definition.eventTrigger, signature, definition.region);
+                        added = await this.addRealtimeDatabaseTrigger(this.args.projectId, definition.id, key, definition.eventTrigger, signature, definition.region);
                         break;
                     case constants_1.Constants.SERVICE_PUBSUB:
                         added = await this.addPubsubTrigger(definition.name, key, definition.eventTrigger, signature, definition.schedule);
@@ -438,7 +438,7 @@ class FunctionsEmulator {
         }
         return { bundle, apiPath, instance };
     }
-    getV2DatabaseApiAttributes(projectId, key, eventTrigger, region) {
+    getV2DatabaseApiAttributes(projectId, id, key, eventTrigger, region) {
         var _a, _b, _c;
         const instance = ((_a = eventTrigger.eventFilters) === null || _a === void 0 ? void 0 : _a.instance) || ((_b = eventTrigger.eventFilterPathPatterns) === null || _b === void 0 ? void 0 : _b.instance);
         if (!instance) {
@@ -448,6 +448,9 @@ class FunctionsEmulator {
         if (!ref) {
             throw new error_1.FirebaseError("A database reference must be supplied.");
         }
+        if (region !== "us-central1") {
+            this.logger.logLabeled("WARN", `functions[${id}]`, `function region is defined outside the database region, will not trigger.`);
+        }
         const bundle = JSON.stringify({
             name: `projects/${projectId}/locations/${region}/triggers/${key}`,
             path: ref,
@@ -458,12 +461,12 @@ class FunctionsEmulator {
         const apiPath = "/.settings/functionTriggers.json";
         return { bundle, apiPath, instance };
     }
-    async addRealtimeDatabaseTrigger(projectId, key, eventTrigger, signature, region) {
+    async addRealtimeDatabaseTrigger(projectId, id, key, eventTrigger, signature, region) {
         if (!registry_1.EmulatorRegistry.isRunning(types_1.Emulators.DATABASE)) {
             return false;
         }
         const { bundle, apiPath, instance } = signature === "cloudevent"
-            ? this.getV2DatabaseApiAttributes(projectId, key, eventTrigger, region)
+            ? this.getV2DatabaseApiAttributes(projectId, id, key, eventTrigger, region)
             : this.getV1DatabaseApiAttributes(projectId, key, eventTrigger);
         logger_1.logger.debug(`addRealtimeDatabaseTrigger[${instance}]`, JSON.stringify(bundle));
         const client = registry_1.EmulatorRegistry.client(types_1.Emulators.DATABASE);
@@ -881,6 +884,10 @@ class FunctionsEmulator {
             return;
         }
         const record = this.getTriggerRecordByKey(triggerId);
+        if (!record.enabled) {
+            res.status(204).send("Background triggers are currently disabled.");
+            return;
+        }
         const trigger = record.def;
         logger_1.logger.debug(`Accepted request ${method} ${req.url} --> ${triggerId}`);
         const reqBody = req.rawBody;

package/lib/extensions/extensionsHelper.js

@@ -558,12 +558,15 @@ async function diagnoseAndFixProject(options) {
     }
 }
 exports.diagnoseAndFixProject = diagnoseAndFixProject;
-async function canonicalizeRefInput(extensionName) {
-    if (extensionName.split("/").length < 2) {
-        const [extensionID, version] = extensionName.split("@");
-        extensionName = `firebase/${extensionID}@${version || "latest"}`;
+async function canonicalizeRefInput(refInput) {
+    let inferredRef = refInput;
+    if (refInput.split("/").length < 2) {
+        inferredRef = `firebase/${inferredRef}`;
     }
-    const ref = refs.parse(extensionName);
+    if (refInput.split("@").length < 2) {
+        inferredRef = `${inferredRef}@latest`;
+    }
+    const ref = refs.parse(inferredRef);
     ref.version = await (0, planner_1.resolveVersion)(ref);
     return refs.toExtensionVersionRef(ref);
 }

package/lib/utils.js

@@ -363,7 +363,7 @@ function datetimeString(d) {
 }
 exports.datetimeString = datetimeString;
 function isCloudEnvironment() {
-    return !!process.env.CODESPACES;
+    return !!process.env.CODESPACES || !!process.env.GOOGLE_CLOUD_WORKSTATIONS;
 }
 exports.isCloudEnvironment = isCloudEnvironment;
 function isRunningInWSL() {

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "11.16.1",
+  "version": "11.17.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "11.16.1",
+      "version": "11.17.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^3.0.1",
@@ -167,24 +167,6 @@
         "node": ">=12.0.0"
       }
     },
-    "node_modules/@google-cloud/pubsub/node_modules/@grpc/proto-loader": {
-      "version": "0.6.12",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.12.tgz",
-      "integrity": "sha512-filTVbETFnxb9CyRX98zN18ilChTuf/C5scZ2xyaOTp0EHGq0/ufX8rjqXUcSb1Gpv7eZq4M2jDvbh9BogKnrg==",
-      "dependencies": {
-        "@types/long": "^4.0.1",
-        "lodash.camelcase": "^4.3.0",
-        "long": "^4.0.0",
-        "protobufjs": "^6.10.0",
-        "yargs": "^16.2.0"
-      },
-      "bin": {
-        "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
     "node_modules/@google-cloud/pubsub/node_modules/debug": {
       "version": "4.3.4",
       "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -343,15 +325,15 @@
         "node": "^8.13.0 || >=10.10.0"
       }
     },
-    "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": {
-      "version": "0.6.9",
-      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.9.tgz",
-      "integrity": "sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg==",
+    "node_modules/@grpc/proto-loader": {
+      "version": "0.6.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz",
+      "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==",
       "dependencies": {
         "@types/long": "^4.0.1",
         "lodash.camelcase": "^4.3.0",
         "long": "^4.0.0",
-        "protobufjs": "^6.10.0",
+        "protobufjs": "^6.11.3",
         "yargs": "^16.2.0"
       },
       "bin": {
@@ -3024,14 +3006,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/google-p12-pem/node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
-      "engines": {
-        "node": ">= 6.13.0"
-      }
-    },
     "node_modules/got": {
       "version": "9.6.0",
       "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
@@ -3210,9 +3184,9 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -4539,6 +4513,14 @@
         }
       }
     },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "engines": {
+        "node": ">= 6.13.0"
+      }
+    },
     "node_modules/node-gyp": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.1.0.tgz",
@@ -7006,18 +6988,6 @@
             "extend": "^3.0.2"
           }
         },
-        "@grpc/proto-loader": {
-          "version": "0.6.12",
-          "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.12.tgz",
-          "integrity": "sha512-filTVbETFnxb9CyRX98zN18ilChTuf/C5scZ2xyaOTp0EHGq0/ufX8rjqXUcSb1Gpv7eZq4M2jDvbh9BogKnrg==",
-          "requires": {
-            "@types/long": "^4.0.1",
-            "lodash.camelcase": "^4.3.0",
-            "long": "^4.0.0",
-            "protobufjs": "^6.10.0",
-            "yargs": "^16.2.0"
-          }
-        },
         "debug": {
           "version": "4.3.4",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
@@ -7138,20 +7108,18 @@
       "requires": {
         "@grpc/proto-loader": "^0.6.4",
         "@types/node": ">=12.12.47"
-      },
-      "dependencies": {
-        "@grpc/proto-loader": {
-          "version": "0.6.9",
-          "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.9.tgz",
-          "integrity": "sha512-UlcCS8VbsU9d3XTXGiEVFonN7hXk+oMXZtoHHG2oSA1/GcDP1q6OUgs20PzHDGizzyi8ufGSUDlk3O2NyY7leg==",
-          "requires": {
-            "@types/long": "^4.0.1",
-            "lodash.camelcase": "^4.3.0",
-            "long": "^4.0.0",
-            "protobufjs": "^6.10.0",
-            "yargs": "^16.2.0"
-          }
-        }
+      }
+    },
+    "@grpc/proto-loader": {
+      "version": "0.6.13",
+      "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.6.13.tgz",
+      "integrity": "sha512-FjxPYDRTn6Ec3V0arm1FtSpmP6V50wuph2yILpyvTKzjc76oDdoihXqM1DzOW5ubvCC8GivfCnNtfaRE8myJ7g==",
+      "requires": {
+        "@types/long": "^4.0.1",
+        "lodash.camelcase": "^4.3.0",
+        "long": "^4.0.0",
+        "protobufjs": "^6.11.3",
+        "yargs": "^16.2.0"
       }
     },
     "@jsdevtools/ono": {
@@ -9246,13 +9214,6 @@
       "integrity": "sha512-MC0jISvzymxePDVembypNefkAQp+DRP7dBE+zNUPaIjEspIlYg0++OrsNr248V9tPbz6iqtZ7rX1hxWA5B8qBQ==",
       "requires": {
         "node-forge": "^1.0.0"
-      },
-      "dependencies": {
-        "node-forge": {
-          "version": "1.3.1",
-          "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-          "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
-        }
       }
     },
     "got": {
@@ -9402,9 +9363,9 @@
       }
     },
     "https-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "requires": {
         "agent-base": "6",
         "debug": "4"
@@ -10434,6 +10395,11 @@
         "whatwg-url": "^5.0.0"
       }
     },
+    "node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA=="
+    },
     "node-gyp": {
       "version": "9.1.0",
       "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.1.0.tgz",

package/package.json

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