firebase-tools 9.22.0 → 9.23.3

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

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serviceForEndpoint = exports.EVENT_SERVICE_MAPPING = exports.StorageService = exports.PubSubService = exports.NoOpService = void 0;
+const backend = require("../backend");
+const storage_1 = require("./storage");
+const noop = () => Promise.resolve();
+exports.NoOpService = {
+    name: "noop",
+    api: "",
+    requiredProjectBindings: undefined,
+    ensureTriggerRegion: noop,
+};
+exports.PubSubService = {
+    name: "pubsub",
+    api: "pubsub.googleapis.com",
+    requiredProjectBindings: undefined,
+    ensureTriggerRegion: noop,
+};
+exports.StorageService = {
+    name: "storage",
+    api: "storage.googleapis.com",
+    requiredProjectBindings: storage_1.obtainStorageBindings,
+    ensureTriggerRegion: storage_1.ensureStorageTriggerRegion,
+};
+exports.EVENT_SERVICE_MAPPING = {
+    "google.cloud.pubsub.topic.v1.messagePublished": exports.PubSubService,
+    "google.cloud.storage.object.v1.finalized": exports.StorageService,
+    "google.cloud.storage.object.v1.archived": exports.StorageService,
+    "google.cloud.storage.object.v1.deleted": exports.StorageService,
+    "google.cloud.storage.object.v1.metadataUpdated": exports.StorageService,
+};
+function serviceForEndpoint(endpoint) {
+    if (!backend.isEventTriggered(endpoint)) {
+        return exports.NoOpService;
+    }
+    return exports.EVENT_SERVICE_MAPPING[endpoint.eventTrigger.eventType] || exports.NoOpService;
+}
+exports.serviceForEndpoint = serviceForEndpoint;

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

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureStorageTriggerRegion = exports.obtainStorageBindings = void 0;
+const storage = require("../../../gcp/storage");
+const logger_1 = require("../../../logger");
+const error_1 = require("../../../error");
+const location_1 = require("../../../gcp/location");
+const PUBSUB_PUBLISHER_ROLE = "roles/pubsub.publisher";
+async function obtainStorageBindings(projectId, existingPolicy) {
+    const storageResponse = await storage.getServiceAccount(projectId);
+    const storageServiceAgent = `serviceAccount:${storageResponse.email_address}`;
+    let pubsubBinding = existingPolicy.bindings.find((b) => b.role === PUBSUB_PUBLISHER_ROLE);
+    if (!pubsubBinding) {
+        pubsubBinding = {
+            role: PUBSUB_PUBLISHER_ROLE,
+            members: [],
+        };
+    }
+    if (!pubsubBinding.members.find((m) => m === storageServiceAgent)) {
+        pubsubBinding.members.push(storageServiceAgent);
+    }
+    return [pubsubBinding];
+}
+exports.obtainStorageBindings = obtainStorageBindings;
+async function ensureStorageTriggerRegion(endpoint, eventTrigger) {
+    if (!eventTrigger.region) {
+        logger_1.logger.debug("Looking up bucket region for the storage event trigger");
+        try {
+            const bucket = await storage.getBucket(eventTrigger.eventFilters.bucket);
+            eventTrigger.region = bucket.location.toLowerCase();
+            logger_1.logger.debug("Setting the event trigger region to", eventTrigger.region, ".");
+        }
+        catch (err) {
+            throw new error_1.FirebaseError("Can't find the storage bucket region", { original: err });
+        }
+    }
+    if (endpoint.region !== eventTrigger.region &&
+        eventTrigger.region !== "us-central1" &&
+        !location_1.regionInLocation(endpoint.region, eventTrigger.region)) {
+        throw new error_1.FirebaseError(`A function in region ${endpoint.region} cannot listen to a bucket in region ${eventTrigger.region}`);
+    }
+}
+exports.ensureStorageTriggerRegion = ensureStorageTriggerRegion;

