firebase-functions 7.2.0 → 7.2.2

package/lib/common/providers/identity.js

@@ -392,7 +392,17 @@ function wrapHandler(eventType, handler) {
 			if (!firebase_admin_auth.getAuth(require_common_app.getApp())._verifyAuthBlockingToken) {
 				throw new Error("Cannot validate Auth Blocking token. Please update Firebase Admin SDK to >= v10.1.0");
 			}
-			const decodedPayload = require_common_debug.isDebugFeatureEnabled("skipTokenVerification") ? unsafeDecodeAuthBlockingToken(req.body.data.jwt) : handler.platform === "gcfv1" ? await firebase_admin_auth.getAuth(require_common_app.getApp())._verifyAuthBlockingToken(req.body.data.jwt) : await firebase_admin_auth.getAuth(require_common_app.getApp())._verifyAuthBlockingToken(req.body.data.jwt, "run.app");
+			let decodedPayload;
+			if (require_common_debug.isDebugFeatureEnabled("skipTokenVerification")) {
+				decodedPayload = unsafeDecodeAuthBlockingToken(req.body.data.jwt);
+			} else {
+				const unverified = unsafeDecodeAuthBlockingToken(req.body.data.jwt);
+				if (handler.platform === "gcfv2" && unverified.aud && unverified.aud.includes("run.app")) {
+					decodedPayload = await firebase_admin_auth.getAuth(require_common_app.getApp())._verifyAuthBlockingToken(req.body.data.jwt, "run.app");
+				} else {
+					decodedPayload = await firebase_admin_auth.getAuth(require_common_app.getApp())._verifyAuthBlockingToken(req.body.data.jwt);
+				}
+			}
 			let authUserRecord;
 			if (decodedPayload.event_type === "beforeCreate" || decodedPayload.event_type === "beforeSignIn") {
 				authUserRecord = parseAuthUserRecord(decodedPayload.user_record);

package/lib/common/utilities/path.js

@@ -9,7 +9,7 @@ function normalizePath(path) {
 	if (!path) {
 		return "";
 	}
-	return path.replace(/^\//, "").replace(/\/$/, "");
+	return path.replace(/^\//, "").replace(/\/$/, "").replace(/\/{2,}/g, "/");
 }
 /**
 * Normalizes a given path and splits it into an array of segments.

package/lib/esm/common/providers/identity.mjs

@@ -390,7 +390,17 @@ function wrapHandler(eventType, handler) {
 			if (!auth.getAuth(getApp())._verifyAuthBlockingToken) {
 				throw new Error("Cannot validate Auth Blocking token. Please update Firebase Admin SDK to >= v10.1.0");
 			}
-			const decodedPayload = isDebugFeatureEnabled("skipTokenVerification") ? unsafeDecodeAuthBlockingToken(req.body.data.jwt) : handler.platform === "gcfv1" ? await auth.getAuth(getApp())._verifyAuthBlockingToken(req.body.data.jwt) : await auth.getAuth(getApp())._verifyAuthBlockingToken(req.body.data.jwt, "run.app");
+			let decodedPayload;
+			if (isDebugFeatureEnabled("skipTokenVerification")) {
+				decodedPayload = unsafeDecodeAuthBlockingToken(req.body.data.jwt);
+			} else {
+				const unverified = unsafeDecodeAuthBlockingToken(req.body.data.jwt);
+				if (handler.platform === "gcfv2" && unverified.aud && unverified.aud.includes("run.app")) {
+					decodedPayload = await auth.getAuth(getApp())._verifyAuthBlockingToken(req.body.data.jwt, "run.app");
+				} else {
+					decodedPayload = await auth.getAuth(getApp())._verifyAuthBlockingToken(req.body.data.jwt);
+				}
+			}
 			let authUserRecord;
 			if (decodedPayload.event_type === "beforeCreate" || decodedPayload.event_type === "beforeSignIn") {
 				authUserRecord = parseAuthUserRecord(decodedPayload.user_record);

package/lib/esm/common/utilities/path.mjs

@@ -8,7 +8,7 @@ function normalizePath(path) {
 	if (!path) {
 		return "";
 	}
-	return path.replace(/^\//, "").replace(/\/$/, "");
+	return path.replace(/^\//, "").replace(/\/$/, "").replace(/\/{2,}/g, "/");
 }
 /**
 * Normalizes a given path and splits it into an array of segments.

package/lib/esm/params/types.mjs

@@ -29,7 +29,7 @@ var Expression = class {
 		throw new Error("Not implemented");
 	}
 	/** Returns the expression's representation as a braced CEL expression. */
-	toCEL() {
+	toCEL(_transform = (a) => a) {
 		return `{{ ${this.toString()} }}`;
 	}
 	/** Returns the expression's representation as JSON. */
@@ -54,11 +54,30 @@ var InterpolationExpression = class extends Expression {
 			return result + str + val;
 		}, "");
 	}
-	toCEL() {
-		return this.strings.reduce((result, str, i) => {
-			const val = i < this.values.length ? celOf(this.values[i]) : "";
-			return result + str + val;
+	toCEL(transform$1 = (a) => a) {
+		const exprPlaceholders = [];
+		const PLACEHOLDER_PREFIX = "🤿🤿🤿🐙🐙🐙";
+		const PLACEHOLDER_SUFFIX = "🐙🐙🐙🤿🤿🤿";
+		const rawString = this.strings.reduce((result, str, i) => {
+			if (i >= this.values.length) {
+				return result + str;
+			}
+			const val = this.values[i];
+			let valStr;
+			if (val instanceof Expression) {
+				valStr = `${PLACEHOLDER_PREFIX}${exprPlaceholders.length}${PLACEHOLDER_SUFFIX}`;
+				exprPlaceholders.push(val.toCEL());
+			} else {
+				valStr = String(val);
+			}
+			return result + str + valStr;
 		}, "");
+		let transformed = transform$1(rawString);
+		for (let i = 0; i < exprPlaceholders.length; i++) {
+			const placeholder = `${PLACEHOLDER_PREFIX}${i}${PLACEHOLDER_SUFFIX}`;
+			transformed = transformed.split(placeholder).join(exprPlaceholders[i]);
+		}
+		return transformed;
 	}
 };
 /** @internal */
@@ -72,7 +91,7 @@ var TransformedStringExpression = class extends Expression {
 		return this.transformer(valueOf(this.source));
 	}
 	toCEL() {
-		return this.source instanceof Expression ? this.source.toCEL() : this.transformer(this.source);
+		return this.source instanceof Expression ? this.source.toCEL(this.transformer) : this.transformer(this.source);
 	}
 };
 function valueOf(arg) {

package/lib/esm/v1/providers/firestore.mjs

@@ -1,8 +1,9 @@
 import { __export } from "../../_virtual/rolldown_runtime.mjs";
-import { CompareExpression, Expression } from "../../params/types.mjs";
+import { CompareExpression, Expression, transform } from "../../params/types.mjs";
 import { expr, projectID } from "../../params/index.mjs";
 import { Change } from "../../common/change.mjs";
 import { makeCloudFunction } from "../cloud-functions.mjs";
+import { normalizePath } from "../../common/utilities/path.mjs";
 import { createBeforeSnapshotFromJson, createSnapshotFromJson } from "../../common/providers/firestore.mjs";
 
 //#region src/v1/providers/firestore.ts
@@ -75,6 +76,7 @@ var NamespaceBuilder = class {
 		this.namespace = namespace$1;
 	}
 	document(path) {
+		const normalized = transform(path, normalizePath);
 		const triggerResource = () => {
 			if (!process.env.GCLOUD_PROJECT) {
 				throw new Error("process.env.GCLOUD_PROJECT is not set.");
@@ -89,7 +91,7 @@ var NamespaceBuilder = class {
 			} else if (this.namespace) {
 				nsPart = `@${this.namespace}`;
 			}
-			return expr`projects/${project}/databases/${this.database}/documents${nsPart}/${path}`;
+			return expr`projects/${project}/databases/${this.database}/documents${nsPart}/${normalized}`;
 		};
 		return new DocumentBuilder(triggerResource, this.options);
 	}

package/lib/esm/v2/dataconnect.doc.mjs

@@ -0,0 +1,13 @@
+import { __export } from "../_virtual/rolldown_runtime.mjs";
+import { mutationExecutedEventType, onMutationExecuted } from "./providers/dataconnect/index.mjs";
+import { graphql_exports } from "./providers/dataconnect/graphql.mjs";
+
+//#region src/v2/dataconnect.doc.ts
+var dataconnect_doc_exports = /* @__PURE__ */ __export({
+	graphql: () => graphql_exports,
+	mutationExecutedEventType: () => mutationExecutedEventType,
+	onMutationExecuted: () => onMutationExecuted
+});
+
+//#endregion
+export { dataconnect_doc_exports, graphql_exports as graphql, mutationExecutedEventType, onMutationExecuted };

package/lib/esm/v2/index.doc.mjs

@@ -6,6 +6,7 @@ import { onInit } from "../common/onInit.mjs";
 import { config } from "../v1/config.mjs";
 import { setGlobalOptions } from "./options.mjs";
 import { pubsub_exports } from "./providers/pubsub.mjs";
+import { dataconnect_doc_exports } from "./dataconnect.doc.mjs";
 import { alerts_exports } from "./providers/alerts/index.mjs";
 import { database_exports } from "./providers/database.mjs";
 import { eventarc_exports } from "./providers/eventarc.mjs";
@@ -17,8 +18,6 @@ import { tasks_exports } from "./providers/tasks.mjs";
 import { remoteConfig_exports } from "./providers/remoteConfig.mjs";
 import { testLab_exports } from "./providers/testLab.mjs";
 import { firestore_exports } from "./providers/firestore.mjs";
-import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 import { app } from "./index.mjs";
-import { graphql_exports } from "./providers/dataconnect/graphql.mjs";
 
-export { Change, alerts_exports as alerts, app, config, database_exports as database, dataconnect_exports as dataconnect, eventarc_exports as eventarc, firestore_exports as firestore, graphql_exports as graphql, https_exports as https, identity_exports as identity, logger, onInit, params_exports as params, pubsub_exports as pubsub, remoteConfig_exports as remoteConfig, scheduler_exports as scheduler, setGlobalOptions, storage_exports as storage, tasks_exports as tasks, testLab_exports as testLab, traceContext };
+export { Change, alerts_exports as alerts, app, config, database_exports as database, dataconnect_doc_exports as dataconnect, eventarc_exports as eventarc, firestore_exports as firestore, https_exports as https, identity_exports as identity, logger, onInit, params_exports as params, pubsub_exports as pubsub, remoteConfig_exports as remoteConfig, scheduler_exports as scheduler, setGlobalOptions, storage_exports as storage, tasks_exports as tasks, testLab_exports as testLab, traceContext };

package/lib/esm/v2/index.mjs

@@ -8,6 +8,7 @@ import { config } from "../v1/config.mjs";
 import { setGlobalOptions } from "./options.mjs";
 import { pubsub_exports } from "./providers/pubsub.mjs";
 import "./core.mjs";
+import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 import { alerts_exports } from "./providers/alerts/index.mjs";
 import { database_exports } from "./providers/database.mjs";
 import { eventarc_exports } from "./providers/eventarc.mjs";
@@ -19,7 +20,6 @@ import { tasks_exports } from "./providers/tasks.mjs";
 import { remoteConfig_exports } from "./providers/remoteConfig.mjs";
 import { testLab_exports } from "./providers/testLab.mjs";
 import { firestore_exports } from "./providers/firestore.mjs";
-import { dataconnect_exports } from "./providers/dataconnect/index.mjs";
 
 //#region src/v2/index.ts
 const app = { setEmulatedAdminApp: setApp };

package/lib/params/types.d.ts

@@ -11,7 +11,7 @@ export declare abstract class Expression<T extends string | number | boolean | s
     /** Returns the expression's runtime value, based on the CLI's resolution of parameters. */
     value(): T;
     /** Returns the expression's representation as a braced CEL expression. */
-    toCEL(): string;
+    toCEL(_transform?: (val: string) => string): string;
     /** Returns the expression's representation as JSON. */
     toJSON(): string;
 }
@@ -23,7 +23,7 @@ export declare class InterpolationExpression extends Expression<string> {
     private strings;
     private values;
     constructor(strings: TemplateStringsArray, values: (string | Expression<any>)[]);
-    toCEL(): string;
+    toCEL(transform?: (val: string) => string): string;
 }
 export declare function valueOf<T extends string | number | boolean | string[]>(arg: T | Expression<T>): T;
 export declare function celOf<T extends string | number | boolean | string[]>(arg: T | Expression<T>): T | string;

package/lib/params/types.js

@@ -29,7 +29,7 @@ var Expression = class {
 		throw new Error("Not implemented");
 	}
 	/** Returns the expression's representation as a braced CEL expression. */
-	toCEL() {
+	toCEL(_transform = (a) => a) {
 		return `{{ ${this.toString()} }}`;
 	}
 	/** Returns the expression's representation as JSON. */
@@ -54,11 +54,30 @@ var InterpolationExpression = class extends Expression {
 			return result + str + val;
 		}, "");
 	}
-	toCEL() {
-		return this.strings.reduce((result, str, i) => {
-			const val = i < this.values.length ? celOf(this.values[i]) : "";
-			return result + str + val;
+	toCEL(transform$1 = (a) => a) {
+		const exprPlaceholders = [];
+		const PLACEHOLDER_PREFIX = "🤿🤿🤿🐙🐙🐙";
+		const PLACEHOLDER_SUFFIX = "🐙🐙🐙🤿🤿🤿";
+		const rawString = this.strings.reduce((result, str, i) => {
+			if (i >= this.values.length) {
+				return result + str;
+			}
+			const val = this.values[i];
+			let valStr;
+			if (val instanceof Expression) {
+				valStr = `${PLACEHOLDER_PREFIX}${exprPlaceholders.length}${PLACEHOLDER_SUFFIX}`;
+				exprPlaceholders.push(val.toCEL());
+			} else {
+				valStr = String(val);
+			}
+			return result + str + valStr;
 		}, "");
+		let transformed = transform$1(rawString);
+		for (let i = 0; i < exprPlaceholders.length; i++) {
+			const placeholder = `${PLACEHOLDER_PREFIX}${i}${PLACEHOLDER_SUFFIX}`;
+			transformed = transformed.split(placeholder).join(exprPlaceholders[i]);
+		}
+		return transformed;
 	}
 };
 /** @internal */
@@ -72,7 +91,7 @@ var TransformedStringExpression = class extends Expression {
 		return this.transformer(valueOf(this.source));
 	}
 	toCEL() {
-		return this.source instanceof Expression ? this.source.toCEL() : this.transformer(this.source);
+		return this.source instanceof Expression ? this.source.toCEL(this.transformer) : this.transformer(this.source);
 	}
 };
 function valueOf(arg) {

package/lib/v1/providers/firestore.js

@@ -3,6 +3,7 @@ const require_params_types = require('../../params/types.js');
 const require_params_index = require('../../params/index.js');
 const require_common_change = require('../../common/change.js');
 const require_v1_cloud_functions = require('../cloud-functions.js');
+const require_common_utilities_path = require('../../common/utilities/path.js');
 const require_common_providers_firestore = require('../../common/providers/firestore.js');
 
 //#region src/v1/providers/firestore.ts
@@ -75,6 +76,7 @@ var NamespaceBuilder = class {
 		this.namespace = namespace$1;
 	}
 	document(path) {
+		const normalized = require_params_types.transform(path, require_common_utilities_path.normalizePath);
 		const triggerResource = () => {
 			if (!process.env.GCLOUD_PROJECT) {
 				throw new Error("process.env.GCLOUD_PROJECT is not set.");
@@ -89,7 +91,7 @@ var NamespaceBuilder = class {
 			} else if (this.namespace) {
 				nsPart = `@${this.namespace}`;
 			}
-			return require_params_index.expr`projects/${project}/databases/${this.database}/documents${nsPart}/${path}`;
+			return require_params_index.expr`projects/${project}/databases/${this.database}/documents${nsPart}/${normalized}`;
 		};
 		return new DocumentBuilder(triggerResource, this.options);
 	}

package/lib/v2/dataconnect.doc.d.ts

@@ -0,0 +1,2 @@
+export * from "./providers/dataconnect";
+export * as graphql from "./providers/dataconnect/graphql";

package/lib/v2/dataconnect.doc.js

@@ -0,0 +1,26 @@
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.js');
+const require_v2_providers_dataconnect_index = require('./providers/dataconnect/index.js');
+const require_v2_providers_dataconnect_graphql = require('./providers/dataconnect/graphql.js');
+
+//#region src/v2/dataconnect.doc.ts
+var dataconnect_doc_exports = /* @__PURE__ */ require_rolldown_runtime.__export({
+	graphql: () => require_v2_providers_dataconnect_graphql.graphql_exports,
+	mutationExecutedEventType: () => require_v2_providers_dataconnect_index.mutationExecutedEventType,
+	onMutationExecuted: () => require_v2_providers_dataconnect_index.onMutationExecuted
+});
+
+//#endregion
+Object.defineProperty(exports, 'dataconnect_doc_exports', {
+  enumerable: true,
+  get: function () {
+    return dataconnect_doc_exports;
+  }
+});
+Object.defineProperty(exports, 'graphql', {
+  enumerable: true,
+  get: function () {
+    return require_v2_providers_dataconnect_graphql.graphql_exports;
+  }
+});
+exports.mutationExecutedEventType = require_v2_providers_dataconnect_index.mutationExecutedEventType;
+exports.onMutationExecuted = require_v2_providers_dataconnect_index.onMutationExecuted;

package/lib/v2/index.doc.d.ts

@@ -1 +1,15 @@
-export * as graphql from "./providers/dataconnect/graphql";
+/**
+ * @internal
+ * Documentation-only entry point. This file is not part of the public API
+ * and is used only by api-extractor to generate reference documentation.
+ * It includes exports that are not part of the main `index.ts` entry point
+ * to avoid forcing optional peer dependencies on all users.
+ *
+ * DO NOT use for runtime imports.
+ * The 2nd gen API for Cloud Functions for Firebase.
+ * This SDK supports deep imports. For example, the namespace
+ * `pubsub` is available at `firebase-functions/v2` or is directly importable
+ * from `firebase-functions/v2/pubsub`.
+ * @packageDocumentation
+ */
+export * as dataconnect from "./dataconnect.doc";

package/lib/v2/index.doc.js

@@ -6,6 +6,7 @@ const require_common_onInit = require('../common/onInit.js');
 const require_v1_config = require('../v1/config.js');
 const require_v2_options = require('./options.js');
 const require_v2_providers_pubsub = require('./providers/pubsub.js');
+const require_v2_dataconnect_doc = require('./dataconnect.doc.js');
 const require_v2_providers_alerts_index = require('./providers/alerts/index.js');
 const require_v2_providers_database = require('./providers/database.js');
 const require_v2_providers_eventarc = require('./providers/eventarc.js');
@@ -17,9 +18,7 @@ const require_v2_providers_tasks = require('./providers/tasks.js');
 const require_v2_providers_remoteConfig = require('./providers/remoteConfig.js');
 const require_v2_providers_testLab = require('./providers/testLab.js');
 const require_v2_providers_firestore = require('./providers/firestore.js');
-const require_v2_providers_dataconnect_index = require('./providers/dataconnect/index.js');
 const require_v2_index = require('./index.js');
-const require_v2_providers_dataconnect_graphql = require('./providers/dataconnect/graphql.js');
 
 exports.Change = require_common_change.Change;
 Object.defineProperty(exports, 'alerts', {
@@ -39,7 +38,7 @@ Object.defineProperty(exports, 'database', {
 Object.defineProperty(exports, 'dataconnect', {
   enumerable: true,
   get: function () {
-    return require_v2_providers_dataconnect_index.dataconnect_exports;
+    return require_v2_dataconnect_doc.dataconnect_doc_exports;
   }
 });
 Object.defineProperty(exports, 'eventarc', {
@@ -54,12 +53,6 @@ Object.defineProperty(exports, 'firestore', {
     return require_v2_providers_firestore.firestore_exports;
   }
 });
-Object.defineProperty(exports, 'graphql', {
-  enumerable: true,
-  get: function () {
-    return require_v2_providers_dataconnect_graphql.graphql_exports;
-  }
-});
 Object.defineProperty(exports, 'https', {
   enumerable: true,
   get: function () {

package/lib/v2/index.js

@@ -8,6 +8,7 @@ const require_v1_config = require('../v1/config.js');
 const require_v2_options = require('./options.js');
 const require_v2_providers_pubsub = require('./providers/pubsub.js');
 require('./core.js');
+const require_v2_providers_dataconnect_index = require('./providers/dataconnect/index.js');
 const require_v2_providers_alerts_index = require('./providers/alerts/index.js');
 const require_v2_providers_database = require('./providers/database.js');
 const require_v2_providers_eventarc = require('./providers/eventarc.js');
@@ -19,7 +20,6 @@ const require_v2_providers_tasks = require('./providers/tasks.js');
 const require_v2_providers_remoteConfig = require('./providers/remoteConfig.js');
 const require_v2_providers_testLab = require('./providers/testLab.js');
 const require_v2_providers_firestore = require('./providers/firestore.js');
-const require_v2_providers_dataconnect_index = require('./providers/dataconnect/index.js');
 
 //#region src/v2/index.ts
 const app = { setEmulatedAdminApp: require_common_app.setApp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-functions",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "description": "Firebase SDK for Cloud Functions",
   "keywords": [
     "firebase",