firebase-functions 3.15.3 → 3.15.7

package/lib/apps.js

@@ -103,7 +103,7 @@ exports.apps = apps;
             this._emulatedAdminApp = app;
         }
         get firebaseArgs() {
-            return _.assign({}, config_1.firebaseConfig(), {
+            return _.assign({}, (0, config_1.firebaseConfig)(), {
                 credential: firebase.credential.applicationDefault(),
             });
         }

package/lib/cloud-functions.d.ts

@@ -185,7 +185,9 @@ export interface TriggerAnnotated {
             service: string;
         };
         failurePolicy?: FailurePolicy;
-        httpsTrigger?: {};
+        httpsTrigger?: {
+            invoker?: string[];
+        };
         labels?: {
             [key: string]: string;
         };
@@ -196,7 +198,6 @@ export interface TriggerAnnotated {
         vpcConnectorEgressSettings?: string;
         serviceAccountEmail?: string;
         ingressSettings?: string;
-        invoker?: string[];
     };
 }
 /**

package/lib/cloud-functions.js

@@ -135,7 +135,7 @@ function makeCloudFunction({ after = () => { }, before = () => { }, contextOnlyH
             promise = handler(dataOrChange, context);
         }
         if (typeof promise === 'undefined') {
-            logger_1.warn('Function returned undefined, expected Promise or value');
+            (0, logger_1.warn)('Function returned undefined, expected Promise or value');
         }
         return Promise.resolve(promise)
             .then((result) => {
@@ -216,8 +216,8 @@ function _detectAuthType(event) {
 /** @hidden */
 function optionsToTrigger(options) {
     const trigger = {};
-    encoding_1.copyIfPresent(trigger, options, 'regions', 'schedule', 'minInstances', 'maxInstances', 'ingressSettings', 'vpcConnectorEgressSettings', 'vpcConnector', 'labels');
-    encoding_1.convertIfPresent(trigger, options, 'failurePolicy', 'failurePolicy', (policy) => {
+    (0, encoding_1.copyIfPresent)(trigger, options, 'regions', 'schedule', 'minInstances', 'maxInstances', 'ingressSettings', 'vpcConnectorEgressSettings', 'vpcConnector', 'labels');
+    (0, encoding_1.convertIfPresent)(trigger, options, 'failurePolicy', 'failurePolicy', (policy) => {
         if (policy === false) {
             return undefined;
         }
@@ -228,8 +228,8 @@ function optionsToTrigger(options) {
             return policy;
         }
     });
-    encoding_1.convertIfPresent(trigger, options, 'timeout', 'timeoutSeconds', encoding_1.durationFromSeconds);
-    encoding_1.convertIfPresent(trigger, options, 'availableMemoryMb', 'memory', (mem) => {
+    (0, encoding_1.convertIfPresent)(trigger, options, 'timeout', 'timeoutSeconds', encoding_1.durationFromSeconds);
+    (0, encoding_1.convertIfPresent)(trigger, options, 'availableMemoryMb', 'memory', (mem) => {
         const memoryLookup = {
             '128MB': 128,
             '256MB': 256,
@@ -241,8 +241,7 @@ function optionsToTrigger(options) {
         };
         return memoryLookup[mem];
     });
-    encoding_1.convertIfPresent(trigger, options, 'serviceAccountEmail', 'serviceAccount', encoding_1.serviceAccountFromShorthand);
-    encoding_1.convertIfPresent(trigger, options, 'invoker', 'invoker', encoding_1.convertInvoker);
+    (0, encoding_1.convertIfPresent)(trigger, options, 'serviceAccountEmail', 'serviceAccount', encoding_1.serviceAccountFromShorthand);
     return trigger;
 }
 exports.optionsToTrigger = optionsToTrigger;

package/lib/common/encoding.js

@@ -52,9 +52,15 @@ function convertInvoker(invoker) {
     if (typeof invoker === 'string') {
         invoker = [invoker];
     }
+    if (invoker.length === 0) {
+        throw new Error('Invalid option for invoker: Must be a non-empty array.');
+    }
+    if (invoker.find((inv) => inv.length === 0)) {
+        throw new Error('Invalid option for invoker: Must be a non-empty string.');
+    }
     if (invoker.length > 1 &&
         invoker.find((inv) => inv === 'public' || inv === 'private')) {
-        throw new Error("Invalid option for invoker. Cannot have 'public' or 'private' in an array of service accounts");
+        throw new Error("Invalid option for invoker: Cannot have 'public' or 'private' in an array of service accounts.");
     }
     return invoker;
 }

package/lib/common/providers/https.js

@@ -224,10 +224,10 @@ async function checkTokens(req, ctx) {
     if (appCheck) {
         verifications.app = 'INVALID';
         try {
-            if (!apps_1.apps().admin.appCheck) {
+            if (!(0, apps_1.apps)().admin.appCheck) {
                 throw new Error('Cannot validate AppCheck token. Please update Firebase Admin SDK to >= v9.8.0');
             }
-            const appCheckToken = await apps_1.apps()
+            const appCheckToken = await (0, apps_1.apps)()
                 .admin.appCheck()
                 .verifyToken(appCheck);
             ctx.app = {
@@ -247,7 +247,7 @@ async function checkTokens(req, ctx) {
         if (match) {
             const idToken = match[1];
             try {
-                const authToken = await apps_1.apps()
+                const authToken = await (0, apps_1.apps)()
                     .admin.auth()
                     .verifyIdToken(idToken);
                 verifications.auth = 'VALID';

package/lib/function-configuration.d.ts

@@ -68,7 +68,6 @@ export interface RuntimeOptions {
      * Min number of actual instances to be running at a given time.
      * Instances will be billed for memory allocation and 10% of CPU allocation
      * while idle.
-     * @hidden
      */
     minInstances?: number;
     /**

package/lib/handler-builder.js

@@ -111,12 +111,12 @@ class HandlerBuilder {
             get instance() {
                 return {
                     get ref() {
-                        return new database.RefBuilder(apps_1.apps(), () => null, {});
+                        return new database.RefBuilder((0, apps_1.apps)(), () => null, {});
                     },
                 };
             },
             get ref() {
-                return new database.RefBuilder(apps_1.apps(), () => null, {});
+                return new database.RefBuilder((0, apps_1.apps)(), () => null, {});
             },
         };
     }

package/lib/index.js

@@ -64,4 +64,4 @@ __exportStar(require("./cloud-functions"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./function-builder"), exports);
 __exportStar(require("./function-configuration"), exports);
-setup_1.setup();
+(0, setup_1.setup)();

package/lib/logger/compat.js

@@ -6,7 +6,7 @@ const common_1 = require("./common");
 function patchedConsole(severity) {
     return function (data, ...args) {
         if (common_1.SUPPORTS_STRUCTURED_LOGS) {
-            common_1.UNPATCHED_CONSOLE[common_1.CONSOLE_SEVERITY[severity]](JSON.stringify({ severity, message: util_1.format(data, ...args) }));
+            common_1.UNPATCHED_CONSOLE[common_1.CONSOLE_SEVERITY[severity]](JSON.stringify({ severity, message: (0, util_1.format)(data, ...args) }));
             return;
         }
         common_1.UNPATCHED_CONSOLE[common_1.CONSOLE_SEVERITY[severity]](data, ...args);

package/lib/providers/analytics.js

@@ -73,7 +73,7 @@ class AnalyticsEventBuilder {
         const dataConstructor = (raw) => {
             return new AnalyticsEvent(raw.data);
         };
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             eventType: 'event.log',

package/lib/providers/auth.js

@@ -78,7 +78,7 @@ class UserBuilder {
         return this.onOperation(handler, 'user.delete');
     }
     onOperation(handler, eventType) {
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             eventType,

package/lib/providers/database.js

@@ -104,20 +104,20 @@ class InstanceBuilder {
      * @return Firebase Realtime Database reference builder interface.
      */
     ref(path) {
-        const normalized = path_1.normalizePath(path);
-        return new RefBuilder(apps_1.apps(), () => `projects/_/instances/${this.instance}/refs/${normalized}`, this.options);
+        const normalized = (0, path_1.normalizePath)(path);
+        return new RefBuilder((0, apps_1.apps)(), () => `projects/_/instances/${this.instance}/refs/${normalized}`, this.options);
     }
 }
 exports.InstanceBuilder = InstanceBuilder;
 /** @hidden */
 function _refWithOptions(path, options) {
     const resourceGetter = () => {
-        const normalized = path_1.normalizePath(path);
-        const databaseURL = config_1.firebaseConfig().databaseURL;
+        const normalized = (0, path_1.normalizePath)(path);
+        const databaseURL = (0, config_1.firebaseConfig)().databaseURL;
         if (!databaseURL) {
             throw new Error('Missing expected firebase config value databaseURL, ' +
                 'config is actually' +
-                JSON.stringify(config_1.firebaseConfig()) +
+                JSON.stringify((0, config_1.firebaseConfig)()) +
                 '\n If you are unit testing, please set process.env.FIREBASE_CONFIG');
         }
         let instance;
@@ -136,7 +136,7 @@ function _refWithOptions(path, options) {
         }
         return `projects/_/instances/${instance}/refs/${normalized}`;
     };
-    return new RefBuilder(apps_1.apps(), resourceGetter, options);
+    return new RefBuilder((0, apps_1.apps)(), resourceGetter, options);
 }
 exports._refWithOptions = _refWithOptions;
 /**
@@ -153,7 +153,7 @@ class RefBuilder {
         this.changeConstructor = (raw) => {
             const [dbInstance, path] = extractInstanceAndPath(raw.context.resource.name, raw.context.domain);
             const before = new DataSnapshot(raw.data.data, path, this.apps.admin, dbInstance);
-            const after = new DataSnapshot(utils_1.applyChange(raw.data.data, raw.data.delta), path, this.apps.admin, dbInstance);
+            const after = new DataSnapshot((0, utils_1.applyChange)(raw.data.data, raw.data.delta), path, this.apps.admin, dbInstance);
             return {
                 before,
                 after,
@@ -214,7 +214,7 @@ class RefBuilder {
         return this.onOperation(handler, 'ref.delete', dataConstructor);
     }
     onOperation(handler, eventType, dataConstructor) {
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             service: exports.service,
@@ -310,7 +310,7 @@ class DataSnapshot {
      * However, accessing the key on the root URL of a Database will return `null`.
      */
     get key() {
-        const last = _.last(path_1.pathParts(this._fullPath()));
+        const last = _.last((0, path_1.pathParts)(this._fullPath()));
         return !last || last === '' ? null : last;
     }
     /**
@@ -325,7 +325,7 @@ class DataSnapshot {
      *   Array, string, number, boolean, or `null`).
      */
     val() {
-        const parts = path_1.pathParts(this._childPath);
+        const parts = (0, path_1.pathParts)(this._childPath);
         const source = this._data;
         const node = _.cloneDeep(parts.length ? _.get(source, parts, null) : source);
         return this._checkAndConvertToArray(node);
@@ -493,7 +493,7 @@ class DataSnapshot {
         const dup = new DataSnapshot(this._data, undefined, this.app, this.instance);
         [dup._path, dup._childPath] = [this._path, this._childPath];
         if (childPath) {
-            dup._childPath = path_1.joinPath(dup._childPath, childPath);
+            dup._childPath = (0, path_1.joinPath)(dup._childPath, childPath);
         }
         return dup;
     }

package/lib/providers/firestore.js

@@ -113,8 +113,8 @@ function _getValueProto(data, resource, valueFieldName) {
     }
     const proto = {
         fields: _.get(data, [valueFieldName, 'fields'], {}),
-        createTime: encoder_1.dateToTimestampProto(_.get(data, [valueFieldName, 'createTime'])),
-        updateTime: encoder_1.dateToTimestampProto(_.get(data, [valueFieldName, 'updateTime'])),
+        createTime: (0, encoder_1.dateToTimestampProto)(_.get(data, [valueFieldName, 'createTime'])),
+        updateTime: (0, encoder_1.dateToTimestampProto)(_.get(data, [valueFieldName, 'updateTime'])),
         name: _.get(data, [valueFieldName, 'name'], resource),
     };
     return proto;
@@ -123,7 +123,7 @@ function _getValueProto(data, resource, valueFieldName) {
 function snapshotConstructor(event) {
     var _a;
     if (!firestoreInstance) {
-        firestoreInstance = firebase.firestore(apps_1.apps().admin);
+        firestoreInstance = firebase.firestore((0, apps_1.apps)().admin);
     }
     const valueProto = _getValueProto(event.data, event.context.resource.name, 'value');
     let timeString = (_a = _.get(event, 'data.value.readTime')) !== null && _a !== void 0 ? _a : _.get(event, 'data.value.updateTime');
@@ -131,7 +131,7 @@ function snapshotConstructor(event) {
         logger.warn('Snapshot has no readTime. Using now()');
         timeString = new Date().toISOString();
     }
-    const readTime = encoder_1.dateToTimestampProto(timeString);
+    const readTime = (0, encoder_1.dateToTimestampProto)(timeString);
     return firestoreInstance.snapshot_(valueProto, readTime, 'json');
 }
 exports.snapshotConstructor = snapshotConstructor;
@@ -139,10 +139,10 @@ exports.snapshotConstructor = snapshotConstructor;
 // TODO remove this function when wire format changes to new format
 function beforeSnapshotConstructor(event) {
     if (!firestoreInstance) {
-        firestoreInstance = firebase.firestore(apps_1.apps().admin);
+        firestoreInstance = firebase.firestore((0, apps_1.apps)().admin);
     }
     const oldValueProto = _getValueProto(event.data, event.context.resource.name, 'oldValue');
-    const oldReadTime = encoder_1.dateToTimestampProto(_.get(event, 'data.oldValue.readTime'));
+    const oldReadTime = (0, encoder_1.dateToTimestampProto)(_.get(event, 'data.oldValue.readTime'));
     return firestoreInstance.snapshot_(oldValueProto, oldReadTime, 'json');
 }
 exports.beforeSnapshotConstructor = beforeSnapshotConstructor;
@@ -173,7 +173,7 @@ class DocumentBuilder {
         return this.onOperation(handler, 'document.delete', beforeSnapshotConstructor);
     }
     onOperation(handler, eventType, dataConstructor) {
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             eventType,

package/lib/providers/https.js

@@ -23,6 +23,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._onCallWithOptions = exports._onRequestWithOptions = exports.onCall = exports.onRequest = exports.HttpsError = void 0;
 const cloud_functions_1 = require("../cloud-functions");
+const encoding_1 = require("../common/encoding");
 const https_1 = require("../common/providers/https");
 Object.defineProperty(exports, "HttpsError", { enumerable: true, get: function () { return https_1.HttpsError; } });
 /**
@@ -49,19 +50,24 @@ function _onRequestWithOptions(handler, options) {
         return handler(req, res);
     };
     cloudFunction.__trigger = {
-        ...cloud_functions_1.optionsToTrigger(options),
+        ...(0, cloud_functions_1.optionsToTrigger)(options),
         httpsTrigger: {},
     };
+    (0, encoding_1.convertIfPresent)(cloudFunction.__trigger.httpsTrigger, options, 'invoker', 'invoker', encoding_1.convertInvoker);
     // TODO parse the options
     return cloudFunction;
 }
 exports._onRequestWithOptions = _onRequestWithOptions;
 /** @hidden */
 function _onCallWithOptions(handler, options) {
-    const func = https_1.onCallHandler({ origin: true, methods: 'POST' }, handler);
+    // onCallHandler sniffs the function length of the passed-in callback
+    // and the user could have only tried to listen to data. Wrap their handler
+    // in another handler to avoid accidentally triggering the v2 API
+    const fixedLen = (data, context) => handler(data, context);
+    const func = (0, https_1.onCallHandler)({ origin: true, methods: 'POST' }, fixedLen);
     func.__trigger = {
         labels: {},
-        ...cloud_functions_1.optionsToTrigger(options),
+        ...(0, cloud_functions_1.optionsToTrigger)(options),
         httpsTrigger: {},
     };
     func.__trigger.labels['deployment-callable'] = 'true';

package/lib/providers/pubsub.js

@@ -71,7 +71,7 @@ class TopicBuilder {
      * @return A Cloud Function that you can export and deploy.
      */
     onPublish(handler) {
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             service: exports.service,
@@ -140,7 +140,7 @@ class ScheduleBuilder {
      * @return A Cloud Function that you can export and deploy.
      */
     onRun(handler) {
-        const cloudFunction = cloud_functions_1.makeCloudFunction({
+        const cloudFunction = (0, cloud_functions_1.makeCloudFunction)({
             contextOnlyHandler: handler,
             provider: exports.provider,
             service: exports.service,

package/lib/providers/remoteConfig.js

@@ -65,7 +65,7 @@ class UpdateBuilder {
      * version metadata as an argument.
      */
     onUpdate(handler) {
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             service: exports.service,

package/lib/providers/storage.js

@@ -53,7 +53,7 @@ exports.object = object;
 /** @hidden */
 function _bucketWithOptions(options, bucket) {
     const resourceGetter = () => {
-        bucket = bucket || config_1.firebaseConfig().storageBucket;
+        bucket = bucket || (0, config_1.firebaseConfig)().storageBucket;
         if (!bucket) {
             throw new Error('Missing bucket name. If you are unit testing, please provide a bucket name' +
                 ' through `functions.storage.bucket(bucketName)`, or set process.env.FIREBASE_CONFIG.');
@@ -170,7 +170,7 @@ class ObjectBuilder {
     }
     /** @hidden */
     onOperation(handler, eventType) {
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             handler,
             provider: exports.provider,
             service: exports.service,

package/lib/providers/testLab.js

@@ -57,7 +57,7 @@ class TestMatrixBuilder {
         const dataConstructor = (raw) => {
             return new TestMatrix(raw.data);
         };
-        return cloud_functions_1.makeCloudFunction({
+        return (0, cloud_functions_1.makeCloudFunction)({
             provider: exports.PROVIDER,
             eventType: exports.TEST_MATRIX_COMPLETE_EVENT_TYPE,
             triggerResource: this.triggerResource,

package/lib/setup.js

@@ -31,7 +31,7 @@ function setup() {
     // Until the Cloud Functions builder can publish FIREBASE_CONFIG, automatically provide it on import based on what
     // we can deduce.
     if (!process.env.FIREBASE_CONFIG) {
-        const cfg = config_1.firebaseConfig();
+        const cfg = (0, config_1.firebaseConfig)();
         if (cfg) {
             process.env.FIREBASE_CONFIG = JSON.stringify(cfg);
         }
@@ -43,7 +43,7 @@ function setup() {
     // If FIREBASE_CONFIG is still not found, try using GCLOUD_PROJECT to estimate
     if (!process.env.FIREBASE_CONFIG) {
         if (process.env.GCLOUD_PROJECT) {
-            logger_1.warn('Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail');
+            (0, logger_1.warn)('Warning, estimating Firebase Config based on GCLOUD_PROJECT. Initializing firebase-admin may fail');
             process.env.FIREBASE_CONFIG = JSON.stringify({
                 databaseURL: process.env.DATABASE_URL ||
                     `https://${process.env.GCLOUD_PROJECT}.firebaseio.com`,
@@ -53,7 +53,7 @@ function setup() {
             });
         }
         else {
-            logger_1.warn('Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail');
+            (0, logger_1.warn)('Warning, FIREBASE_CONFIG and GCLOUD_PROJECT environment variables are missing. Initializing firebase-admin will fail');
         }
     }
 }

package/lib/v2/options.d.ts

@@ -2,7 +2,7 @@ import { ParamSpec } from './params/types';
 /**
  * List of all regions supported by Cloud Functions v2
  */
-export declare const SUPPORTED_REGIONS: readonly ["us-west1"];
+export declare const SUPPORTED_REGIONS: readonly ["us-west1", "europe-west4"];
 /**
  * A region known to be supported by CloudFunctions v2
  */

package/lib/v2/options.js

@@ -29,7 +29,7 @@ const params_1 = require("./params");
 /**
  * List of all regions supported by Cloud Functions v2
  */
-exports.SUPPORTED_REGIONS = ['us-west1'];
+exports.SUPPORTED_REGIONS = ['us-west1', 'europe-west4'];
 /**
  * Cloud Functions v2 min timeout value.
  */
@@ -107,22 +107,21 @@ exports.getGlobalOptions = getGlobalOptions;
  */
 function optionsToTriggerAnnotations(opts) {
     const annotation = {};
-    encoding_2.copyIfPresent(annotation, opts, 'concurrency', 'minInstances', 'maxInstances', 'ingressSettings', 'labels', 'vpcConnector', 'vpcConnectorEgressSettings');
-    encoding_2.convertIfPresent(annotation, opts, 'availableMemoryMb', 'memory', (mem) => {
+    (0, encoding_2.copyIfPresent)(annotation, opts, 'concurrency', 'minInstances', 'maxInstances', 'ingressSettings', 'labels', 'vpcConnector', 'vpcConnectorEgressSettings');
+    (0, encoding_2.convertIfPresent)(annotation, opts, 'availableMemoryMb', 'memory', (mem) => {
         return MemoryOptionToMB[mem];
     });
-    encoding_2.convertIfPresent(annotation, opts, 'regions', 'region', (region) => {
+    (0, encoding_2.convertIfPresent)(annotation, opts, 'regions', 'region', (region) => {
         if (typeof region === 'string') {
             return [region];
         }
         return region;
     });
-    encoding_2.convertIfPresent(annotation, opts, 'serviceAccountEmail', 'serviceAccount', encoding_1.serviceAccountFromShorthand);
-    encoding_2.convertIfPresent(annotation, opts, 'timeout', 'timeoutSeconds', encoding_1.durationFromSeconds);
-    encoding_2.convertIfPresent(annotation, opts, 'failurePolicy', 'retry', (retry) => {
+    (0, encoding_2.convertIfPresent)(annotation, opts, 'serviceAccountEmail', 'serviceAccount', encoding_1.serviceAccountFromShorthand);
+    (0, encoding_2.convertIfPresent)(annotation, opts, 'timeout', 'timeoutSeconds', encoding_1.durationFromSeconds);
+    (0, encoding_2.convertIfPresent)(annotation, opts, 'failurePolicy', 'retry', (retry) => {
         return retry ? { retry: true } : null;
     });
-    encoding_2.convertIfPresent(annotation, opts, 'invoker', 'invoker', encoding_1.convertInvoker);
     return annotation;
 }
 exports.optionsToTriggerAnnotations = optionsToTriggerAnnotations;

package/lib/v2/providers/https.d.ts

@@ -4,7 +4,7 @@ import * as options from '../options';
 export { Request, CallableRequest, FunctionsErrorCode, HttpsError };
 export interface HttpsOptions extends Omit<options.GlobalOptions, 'region'> {
     region?: options.SupportedRegion | string | Array<options.SupportedRegion | string>;
-    cors?: string | boolean;
+    cors?: string | boolean | RegExp | Array<string | RegExp>;
 }
 export declare type HttpsFunction = ((req: Request, res: express.Response) => void | Promise<void>) & {
     __trigger: unknown;

package/lib/v2/providers/https.js

@@ -23,6 +23,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onCall = exports.onRequest = exports.HttpsError = void 0;
 const cors = require("cors");
+const encoding_1 = require("../../common/encoding");
 const https_1 = require("../../common/providers/https");
 Object.defineProperty(exports, "HttpsError", { enumerable: true, get: function () { return https_1.HttpsError; } });
 const options = require("../options");
@@ -52,7 +53,7 @@ function onRequest(optsOrHandler, handler) {
             // global options calls region a scalar and https allows it to be an array,
             // but optionsToTriggerAnnotations handles both cases.
             const specificOpts = options.optionsToTriggerAnnotations(opts);
-            return {
+            const trigger = {
                 // TODO(inlined): Remove "apiVersion" once the latest version of the CLI
                 // has migrated to "platform".
                 apiVersion: 2,
@@ -67,6 +68,8 @@ function onRequest(optsOrHandler, handler) {
                     allowInsecure: false,
                 },
             };
+            (0, encoding_1.convertIfPresent)(trigger.httpsTrigger, opts, 'invoker', 'invoker', encoding_1.convertInvoker);
+            return trigger;
         },
     });
     return handler;
@@ -82,7 +85,10 @@ function onCall(optsOrHandler, handler) {
         opts = optsOrHandler;
     }
     const origin = 'cors' in opts ? opts.cors : true;
-    const func = https_1.onCallHandler({ origin, methods: 'POST' }, handler);
+    // onCallHandler sniffs the function length to determine which API to present.
+    // fix the length to prevent api versions from being mismatched.
+    const fixedLen = (req) => handler(req);
+    const func = (0, https_1.onCallHandler)({ origin, methods: 'POST' }, fixedLen);
     Object.defineProperty(func, '__trigger', {
         get: () => {
             const baseOpts = options.optionsToTriggerAnnotations(options.getGlobalOptions());

package/package.json

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