firebase-tools 10.4.1 → 10.6.0

package/lib/emulator/storage/files.js

@@ -9,12 +9,10 @@ var __asyncValues = (this && this.__asyncValues) || function (o) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StorageLayer = exports.StoredFile = void 0;
 const fs_1 = require("fs");
-const list_1 = require("./list");
 const metadata_1 = require("./metadata");
 const errors_1 = require("./errors");
 const path = require("path");
 const fse = require("fs-extra");
-const cloudFunctions_1 = require("./cloudFunctions");
 const logger_1 = require("../../logger");
 const adminSdkConfig_1 = require("../adminSdkConfig");
 const types_1 = require("./rules/types");
@@ -39,17 +37,14 @@ class StoredFile {
 }
 exports.StoredFile = StoredFile;
 class StorageLayer {
-    constructor(_projectId, _rulesValidator, _adminCredsValidator, _persistence) {
+    constructor(_projectId, _files, _buckets, _rulesValidator, _adminCredsValidator, _persistence, _cloudFunctions) {
         this._projectId = _projectId;
+        this._files = _files;
+        this._buckets = _buckets;
         this._rulesValidator = _rulesValidator;
         this._adminCredsValidator = _adminCredsValidator;
         this._persistence = _persistence;
-        this.reset();
-        this._cloudFunctions = new cloudFunctions_1.StorageCloudFunctions(this._projectId);
-    }
-    reset() {
-        this._files = new Map();
-        this._buckets = new Map();
+        this._cloudFunctions = _cloudFunctions;
     }
     createBucket(id) {
         if (!this._buckets.has(id)) {
@@ -66,11 +61,11 @@ class StorageLayer {
         }
         return [...this._buckets.values()];
     }
-    async handleGetObject(request, skipAuth = false) {
+    async getObject(request) {
         var _a;
         const metadata = this.getMetadata(request.bucketId, request.decodedObjectId);
         const hasValidDownloadToken = ((metadata === null || metadata === void 0 ? void 0 : metadata.downloadTokens) || []).includes((_a = request.downloadToken) !== null && _a !== void 0 ? _a : "");
-        let authorized = skipAuth || hasValidDownloadToken;
+        let authorized = hasValidDownloadToken;
         if (!authorized) {
             authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.GET, { before: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, request.authorization);
         }
@@ -99,10 +94,9 @@ class StorageLayer {
         }
         return undefined;
     }
-    async handleDeleteObject(request, skipAuth = false) {
+    async deleteObject(request) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, request.authorization));
+        const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.DELETE, { before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource() }, request.authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -131,13 +125,12 @@ class StorageLayer {
             return true;
         }
     }
-    async handleUpdateObjectMetadata(request, skipAuth = false) {
+    async updateObjectMetadata(request) {
         const storedMetadata = this.getMetadata(request.bucketId, request.decodedObjectId);
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.UPDATE, {
-                before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
-                after: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(request.metadata),
-            }, request.authorization));
+        const authorized = await this._rulesValidator.validate(["b", request.bucketId, "o", request.decodedObjectId].join("/"), request.bucketId, types_1.RulesetOperationMethod.UPDATE, {
+            before: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(),
+            after: storedMetadata === null || storedMetadata === void 0 ? void 0 : storedMetadata.asRulesResource(request.metadata),
+        }, request.authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
@@ -147,7 +140,7 @@ class StorageLayer {
         storedMetadata.update(request.metadata);
         return storedMetadata;
     }
-    async handleUploadObject(upload, skipAuth = false) {
+    async uploadObject(upload) {
         if (upload.status !== upload_1.UploadStatus.FINISHED) {
             throw new Error(`Unexpected upload status encountered: ${upload.status}.`);
         }
@@ -162,8 +155,8 @@ class StorageLayer {
             cacheControl: upload.metadata.cacheControl,
             customMetadata: upload.metadata.metadata,
         }, this._cloudFunctions, this._persistence.readBytes(upload.path, upload.size));
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization));
+        metadata.update(upload.metadata, false);
+        const authorized = await this._rulesValidator.validate(["b", upload.bucketId, "o", upload.objectId].join("/"), upload.bucketId, types_1.RulesetOperationMethod.CREATE, { after: metadata === null || metadata === void 0 ? void 0 : metadata.asRulesResource() }, upload.authorization);
         if (!authorized) {
             this._persistence.deleteFile(upload.path);
             throw new errors_1.ForbiddenError();
@@ -174,17 +167,24 @@ class StorageLayer {
         this._cloudFunctions.dispatch("finalize", new metadata_1.CloudStorageObjectMetadata(metadata));
         return metadata;
     }
-    copyFile(sourceFile, destinationBucket, destinationObject, incomingMetadata) {
-        const filePath = this.path(destinationBucket, destinationObject);
-        this._persistence.deleteFile(filePath, true);
-        const bytes = this.getBytes(sourceFile.bucket, sourceFile.name);
-        this._persistence.appendBytes(filePath, bytes);
-        const newMetadata = Object.assign(Object.assign(Object.assign({}, sourceFile), { metadata: sourceFile.customMetadata }), incomingMetadata);
-        if (sourceFile.downloadTokens.length &&
+    copyObject({ sourceBucket, sourceObject, destinationBucket, destinationObject, incomingMetadata, authorization, }) {
+        if (!this._adminCredsValidator.validate(authorization)) {
+            throw new errors_1.ForbiddenError();
+        }
+        const sourceMetadata = this.getMetadata(sourceBucket, sourceObject);
+        if (!sourceMetadata) {
+            throw new errors_1.NotFoundError();
+        }
+        const sourceBytes = this.getBytes(sourceBucket, sourceObject);
+        const destinationFilePath = this.path(destinationBucket, destinationObject);
+        this._persistence.deleteFile(destinationFilePath, true);
+        this._persistence.appendBytes(destinationFilePath, sourceBytes);
+        const newMetadata = Object.assign(Object.assign(Object.assign({}, sourceMetadata), { metadata: sourceMetadata.customMetadata }), incomingMetadata);
+        if (sourceMetadata.downloadTokens.length &&
             !((incomingMetadata === null || incomingMetadata === void 0 ? void 0 : incomingMetadata.metadata) && Object.keys(incomingMetadata === null || incomingMetadata === void 0 ? void 0 : incomingMetadata.metadata).length)) {
             if (!newMetadata.metadata)
                 newMetadata.metadata = {};
-            newMetadata.metadata.firebaseStorageDownloadTokens = sourceFile.downloadTokens.join(",");
+            newMetadata.metadata.firebaseStorageDownloadTokens = sourceMetadata.downloadTokens.join(",");
         }
         if (newMetadata.metadata) {
             for (const [k, v] of Object.entries(newMetadata.metadata)) {
@@ -201,27 +201,23 @@ class StorageLayer {
             contentLanguage: newMetadata.contentLanguage,
             cacheControl: newMetadata.cacheControl,
             customMetadata: newMetadata.metadata,
-        }, this._cloudFunctions, bytes, incomingMetadata);
-        const file = new StoredFile(copiedFileMetadata, this._persistence.getDiskPath(filePath));
-        this._files.set(filePath, file);
+        }, this._cloudFunctions, sourceBytes, incomingMetadata);
+        const file = new StoredFile(copiedFileMetadata, this._persistence.getDiskPath(destinationFilePath));
+        this._files.set(destinationFilePath, file);
         this._cloudFunctions.dispatch("finalize", new metadata_1.CloudStorageObjectMetadata(file.metadata));
         return file.metadata;
     }
-    async handleListObjects(request, skipAuth = false) {
-        var _a, _b, _c;
-        const authorized = skipAuth ||
-            (await this._rulesValidator.validate(["b", request.bucketId, "o", request.prefix].join("/"), request.bucketId, types_1.RulesetOperationMethod.LIST, {}, request.authorization));
+    async listObjects(request) {
+        var _a;
+        const { bucketId, prefix, delimiter, pageToken, authorization } = request;
+        const authorized = await this._rulesValidator.validate(["b", bucketId, "o", prefix].join("/"), bucketId, types_1.RulesetOperationMethod.LIST, {}, authorization);
         if (!authorized) {
             throw new errors_1.ForbiddenError();
         }
-        const itemsResults = this.listItems(request.bucketId, request.prefix, request.delimiter, request.pageToken, request.maxResults);
-        return new list_1.ListResponse((_a = itemsResults.prefixes) !== null && _a !== void 0 ? _a : [], (_c = (_b = itemsResults.items) === null || _b === void 0 ? void 0 : _b.map((i) => new list_1.ListItem(i.name, i.bucket))) !== null && _c !== void 0 ? _c : [], itemsResults.nextPageToken);
-    }
-    listItems(bucket, prefix, delimiter, pageToken, maxResults) {
         let items = [];
         const prefixes = new Set();
         for (const [, file] of this._files) {
-            if (file.metadata.bucket !== bucket) {
+            if (file.metadata.bucket !== bucketId) {
                 continue;
             }
             const name = file.metadata.name;
@@ -258,9 +254,7 @@ class StorageLayer {
                 items = items.slice(idx);
             }
         }
-        if (!maxResults) {
-            maxResults = 1000;
-        }
+        const maxResults = (_a = request.maxResults) !== null && _a !== void 0 ? _a : 1000;
         let nextPageToken = undefined;
         if (items.length > maxResults) {
             nextPageToken = items[maxResults].name;
@@ -269,10 +263,10 @@ class StorageLayer {
         return {
             nextPageToken,
             prefixes: prefixes.size > 0 ? [...prefixes].sort() : undefined,
-            items: items.length > 0 ? items.map((item) => new metadata_1.CloudStorageObjectMetadata(item)) : undefined,
+            items: items.length > 0 ? items : undefined,
         };
     }
-    handleCreateDownloadToken(request) {
+    createDownloadToken(request) {
         if (!this._adminCredsValidator.validate(request.authorization)) {
             throw new errors_1.ForbiddenError();
         }
@@ -283,7 +277,7 @@ class StorageLayer {
         metadata.addDownloadToken();
         return metadata;
     }
-    handleDeleteDownloadToken(request) {
+    deleteDownloadToken(request) {
         if (!this._adminCredsValidator.validate(request.authorization)) {
             throw new errors_1.ForbiddenError();
         }
@@ -354,10 +348,12 @@ class StorageLayer {
                 logger_1.logger.warn(`Could not find file "${blobPath}" in storage export.`);
                 continue;
             }
-            const file = new StoredFile(metadata, blobPath);
-            this._files.set(blobPath, file);
+            const decodedBlobPath = decodeURIComponent(blobPath);
+            const blobDiskPath = this._persistence.getDiskPath(decodedBlobPath);
+            const file = new StoredFile(metadata, blobDiskPath);
+            this._files.set(decodedBlobPath, file);
+            fse.copyFileSync(blobAbsPath, blobDiskPath);
         }
-        fse.copySync(blobsDir, this.dirPath);
     }
     *walkDirSync(dir) {
         const files = (0, fs_1.readdirSync)(dir);

package/lib/emulator/storage/index.js

@@ -13,19 +13,30 @@ const runtime_1 = require("./rules/runtime");
 const utils_1 = require("./rules/utils");
 const persistence_1 = require("./persistence");
 const upload_1 = require("./upload");
+const cloudFunctions_1 = require("./cloudFunctions");
 class StorageEmulator {
     constructor(args) {
         this.args = args;
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
+        this._files = new Map();
+        this._buckets = new Map();
         this._rulesRuntime = new runtime_1.StorageRulesRuntime();
-        this._rulesManager = (0, manager_1.createStorageRulesManager)(this.args.rules, this._rulesRuntime);
+        this._rulesManager = this.createRulesManager(this.args.rules);
+        this._cloudFunctions = new cloudFunctions_1.StorageCloudFunctions(args.projectId);
         this._persistence = new persistence_1.Persistence(this.getPersistenceTmpDir());
-        this._storageLayer = new files_1.StorageLayer(args.projectId, (0, utils_1.getRulesValidator)((resource) => this._rulesManager.getRuleset(resource)), (0, utils_1.getAdminCredentialValidator)(), this._persistence);
         this._uploadService = new upload_1.UploadService(this._persistence);
+        const createStorageLayer = (rulesValidator) => {
+            return new files_1.StorageLayer(args.projectId, this._files, this._buckets, rulesValidator, (0, utils_1.getAdminCredentialValidator)(), this._persistence, this._cloudFunctions);
+        };
+        this._storageLayer = createStorageLayer((0, utils_1.getFirebaseRulesValidator)((resource) => this._rulesManager.getRuleset(resource)));
+        this._adminStorageLayer = createStorageLayer((0, utils_1.getAdminOnlyFirebaseRulesValidator)());
     }
     get storageLayer() {
         return this._storageLayer;
     }
+    get adminStorageLayer() {
+        return this._adminStorageLayer;
+    }
     get uploadService() {
         return this._uploadService;
     }
@@ -36,7 +47,8 @@ class StorageEmulator {
         return this._logger;
     }
     reset() {
-        this._storageLayer.reset();
+        this._files.clear();
+        this._buckets.clear();
         this._persistence.reset(this.getPersistenceTmpDir());
         this._uploadService.reset();
     }
@@ -70,6 +82,14 @@ class StorageEmulator {
     getApp() {
         return this._app;
     }
+    async replaceRules(rules) {
+        await this._rulesManager.stop();
+        this._rulesManager = this.createRulesManager(rules);
+        return this._rulesManager.start();
+    }
+    createRulesManager(rules) {
+        return (0, manager_1.createStorageRulesManager)(rules, this._rulesRuntime);
+    }
     getPersistenceTmpDir() {
         return `${(0, os_1.tmpdir)()}/firebase/storage/blobs`;
     }

package/lib/emulator/storage/metadata.js

@@ -44,7 +44,7 @@ class StoredFileMetadata {
             throw new Error("Must pass bytes array or opts object with size, md5hash, and crc32c");
         }
         if (incomingMetadata) {
-            this.update(incomingMetadata);
+            this.update(incomingMetadata, false);
         }
         this.deleteFieldsSetAsNull();
         this.setDownloadTokensFromCustomMetadata();
@@ -86,8 +86,10 @@ class StoredFileMetadata {
         }
         if (this.customMetadata.firebaseStorageDownloadTokens) {
             this.downloadTokens = [
-                ...this.downloadTokens,
-                ...this.customMetadata.firebaseStorageDownloadTokens.split(","),
+                ...new Set([
+                    ...this.downloadTokens,
+                    ...this.customMetadata.firebaseStorageDownloadTokens.split(","),
+                ]),
             ];
             delete this.customMetadata.firebaseStorageDownloadTokens;
         }
@@ -115,7 +117,7 @@ class StoredFileMetadata {
             });
         }
     }
-    update(incoming) {
+    update(incoming, shouldTrigger = true) {
         if (incoming.contentDisposition) {
             this.contentDisposition = incoming.contentDisposition;
         }
@@ -143,15 +145,17 @@ class StoredFileMetadata {
         }
         this.setDownloadTokensFromCustomMetadata();
         this.deleteFieldsSetAsNull();
-        this._cloudFunctions.dispatch("metadataUpdate", new CloudStorageObjectMetadata(this));
+        if (shouldTrigger) {
+            this._cloudFunctions.dispatch("metadataUpdate", new CloudStorageObjectMetadata(this));
+        }
     }
-    addDownloadToken() {
+    addDownloadToken(shouldTrigger = true) {
         if (!this.downloadTokens.length) {
             this.downloadTokens.push(uuid.v4());
             return;
         }
         this.downloadTokens = [...this.downloadTokens, uuid.v4()];
-        this.update({});
+        this.update({}, shouldTrigger);
     }
     deleteDownloadToken(token) {
         if (!this.downloadTokens.length) {
@@ -160,7 +164,7 @@ class StoredFileMetadata {
         const remainingTokens = this.downloadTokens.filter((t) => t !== token);
         this.downloadTokens = remainingTokens;
         if (remainingTokens.length === 0) {
-            this.addDownloadToken();
+            this.addDownloadToken(false);
         }
         this.update({});
     }
@@ -265,6 +269,12 @@ class CloudStorageObjectMetadata {
         if (metadata.cacheControl) {
             this.cacheControl = metadata.cacheControl;
         }
+        if (metadata.contentDisposition) {
+            this.contentDisposition = metadata.contentDisposition;
+        }
+        if (metadata.contentEncoding) {
+            this.contentEncoding = metadata.contentEncoding;
+        }
         if (metadata.customTime) {
             this.customTime = toSerializedDate(metadata.customTime);
         }

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

@@ -5,6 +5,7 @@ const chokidar = require("chokidar");
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
 const runtime_1 = require("./runtime");
+const fsutils_1 = require("../../../fsutils");
 function createStorageRulesManager(rules, runtime) {
     return Array.isArray(rules)
         ? new ResourceBasedStorageRulesManager(rules, runtime)
@@ -18,31 +19,24 @@ class DefaultStorageRulesManager {
         this._logger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE);
         this._rules = _rules;
     }
-    start() {
-        return this.updateSourceFile(this._rules);
+    async start() {
+        const issues = await this.loadRuleset();
+        this.updateWatcher(this._rules.name);
+        return issues;
     }
     getRuleset() {
         return this._ruleset;
     }
-    async updateSourceFile(rules) {
-        const prevRulesFile = this._rules.name;
-        this._rules = rules;
-        const issues = await this.loadRuleset();
-        this.updateWatcher(rules.name, prevRulesFile);
-        return issues;
-    }
     async stop() {
         await this._watcher.close();
     }
-    updateWatcher(rulesFile, prevRulesFile) {
-        if (prevRulesFile) {
-            this._watcher.unwatch(prevRulesFile);
-        }
+    updateWatcher(rulesFile) {
         this._watcher = chokidar
             .watch(rulesFile, { persistent: true, ignoreInitial: true })
             .on("change", async () => {
             await new Promise((res) => setTimeout(res, 5));
             this._logger.logLabeled("BULLET", "storage", "Change detected, updating rules for Cloud Storage...");
+            this._rules.content = (0, fsutils_1.readFile)(rulesFile);
             await this.loadRuleset();
         });
     }
@@ -83,10 +77,6 @@ class ResourceBasedStorageRulesManager {
         var _a;
         return (_a = this._rulesManagers.get(resource)) === null || _a === void 0 ? void 0 : _a.getRuleset();
     }
-    updateSourceFile(rules, resource) {
-        const rulesManager = this._rulesManagers.get(resource) || this.createRulesManager(resource, rules);
-        return rulesManager.updateSourceFile(rules);
-    }
     async stop() {
         await Promise.all(Array.from(this._rulesManagers.values(), async (rulesManager) => await rulesManager.stop()));
     }

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPermitted = exports.getAdminCredentialValidator = exports.getRulesValidator = void 0;
+exports.isPermitted = exports.getAdminCredentialValidator = exports.getAdminOnlyFirebaseRulesValidator = exports.getFirebaseRulesValidator = void 0;
 const emulatorLogger_1 = require("../../emulatorLogger");
 const types_1 = require("../../types");
-function getRulesValidator(rulesetProvider) {
+function getFirebaseRulesValidator(rulesetProvider) {
     return {
         validate: async (path, bucketId, method, variableOverrides, authorization) => {
             return await isPermitted({
@@ -16,7 +16,15 @@ function getRulesValidator(rulesetProvider) {
         },
     };
 }
-exports.getRulesValidator = getRulesValidator;
+exports.getFirebaseRulesValidator = getFirebaseRulesValidator;
+function getAdminOnlyFirebaseRulesValidator() {
+    return {
+        validate: (_path, _bucketId, _method, _variableOverrides, _authorization) => {
+            return Promise.resolve(true);
+        },
+    };
+}
+exports.getAdminOnlyFirebaseRulesValidator = getAdminOnlyFirebaseRulesValidator;
 function getAdminCredentialValidator() {
     return { validate: isValidAdminCredentials };
 }

package/lib/emulator/storage/server.js

@@ -8,6 +8,7 @@ const types_1 = require("../types");
 const bodyParser = require("body-parser");
 const gcloud_1 = require("./apis/gcloud");
 const firebase_1 = require("./apis/firebase");
+const errors_1 = require("../auth/errors");
 function createApp(defaultProjectId, emulator) {
     const { storageLayer } = emulator;
     const app = express();
@@ -44,21 +45,43 @@ function createApp(defaultProjectId, emulator) {
         res.sendStatus(200);
     });
     app.put("/internal/setRules", async (req, res) => {
-        const rules = req.body.rules;
-        if (!(rules && Array.isArray(rules.files) && rules.files.length > 0)) {
-            res.status(400).send("Request body must include 'rules.files' array .");
+        const rulesRaw = req.body.rules;
+        if (!(rulesRaw && Array.isArray(rulesRaw.files) && rulesRaw.files.length > 0)) {
+            res.status(400).json({
+                message: "Request body must include 'rules.files' array",
+            });
             return;
         }
-        const file = rules.files[0];
-        if (!(file.name && file.content)) {
-            res
-                .status(400)
-                .send("Request body must include 'rules.files' array where each member contains 'name' and 'content'.");
-            return;
+        const { files } = rulesRaw;
+        function parseRulesFromFiles(files) {
+            if (files.length === 1) {
+                const file = files[0];
+                if (!isRulesFile(file)) {
+                    throw new errors_1.InvalidArgumentError("Each member of 'rules.files' array must contain 'name' and 'content'");
+                }
+                return { name: file.name, content: file.content };
+            }
+            const rules = [];
+            for (const file of files) {
+                if (!isRulesFile(file) || !file.resource) {
+                    throw new errors_1.InvalidArgumentError("Each member of 'rules.files' array must contain 'name', 'content', and 'resource'");
+                }
+                rules.push({ resource: file.resource, rules: { name: file.name, content: file.content } });
+            }
+            return rules;
         }
-        const name = file.name;
-        const content = file.content;
-        const issues = await emulator.rulesManager.updateSourceFile({ name, content }, req.params.bucketId);
+        let rules;
+        try {
+            rules = parseRulesFromFiles(files);
+        }
+        catch (err) {
+            if (err instanceof errors_1.InvalidArgumentError) {
+                res.status(400).json({ message: err.message });
+                return;
+            }
+            throw err;
+        }
+        const issues = await emulator.replaceRules(rules);
         if (issues.errors.length > 0) {
             res.status(400).json({
                 message: "There was an error updating rules, see logs for more details",
@@ -78,3 +101,6 @@ function createApp(defaultProjectId, emulator) {
     return Promise.resolve(app);
 }
 exports.createApp = createApp;
+function isRulesFile(file) {
+    return (typeof file.name === "string" && typeof file.content === "string");
+}

package/lib/extensions/askUserForParam.js

@@ -12,6 +12,7 @@ const utils_1 = require("./utils");
 const logger_1 = require("../logger");
 const prompt_1 = require("../prompt");
 const utils = require("../utils");
+const projectUtils_1 = require("../projectUtils");
 var SecretLocation;
 (function (SecretLocation) {
     SecretLocation[SecretLocation["CLOUD"] = 1] = "CLOUD";
@@ -60,21 +61,21 @@ function checkResponse(response, spec) {
     return valid;
 }
 exports.checkResponse = checkResponse;
-async function ask(projectId, instanceId, paramSpecs, firebaseProjectParams, reconfiguring) {
-    if (_.isEmpty(paramSpecs)) {
+async function ask(args) {
+    if (_.isEmpty(args.paramSpecs)) {
         logger_1.logger.debug("No params were specified for this extension.");
         return {};
     }
     utils.logLabeledBullet(extensionsHelper_1.logPrefix, "answer the questions below to configure your extension:");
-    const substituted = (0, extensionsHelper_1.substituteParams)(paramSpecs, firebaseProjectParams);
+    const substituted = (0, extensionsHelper_1.substituteParams)(args.paramSpecs, args.firebaseProjectParams);
     const result = {};
     const promises = _.map(substituted, (paramSpec) => {
         return async () => {
             result[paramSpec.param] = await askForParam({
-                projectId,
-                instanceId,
-                paramSpec,
-                reconfiguring,
+                projectId: args.projectId,
+                instanceId: args.instanceId,
+                paramSpec: paramSpec,
+                reconfiguring: args.reconfiguring,
             });
         };
     });
@@ -133,9 +134,10 @@ async function askForParam(args) {
                     secretLocations = await promptSecretLocations(paramSpec);
                 } while (!isValidSecretLocations(secretLocations, paramSpec));
                 if (secretLocations.includes(SecretLocation.CLOUD.toString())) {
+                    const projectId = (0, projectUtils_1.needProjectId)({ projectId: args.projectId });
                     response = args.reconfiguring
-                        ? await promptReconfigureSecret(args.projectId, args.instanceId, paramSpec)
-                        : await promptCreateSecret(args.projectId, args.instanceId, paramSpec);
+                        ? await promptReconfigureSecret(projectId, args.instanceId, paramSpec)
+                        : await promptCreateSecret(projectId, args.instanceId, paramSpec);
                 }
                 if (secretLocations.includes(SecretLocation.LOCAL.toString())) {
                     responseForLocal = await promptLocalSecret(args.instanceId, paramSpec);
@@ -170,12 +172,12 @@ async function promptSecretLocations(paramSpec) {
             choices: [
                 {
                     checked: true,
-                    name: "Google Cloud Secret Manager",
+                    name: "Google Cloud Secret Manager (Used by deployed extensions and emulator)",
                     value: SecretLocation.CLOUD.toString(),
                 },
                 {
                     checked: false,
-                    name: "Local file (Only used by Firebase Emulator)",
+                    name: "Local file (Used by emulator only)",
                     value: SecretLocation.LOCAL.toString(),
                 },
             ],
@@ -189,25 +191,28 @@ async function promptSecretLocations(paramSpec) {
         choices: [
             {
                 checked: false,
-                name: "Google Cloud Secret Manager",
+                name: "Google Cloud Secret Manager (Used by deployed extensions and emulator)",
                 value: SecretLocation.CLOUD.toString(),
             },
             {
                 checked: false,
-                name: "Local file (Only used by Firebase Emulator)",
+                name: "Local file (Used by emulator only)",
                 value: SecretLocation.LOCAL.toString(),
             },
         ],
     });
 }
 async function promptLocalSecret(instanceId, paramSpec) {
-    utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
-    const value = await (0, prompt_1.promptOnce)({
-        name: paramSpec.param,
-        type: "input",
-        message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
-            `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
-    });
+    let value;
+    do {
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, "Configure a local secret value for Extensions Emulator");
+        value = await (0, prompt_1.promptOnce)({
+            name: paramSpec.param,
+            type: "input",
+            message: `This secret will be stored in ./extensions/${instanceId}.secret.local.\n` +
+                `Enter value for "${paramSpec.label.trim()}" to be used by Extensions Emulator:`,
+        });
+    } while (!value);
     return value;
 }
 async function promptReconfigureSecret(projectId, instanceId, paramSpec) {

package/lib/extensions/emulator/optionsHelper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParams = exports.getSecretEnvVars = exports.getNonSecretEnv = exports.getExtensionFunctionInfo = exports.buildOptions = void 0;
 const fs = require("fs-extra");
-const _ = require("lodash");
 const path = require("path");
 const paramHelper = require("../paramHelper");
 const specHelper = require("./specHelper");
@@ -159,12 +158,10 @@ function buildConfig(functionResources, testConfig) {
     return config;
 }
 function getFunctionSourceDirectory(functionResources) {
+    var _a;
     let sourceDirectory;
     for (const r of functionResources) {
-        let dir = _.get(r, "properties.sourceDirectory");
-        if (!dir) {
-            dir = "functions";
-        }
+        const dir = ((_a = r.properties) === null || _a === void 0 ? void 0 : _a.sourceDirectory) || "functions";
         if (!sourceDirectory) {
             sourceDirectory = dir;
         }
@@ -172,14 +169,15 @@ function getFunctionSourceDirectory(functionResources) {
             throw new error_1.FirebaseError(`Found function resources with different sourceDirectories: '${sourceDirectory}' and '${dir}'. The extensions emulator only supports a single sourceDirectory.`);
         }
     }
-    return sourceDirectory;
+    return sourceDirectory || "functions";
 }
 function shouldEmulateFunctions(resources) {
     return resources.length > 0;
 }
 function shouldEmulate(emulatorName, resources) {
+    var _a, _b;
     for (const r of resources) {
-        const eventType = _.get(r, "properties.eventTrigger.eventType", "");
+        const eventType = ((_b = (_a = r.properties) === null || _a === void 0 ? void 0 : _a.eventTrigger) === null || _b === void 0 ? void 0 : _b.eventType) || "";
         if (eventType.includes(emulatorName)) {
             return true;
         }