package/lib/deploy/functions/triggerRegionHelper.js

@@ -1,40 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.lookupMissingTriggerRegions = void 0;
+exports.ensureTriggerRegions = void 0;
 const backend = require("./backend");
-const storage = require("../../gcp/storage");
-const error_1 = require("../../error");
-const logger_1 = require("../../logger");
-const noop = () => Promise.resolve();
-const LOOKUP_BY_EVENT_TYPE = {
-    "google.cloud.pubsub.topic.v1.messagePublished": noop,
-    "google.cloud.storage.object.v1.finalized": lookupBucketRegion,
-    "google.cloud.storage.object.v1.archived": lookupBucketRegion,
-    "google.cloud.storage.object.v1.deleted": lookupBucketRegion,
-    "google.cloud.storage.object.v1.metadataUpdated": lookupBucketRegion,
-};
-async function lookupMissingTriggerRegions(want) {
+const services_1 = require("./services");
+async function ensureTriggerRegions(want) {
     const regionLookups = [];
     for (const ep of backend.allEndpoints(want)) {
-        if (ep.platform === "gcfv1" || !backend.isEventTriggered(ep) || ep.eventTrigger.region) {
+        if (ep.platform === "gcfv1" || !backend.isEventTriggered(ep)) {
             continue;
         }
-        const lookup = LOOKUP_BY_EVENT_TYPE[ep.eventTrigger.eventType];
-        if (!lookup) {
-            logger_1.logger.debug("Don't know how to look up trigger region for event type", ep.eventTrigger.eventType, ". Deploy will fail unless this event type is global");
-            continue;
-        }
-        regionLookups.push(lookup(ep));
+        regionLookups.push(services_1.serviceForEndpoint(ep).ensureTriggerRegion(ep, ep.eventTrigger));
     }
     await Promise.all(regionLookups);
 }
-exports.lookupMissingTriggerRegions = lookupMissingTriggerRegions;
-async function lookupBucketRegion(endpoint) {
-    try {
-        const bucket = await storage.getBucket(endpoint.eventTrigger.eventFilters.bucket);
-        endpoint.eventTrigger.region = bucket.location.toLowerCase();
-    }
-    catch (err) {
-        throw new error_1.FirebaseError("Can't find the storage bucket region", { original: err });
-    }
-}
+exports.ensureTriggerRegions = ensureTriggerRegions;

package/lib/deploy/index.js

@@ -38,6 +38,7 @@ var deploy = function (targetNames, options, customContext = {}) {
     var deploys = [];
     var releases = [];
     var postdeploys = [];
+    var startTime = Date.now();
     for (var i = 0; i < targetNames.length; i++) {
         var targetName = targetNames[i];
         var target = TARGETS[targetName];
@@ -75,8 +76,15 @@ var deploy = function (targetNames, options, customContext = {}) {
     })
         .then(function () {
         if (_.has(options, "config.notes.databaseRules")) {
-            track("Rules Deploy", options.config.notes.databaseRules);
+            return track("Rules Deploy", options.config.notes.databaseRules);
         }
+        return;
+    })
+        .then(function () {
+        const duration = Date.now() - startTime;
+        return track("Product Deploy", [...targetNames].sort().join(","), duration);
+    })
+        .then(function () {
         logger.info();
         utils.logSuccess(clc.underline.bold("Deploy complete!"));
         logger.info();

package/lib/emulator/auth/handlers.js

@@ -178,7 +178,7 @@ function registerHandlers(app, getProjectStateByApiKey) {
             : `
             <span class="mdc-list-item__graphic material-icons" aria-hidden=true>person</span>`}
           <span class="mdc-list-item__text"><span class="mdc-list-item__primary-text">${info.displayName || "(No display name)"}</span>
-          <span class="mdc-list-item__secondary-text fallback-secondary-text">${info.email || ""}</span>
+          <span class="mdc-list-item__secondary-text fallback-secondary-text" id="reuse-email">${info.email || ""}</span>
       </li>`)
             .join("\n");
         res.end(widget_ui_1.WIDGET_UI.replace(widget_ui_1.PROVIDERS_LIST_PLACEHOLDER, options));

package/lib/emulator/auth/operations.js

@@ -1010,7 +1010,7 @@ function signInWithEmailLink(state, reqBody) {
     }
 }
 function signInWithIdp(state, reqBody) {
-    var _a, _b;
+    var _a, _b, _c;
     errors_1.assert(!state.disableAuth, "PROJECT_DISABLED");
     errors_1.assert(state.usageMode !== state_1.UsageMode.PASSTHROUGH, "UNSUPPORTED_PASSTHROUGH_OPERATION");
     if (reqBody.returnRefreshToken) {
@@ -1041,7 +1041,16 @@ function signInWithIdp(state, reqBody) {
             throw new errors_1.NotImplementedError("The Auth Emulator only supports sign-in with credentials (id_token required).");
         }
     }
-    let { response, rawId } = fakeFetchUserInfoFromIdp(providerId, claims);
+    let samlResponse;
+    let signInAttributes = undefined;
+    if (normalizedUri.searchParams.get("SAMLResponse")) {
+        samlResponse = JSON.parse(normalizedUri.searchParams.get("SAMLResponse"));
+        signInAttributes = (_b = samlResponse.assertion) === null || _b === void 0 ? void 0 : _b.attributeStatements;
+        errors_1.assert(samlResponse.assertion, "INVALID_IDP_RESPONSE ((Missing assertion in SAMLResponse.))");
+        errors_1.assert(samlResponse.assertion.subject, "INVALID_IDP_RESPONSE ((Missing assertion.subject in SAMLResponse.))");
+        errors_1.assert(samlResponse.assertion.subject.nameId, "INVALID_IDP_RESPONSE ((Missing assertion.subject.nameId in SAMLResponse.))");
+    }
+    let { response, rawId } = fakeFetchUserInfoFromIdp(providerId, claims, samlResponse);
     response.oauthAccessToken =
         oauthAccessToken || `FirebaseAuthEmulatorFakeAccessToken_${providerId}`;
     response.oauthIdToken = oauthIdToken;
@@ -1101,12 +1110,12 @@ function signInWithIdp(state, reqBody) {
     if (state instanceof state_1.TenantProjectState) {
         response.tenantId = state.tenantId;
     }
-    if ((state.mfaConfig.state === "ENABLED" || state.mfaConfig.state === "MANDATORY") && ((_b = user.mfaInfo) === null || _b === void 0 ? void 0 : _b.length)) {
+    if ((state.mfaConfig.state === "ENABLED" || state.mfaConfig.state === "MANDATORY") && ((_c = user.mfaInfo) === null || _c === void 0 ? void 0 : _c.length)) {
         return Object.assign(Object.assign({}, response), mfaPending(state, user, providerId));
     }
     else {
         user = state.updateUserByLocalId(user.localId, { lastLoginAt: Date.now().toString() });
-        return Object.assign(Object.assign({}, response), issueTokens(state, user, providerId));
+        return Object.assign(Object.assign({}, response), issueTokens(state, user, providerId, { signInAttributes }));
     }
 }
 function signInWithPassword(state, reqBody) {
@@ -1391,7 +1400,7 @@ function redactPasswordHash(user) {
 function hashPassword(password, salt) {
     return `fakeHash:salt=${salt}:password=${password}`;
 }
-function issueTokens(state, user, signInProvider, { extraClaims, secondFactor, } = {}) {
+function issueTokens(state, user, signInProvider, { extraClaims, secondFactor, signInAttributes, } = {}) {
     user = state.updateUserByLocalId(user.localId, { lastRefreshAt: new Date().toISOString() });
     const usageMode = state.usageMode === state_1.UsageMode.PASSTHROUGH ? "passthrough" : undefined;
     const tenantId = state instanceof state_1.TenantProjectState ? state.tenantId : undefined;
@@ -1404,6 +1413,7 @@ function issueTokens(state, user, signInProvider, { extraClaims, secondFactor, }
         secondFactor,
         usageMode,
         tenantId,
+        signInAttributes,
     });
     const refreshToken = state.usageMode === state_1.UsageMode.DEFAULT
         ? state.createRefreshTokenFor(user, signInProvider, {
@@ -1435,7 +1445,7 @@ function parseIdToken(state, idToken) {
     const signInProvider = decoded.payload.firebase.sign_in_provider;
     return { user, signInProvider, payload: decoded.payload };
 }
-function generateJwt(user, { projectId, signInProvider, expiresInSeconds, extraClaims = {}, secondFactor, usageMode, tenantId, }) {
+function generateJwt(user, { projectId, signInProvider, expiresInSeconds, extraClaims = {}, secondFactor, usageMode, tenantId, signInAttributes, }) {
     const identities = {};
     if (user.email) {
         identities["email"] = [user.email];
@@ -1459,6 +1469,7 @@ function generateJwt(user, { projectId, signInProvider, expiresInSeconds, extraC
             sign_in_second_factor: secondFactor === null || secondFactor === void 0 ? void 0 : secondFactor.provider,
             usage_mode: usageMode,
             tenant: tenantId,
+            sign_in_attributes: signInAttributes,
         } });
     const jwtStr = jsonwebtoken_1.sign(customPayloadFields, "", {
         algorithm: "none",
@@ -1603,7 +1614,8 @@ function parseClaims(idTokenOrJsonClaims) {
     errors_1.assert(typeof claims.sub === "string", 'INVALID_IDP_RESPONSE : ((The "sub" field must be a string.))');
     return claims;
 }
-function fakeFetchUserInfoFromIdp(providerId, claims) {
+function fakeFetchUserInfoFromIdp(providerId, claims, samlResponse) {
+    var _a, _b, _c, _d, _e;
     const rawId = claims.sub;
     const email = claims.email ? utils_1.canonicalizeEmailAddress(claims.email) : undefined;
     const emailVerified = !!claims.email_verified;
@@ -1620,7 +1632,7 @@ function fakeFetchUserInfoFromIdp(providerId, claims) {
         emailVerified,
         photoUrl,
     };
-    let federatedId;
+    let federatedId = rawId;
     switch (providerId) {
         case "google.com": {
             federatedId = `https://accounts.google.com/${rawId}`;
@@ -1643,8 +1655,14 @@ function fakeFetchUserInfoFromIdp(providerId, claims) {
             });
             break;
         }
+        case (_a = providerId.match(/^saml\./)) === null || _a === void 0 ? void 0 : _a.input:
+            const nameId = (_c = (_b = samlResponse === null || samlResponse === void 0 ? void 0 : samlResponse.assertion) === null || _b === void 0 ? void 0 : _b.subject) === null || _c === void 0 ? void 0 : _c.nameId;
+            response.email = nameId && utils_1.isValidEmailAddress(nameId) ? nameId : response.email;
+            response.emailVerified = true;
+            response.rawUserInfo = JSON.stringify((_d = samlResponse === null || samlResponse === void 0 ? void 0 : samlResponse.assertion) === null || _d === void 0 ? void 0 : _d.attributeStatements);
+            break;
+        case (_e = providerId.match(/^oidc\./)) === null || _e === void 0 ? void 0 : _e.input:
         default:
-            federatedId = rawId;
             response.rawUserInfo = JSON.stringify(claims);
             break;
     }

package/lib/emulator/auth/widget_ui.js

@@ -33,6 +33,7 @@ var firebaseAppId = query.get('appId');
 var apn = query.get('apn');
 var ibi = query.get('ibi');
 var appIdentifier = apn || ibi;
+var isSamlProvider = !!providerId.match(/^saml\./);
 assert(
   appName || clientId || firebaseAppId || appIdentifier,
   'Missing one of appName / clientId / appId / apn / ibi query params.'
@@ -157,21 +158,34 @@ var reuseAccountEls = document.querySelectorAll('.js-reuse-account');
 if (reuseAccountEls.length) {
   [].forEach.call(reuseAccountEls, function (el) {
     var urlEncodedIdToken = el.dataset.idToken;
+    const decoded = JSON.parse(decodeURIComponent(urlEncodedIdToken));
     el.addEventListener('click', function (e) {
       e.preventDefault();
-      finishWithUser(urlEncodedIdToken);
+      finishWithUser(urlEncodedIdToken, decoded.email);
     });
   });
 } else {
   document.querySelector('.js-accounts-help-text').textContent = "No " + formattedProviderId + " accounts exist in the Auth Emulator.";
 }
 
-function finishWithUser(urlEncodedIdToken) {
+function finishWithUser(urlEncodedIdToken, email) {
   // Use widget URL, but replace all query parameters (no apiKey etc.).
   var url = window.location.href.split('?')[0];
   // Avoid URLSearchParams for browser compatibility.
   url += '?providerId=' + encodeURIComponent(providerId);
   url += '&id_token=' + urlEncodedIdToken;
+
+  // Save reasonable defaults for SAML providers
+  if (isSamlProvider) {
+    url += '&SAMLResponse=' + encodeURIComponent(JSON.stringify({
+      assertion: {
+        subject: {
+          nameId: email,
+        },
+      },
+    }));
+  }
+
   saveAuthEvent({
     type: authType,
     eventId: eventId,
@@ -220,7 +234,7 @@ document.getElementById('main-form').addEventListener('submit', function(e) {
     if (screenName) claims.screenName = screenName;
     if (photoUrl) claims.photoUrl = photoUrl;
 
-    finishWithUser(createFakeClaims(claims));
+    finishWithUser(createFakeClaims(claims), claims.email);
   }
 });
 

package/lib/emulator/downloadableEmulators.js

@@ -17,13 +17,13 @@ const EMULATOR_INSTANCE_KILL_TIMEOUT = 4000;
 const CACHE_DIR = process.env.FIREBASE_EMULATORS_PATH || path.join(os.homedir(), ".cache", "firebase", "emulators");
 exports.DownloadDetails = {
     database: {
-        downloadPath: path.join(CACHE_DIR, "firebase-database-emulator-v4.7.2.jar"),
-        version: "4.7.2",
+        downloadPath: path.join(CACHE_DIR, "firebase-database-emulator-v4.7.3.jar"),
+        version: "4.7.3",
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v4.7.2.jar",
-            expectedSize: 28910604,
-            expectedChecksum: "264e5df0c0661c064ef7dc9ce8179aba",
+            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/firebase-database-emulator-v4.7.3.jar",
+            expectedSize: 28862098,
+            expectedChecksum: "8f696f24ee89c937a789498a0c0e4899",
             namePrefix: "firebase-database-emulator",
         },
     },

package/lib/emulator/functionsEmulator.js

@@ -29,6 +29,7 @@ const defaultCredentials_1 = require("../defaultCredentials");
 const adminSdkConfig_1 = require("./adminSdkConfig");
 const functionsEnv = require("../functions/env");
 const types_2 = require("./events/types");
+const validate_1 = require("../deploy/functions/validate");
 const EVENT_INVOKE = "functions:invoke";
 const DATABASE_PATH_PATTERN = new RegExp("^projects/[^/]+/instances/([^/]+)/refs(/.*)$");
 class FunctionsEmulator {
@@ -138,6 +139,9 @@ class FunctionsEmulator {
             else {
                 triggerKey = `${this.args.projectId}:${proto.eventType}`;
             }
+            if (proto.data.bucket) {
+                triggerKey += `:${proto.data.bucket}`;
+            }
             const triggers = this.multicastTriggers[triggerKey] || [];
             triggers.forEach((triggerId) => {
                 this.workQueue.submit(() => {
@@ -247,6 +251,13 @@ class FunctionsEmulator {
             return !anyEnabledMatch;
         });
         for (const definition of toSetup) {
+            try {
+                validate_1.functionIdsAreValid([definition]);
+            }
+            catch (e) {
+                this.logger.logLabeled("WARN", `functions[${definition.id}]`, `Invalid function id: ${e.message}`);
+                continue;
+            }
             let added = false;
             let url = undefined;
             if (definition.httpsTrigger) {
@@ -396,7 +407,10 @@ class FunctionsEmulator {
     }
     addStorageTrigger(projectId, key, eventTrigger) {
         logger_1.logger.debug(`addStorageTrigger`, JSON.stringify({ eventTrigger }));
-        const eventTriggerId = `${projectId}:${eventTrigger.eventType}`;
+        const bucket = eventTrigger.resource.startsWith("projects/_/buckets/")
+            ? eventTrigger.resource.split("/")[3]
+            : eventTrigger.resource;
+        const eventTriggerId = `${projectId}:${eventTrigger.eventType}:${bucket}`;
         const triggers = this.multicastTriggers[eventTriggerId] || [];
         triggers.push(key);
         this.multicastTriggers[eventTriggerId] = triggers;

package/lib/emulator/functionsEmulatorShared.js

@@ -55,6 +55,7 @@ function emulatedFunctionsByRegion(definitions) {
             defDeepCopy.regions = [region];
             defDeepCopy.region = region;
             defDeepCopy.id = `${region}-${defDeepCopy.name}`;
+            defDeepCopy.platform = defDeepCopy.platform || "gcfv1";
             regionDefinitions.push(defDeepCopy);
         }
     }

package/lib/emulator/pubsubEmulator.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PubsubEmulator = void 0;
 const uuid = require("uuid");
 const pubsub_1 = require("@google-cloud/pubsub");
-const api = require("../api");
 const downloadableEmulators = require("./downloadableEmulators");
+const apiv2_1 = require("../apiv2");
 const emulatorLogger_1 = require("./emulatorLogger");
 const types_1 = require("../emulator/types");
 const constants_1 = require("./constants");
@@ -87,47 +87,54 @@ class PubsubEmulator {
         this.triggersForTopic.set(topicName, triggers);
         this.subscriptionForTopic.set(topicName, sub);
     }
-    getRequestOptions(topic, message, signatureType) {
-        const baseOpts = {
-            origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS).getInfo())}`,
-        };
-        if (signatureType === "event") {
-            return Object.assign(Object.assign({}, baseOpts), { data: {
-                    context: {
-                        eventId: uuid.v4(),
-                        resource: {
-                            service: "pubsub.googleapis.com",
-                            name: `projects/${this.args.projectId}/topics/${topic}`,
-                        },
-                        eventType: "google.pubsub.topic.publish",
-                        timestamp: message.publishTime.toISOString(),
-                    },
-                    data: {
-                        data: message.data,
-                        attributes: message.attributes,
-                    },
-                } });
+    ensureFunctionsClient() {
+        if (this.client != undefined)
+            return;
+        const funcEmulator = registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS);
+        if (!funcEmulator) {
+            throw new error_1.FirebaseError(`Attempted to execute pubsub trigger but could not find the Functions emulator`);
         }
-        else if (signatureType === "cloudevent") {
-            const data = {
-                message: {
-                    messageId: message.id,
-                    publishTime: message.publishTime,
-                    attributes: message.attributes,
-                    orderingKey: message.orderingKey,
-                    data: message.data.toString("base64"),
+        this.client = new apiv2_1.Client({
+            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(funcEmulator.getInfo())}`,
+            auth: false,
+        });
+    }
+    createLegacyEventRequestBody(topic, message) {
+        return {
+            context: {
+                eventId: uuid.v4(),
+                resource: {
+                    service: "pubsub.googleapis.com",
+                    name: `projects/${this.args.projectId}/topics/${topic}`,
                 },
-                subscription: this.subscriptionForTopic.get(topic).name,
-            };
-            const ce = {
-                specVersion: 1,
-                type: "google.cloud.pubsub.topic.v1.messagePublished",
-                source: `//pubsub.googleapis.com/projects/${this.args.projectId}/topics/${topic}`,
-                data,
-            };
-            return Object.assign(Object.assign({}, baseOpts), { headers: { "Content-Type": "application/cloudevents+json; charset=UTF-8" }, data: ce });
-        }
-        throw new error_1.FirebaseError(`Unsupported trigger signature: ${signatureType}`);
+                eventType: "google.pubsub.topic.publish",
+                timestamp: message.publishTime.toISOString(),
+            },
+            data: {
+                data: message.data,
+                attributes: message.attributes,
+            },
+        };
+    }
+    createCloudEventRequestBody(topic, message) {
+        const data = {
+            message: {
+                messageId: message.id,
+                publishTime: message.publishTime,
+                attributes: message.attributes,
+                orderingKey: message.orderingKey,
+                data: message.data.toString("base64"),
+            },
+            subscription: this.subscriptionForTopic.get(topic).name,
+        };
+        return {
+            specversion: "1",
+            id: uuid.v4(),
+            time: message.publishTime.toISOString(),
+            type: "google.cloud.pubsub.topic.v1.messagePublished",
+            source: `//pubsub.googleapis.com/projects/${this.args.projectId}/topics/${topic}`,
+            data,
+        };
     }
     async onMessage(topicName, message) {
         this.logger.logLabeled("DEBUG", "pubsub", `onMessage(${topicName}, ${message.id})`);
@@ -135,14 +142,20 @@ class PubsubEmulator {
         if (!triggers || triggers.length === 0) {
             throw new error_1.FirebaseError(`No trigger for topic: ${topicName}`);
         }
-        if (!registry_1.EmulatorRegistry.get(types_1.Emulators.FUNCTIONS)) {
-            throw new error_1.FirebaseError(`Attempted to execute pubsub trigger for topic ${topicName} but could not find Functions emulator`);
-        }
         this.logger.logLabeled("DEBUG", "pubsub", `Executing ${triggers.length} matching triggers (${JSON.stringify(triggers.map((t) => t.triggerKey))})`);
+        this.ensureFunctionsClient();
         for (const { triggerKey, signatureType } of triggers) {
-            const reqOpts = this.getRequestOptions(topicName, message, signatureType);
             try {
-                await api.request("POST", `/functions/projects/${this.args.projectId}/triggers/${triggerKey}`, reqOpts);
+                const path = `/functions/projects/${this.args.projectId}/triggers/${triggerKey}`;
+                if (signatureType === "event") {
+                    await this.client.post(path, this.createLegacyEventRequestBody(topicName, message));
+                }
+                else if (signatureType === "cloudevent") {
+                    await this.client.post(path, this.createCloudEventRequestBody(topicName, message), { headers: { "Content-Type": "application/cloudevents+json; charset=UTF-8" } });
+                }
+                else {
+                    throw new error_1.FirebaseError(`Unsupported trigger signature: ${signatureType}`);
+                }
             }
             catch (e) {
                 this.logger.logLabeled("DEBUG", "pubsub", e);

package/lib/emulator/storage/cloudFunctions.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageCloudFunctions = void 0;
+const uuid = require("uuid");
 const registry_1 = require("../registry");
 const types_1 = require("../types");
 const emulatorLogger_1 = require("../emulatorLogger");
@@ -57,7 +58,7 @@ class StorageCloudFunctions {
     }
     createLegacyEventRequestBody(action, objectMetadataPayload) {
         const timestamp = new Date();
-        return JSON.stringify({
+        return {
             eventId: `${timestamp.getTime()}`,
             timestamp: metadata_1.toSerializedDate(timestamp),
             eventType: `google.storage.object.${action}`,
@@ -67,20 +68,26 @@ class StorageCloudFunctions {
                 type: "storage#object",
             },
             data: objectMetadataPayload,
-        });
+        };
     }
     createCloudEventRequestBody(action, objectMetadataPayload) {
         const ceAction = STORAGE_V2_ACTION_MAP[action];
         if (!ceAction) {
-            throw new Error("Action is not definied as a CloudEvents action");
+            throw new Error("Action is not defined as a CloudEvents action");
         }
         const data = objectMetadataPayload;
-        return JSON.stringify({
-            specVersion: 1,
+        let time = new Date().toISOString();
+        if (data.updated) {
+            time = typeof data.updated === "string" ? data.updated : data.updated.toISOString();
+        }
+        return {
+            specversion: "1",
+            id: uuid.v4(),
             type: `google.cloud.storage.object.v1.${ceAction}`,
             source: `//storage.googleapis.com/projects/_/buckets/${objectMetadataPayload.bucket}/objects/${objectMetadataPayload.name}`,
+            time,
             data,
-        });
+        };
     }
 }
 exports.StorageCloudFunctions = StorageCloudFunctions;

package/lib/ensureApiEnabled.js

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensure = exports.enable = exports.check = exports.POLL_SETTINGS = void 0;
-const _ = require("lodash");
+exports.ensure = exports.check = exports.POLL_SETTINGS = void 0;
 const cli_color_1 = require("cli-color");
 const track = require("./track");
-const api = require("./api");
+const api_1 = require("./api");
+const apiv2_1 = require("./apiv2");
 const utils = require("./utils");
 const error_1 = require("./error");
 exports.POLL_SETTINGS = {
     pollInterval: 10000,
     pollsBeforeRetry: 12,
 };
+const apiClient = new apiv2_1.Client({
+    urlPrefix: api_1.serviceUsageOrigin,
+    apiVersion: "v1",
+});
 async function check(projectId, apiName, prefix, silent = false) {
-    const response = await api.request("GET", `/v1/projects/${projectId}/services/${apiName}`, {
-        auth: true,
-        origin: api.serviceUsageOrigin,
-    });
-    const isEnabled = _.get(response.body, "state") === "ENABLED";
+    const res = await apiClient.get(`/projects/${projectId}/services/${apiName}`);
+    const isEnabled = res.body.state === "ENABLED";
     if (isEnabled && !silent) {
         utils.logLabeledSuccess(prefix, `required API ${cli_color_1.bold(apiName)} is enabled`);
     }
@@ -25,10 +26,7 @@ async function check(projectId, apiName, prefix, silent = false) {
 exports.check = check;
 async function enable(projectId, apiName) {
     try {
-        await api.request("POST", `/v1/projects/${projectId}/services/${apiName}:enable`, {
-            auth: true,
-            origin: api.serviceUsageOrigin,
-        });
+        await apiClient.post(`/projects/${projectId}/services/${apiName}:enable`);
     }
     catch (err) {
         if (error_1.isBillingError(err)) {
@@ -39,7 +37,6 @@ https://console.firebase.google.com/project/${projectId}/usage/details`);
         throw err;
     }
 }
-exports.enable = enable;
 async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRetries, pollRetries = 0) {
     if (pollRetries > exports.POLL_SETTINGS.pollsBeforeRetry) {
         return enableApiWithRetries(projectId, apiName, prefix, silent, enablementRetries + 1);
@@ -49,7 +46,7 @@ async function pollCheckEnabled(projectId, apiName, prefix, silent, enablementRe
     });
     const isEnabled = await check(projectId, apiName, prefix, silent);
     if (isEnabled) {
-        track("api_enabled", apiName);
+        void track("api_enabled", apiName);
         return;
     }
     if (!silent) {