firebase-tools 10.4.2 → 10.5.0

package/lib/bin/firebase.js

@@ -20,7 +20,7 @@ marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 const updateMessage = `Update available ${clc.xterm(240)("{currentVersion}")} → ${clc.green("{latestVersion}")}\n` +
-    `To update to the latest version using npm, run ${clc.cyan("npm install -g firebase-tools")}\n` +
+    `To update to the latest version using npm, run\n${clc.cyan("npm install -g firebase-tools")}\n` +
     `For other CLI management options, visit the ${marked("[CLI documentation](https://firebase.google.com/docs/cli#update-cli)")}`;
 updateNotifier.notify({ defer: true, isGlobal: true, message: updateMessage });
 const client = require("..");

package/lib/commands/emulators-start.js

@@ -8,6 +8,7 @@ const registry_1 = require("../emulator/registry");
 const types_1 = require("../emulator/types");
 const clc = require("cli-color");
 const constants_1 = require("../emulator/constants");
+const utils_1 = require("../utils");
 const Table = require("cli-table");
 function stylizeLink(url) {
     return clc.underline(clc.bold(url));
@@ -22,8 +23,9 @@ module.exports = new command_1.Command("emulators:start")
     .option(commandUtils.FLAG_EXPORT_ON_EXIT, commandUtils.DESC_EXPORT_ON_EXIT)
     .action(async (options) => {
     const killSignalPromise = commandUtils.shutdownWhenKilled(options);
+    let deprecationNotices;
     try {
-        await controller.startAll(options);
+        ({ deprecationNotices } = await controller.startAll(options));
     }
     catch (e) {
         await controller.cleanShutdown();
@@ -85,5 +87,8 @@ ${clc.blackBright("  Other reserved ports:")} ${reservedPortsString}
 
 Issues? Report them at ${stylizeLink("https://github.com/firebase/firebase-tools/issues")} and attach the *-debug.log files.
  `);
+    for (const notice of deprecationNotices) {
+        (0, utils_1.logLabeledWarning)("emulators", notice, "warn");
+    }
     await killSignalPromise;
 });

package/lib/commands/ext-dev-emulators-start.js

@@ -19,9 +19,10 @@ module.exports = new command_1.Command("ext:dev:emulators:start")
     .action(async (options) => {
     const killSignalPromise = commandUtils.shutdownWhenKilled(options);
     const emulatorOptions = await optionsHelper.buildOptions(options);
+    let deprecationNotices;
     try {
         commandUtils.beforeEmulatorCommand(emulatorOptions);
-        await controller.startAll(emulatorOptions);
+        ({ deprecationNotices } = await controller.startAll(emulatorOptions));
     }
     catch (e) {
         await controller.cleanShutdown();
@@ -31,5 +32,8 @@ module.exports = new command_1.Command("ext:dev:emulators:start")
         throw e;
     }
     utils.logSuccess("All emulators ready, it is now safe to connect.");
+    for (const notice of deprecationNotices) {
+        utils.logLabeledWarning("emulators", notice, "warn");
+    }
     await killSignalPromise;
 });

package/lib/emulator/auth/operations.js

@@ -39,6 +39,7 @@ exports.authOperations = {
         projects: {
             createSessionCookie,
             queryAccounts,
+            updateConfig,
             accounts: {
                 _: signUp,
                 delete: deleteAccount,
@@ -1236,28 +1237,17 @@ function getEmulatorProjectConfig(state) {
         usageMode: state.usageMode,
     };
 }
-function updateEmulatorProjectConfig(state, reqBody) {
+function updateEmulatorProjectConfig(state, reqBody, ctx) {
     var _a;
-    const allowDuplicateEmails = (_a = reqBody.signIn) === null || _a === void 0 ? void 0 : _a.allowDuplicateEmails;
-    if (allowDuplicateEmails != null) {
-        (0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Only top level projects can set oneAccountPerEmail.))");
-        state.oneAccountPerEmail = !allowDuplicateEmails;
-    }
-    const usageMode = reqBody.usageMode;
-    if (usageMode != null) {
-        (0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Only top level projects can set usageMode.))");
-        switch (usageMode) {
-            case "PASSTHROUGH":
-                (0, errors_1.assert)(state.getUserCount() === 0, "Users are present, unable to set passthrough mode");
-                state.usageMode = state_1.UsageMode.PASSTHROUGH;
-                break;
-            case "DEFAULT":
-                state.usageMode = state_1.UsageMode.DEFAULT;
-                break;
-            default:
-                throw new errors_1.BadRequestError("Invalid usage mode provided");
-        }
+    const updateMask = [];
+    if (((_a = reqBody.signIn) === null || _a === void 0 ? void 0 : _a.allowDuplicateEmails) != null) {
+        updateMask.push("signIn.allowDuplicateEmails");
+    }
+    if (reqBody.usageMode) {
+        updateMask.push("usageMode");
     }
+    ctx.params.query.updateMask = updateMask.join();
+    updateConfig(state, reqBody, ctx);
     return getEmulatorProjectConfig(state);
 }
 function listOobCodesInProject(state) {
@@ -1390,6 +1380,17 @@ function mfaSignInFinalize(state, reqBody) {
         refreshToken,
     };
 }
+function updateConfig(state, reqBody, ctx) {
+    var _a;
+    (0, errors_1.assert)(state instanceof state_1.AgentProjectState, "((Can only update top-level configurations on agent projects.))");
+    for (const event in (_a = reqBody.blockingFunctions) === null || _a === void 0 ? void 0 : _a.triggers) {
+        if (Object.prototype.hasOwnProperty.call(reqBody.blockingFunctions.triggers, event)) {
+            (0, errors_1.assert)(Object.values(state_1.BlockingFunctionEvents).includes(event), "INVALID_BLOCKING_FUNCTION: ((Event type is invalid.))");
+            (0, errors_1.assert)((0, utils_1.parseAbsoluteUri)(reqBody.blockingFunctions.triggers[event].functionUri), "INVALID_BLOCKING_FUNCTION: ((Expected an absolute URI with valid scheme and host.))");
+        }
+    }
+    return state.updateConfig(reqBody, ctx.params.query.updateMask);
+}
 function coercePrimitiveToString(value) {
     switch (typeof value) {
         case "string":

package/lib/emulator/auth/state.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UsageMode = exports.TenantProjectState = exports.AgentProjectState = exports.ProjectState = exports.SIGNIN_METHOD_EMAIL_LINK = exports.PROVIDER_GAME_CENTER = exports.PROVIDER_CUSTOM = exports.PROVIDER_ANONYMOUS = exports.PROVIDER_PHONE = exports.PROVIDER_PASSWORD = void 0;
+exports.BlockingFunctionEvents = exports.UsageMode = exports.TenantProjectState = exports.AgentProjectState = exports.ProjectState = exports.SIGNIN_METHOD_EMAIL_LINK = exports.PROVIDER_GAME_CENTER = exports.PROVIDER_CUSTOM = exports.PROVIDER_ANONYMOUS = exports.PROVIDER_PHONE = exports.PROVIDER_PASSWORD = void 0;
 const utils_1 = require("./utils");
 const cloudFunctions_1 = require("./cloudFunctions");
 const errors_1 = require("./errors");
@@ -422,25 +422,28 @@ exports.ProjectState = ProjectState;
 class AgentProjectState extends ProjectState {
     constructor(projectId) {
         super(projectId);
-        this._oneAccountPerEmail = true;
-        this._usageMode = UsageMode.DEFAULT;
         this.tenantProjectForTenantId = new Map();
         this._authCloudFunction = new cloudFunctions_1.AuthCloudFunction(this.projectId);
+        this._config = {
+            signIn: { allowDuplicateEmails: false },
+            usageMode: UsageMode.DEFAULT,
+            blockingFunctions: {},
+        };
     }
     get authCloudFunction() {
         return this._authCloudFunction;
     }
     get oneAccountPerEmail() {
-        return this._oneAccountPerEmail;
+        return !this._config.signIn.allowDuplicateEmails;
     }
     set oneAccountPerEmail(oneAccountPerEmail) {
-        this._oneAccountPerEmail = oneAccountPerEmail;
+        this._config.signIn.allowDuplicateEmails = !oneAccountPerEmail;
     }
     get usageMode() {
-        return this._usageMode;
+        return this._config.usageMode;
     }
     set usageMode(usageMode) {
-        this._usageMode = usageMode;
+        this._config.usageMode = usageMode;
     }
     get allowPasswordSignup() {
         return true;
@@ -457,6 +460,31 @@ class AgentProjectState extends ProjectState {
     get enableEmailLinkSignin() {
         return true;
     }
+    get config() {
+        return this._config;
+    }
+    get blockingFunctionsConfig() {
+        return this._config.blockingFunctions;
+    }
+    set blockingFunctionsConfig(blockingFunctions) {
+        this._config.blockingFunctions = blockingFunctions;
+    }
+    updateConfig(update, updateMask) {
+        var _a, _b, _c, _d;
+        if (update.usageMode) {
+            (0, errors_1.assert)(update.usageMode !== UsageMode.USAGE_MODE_UNSPECIFIED, "INVALID_USAGE_MODE: ((Invalid usage mode provided.))");
+            if (update.usageMode === UsageMode.PASSTHROUGH) {
+                (0, errors_1.assert)(this.getUserCount() === 0, "USERS_STILL_EXIST: ((Users are present, unable to set passthrough mode.))");
+            }
+        }
+        if (!updateMask) {
+            this.oneAccountPerEmail = (_b = !((_a = update.signIn) === null || _a === void 0 ? void 0 : _a.allowDuplicateEmails)) !== null && _b !== void 0 ? _b : true;
+            this.blockingFunctionsConfig = (_c = update.blockingFunctions) !== null && _c !== void 0 ? _c : {};
+            this.usageMode = (_d = update.usageMode) !== null && _d !== void 0 ? _d : UsageMode.DEFAULT;
+            return this.config;
+        }
+        return applyMask(updateMask, this.config, update);
+    }
     getTenantProject(tenantId) {
         if (!this.tenantProjectForTenantId.has(tenantId)) {
             this.createTenantWithTenantId(tenantId, {
@@ -574,40 +602,21 @@ class TenantProjectState extends ProjectState {
             };
             return this.tenantConfig;
         }
-        const paths = updateMask.split(",");
-        for (const path of paths) {
-            const fields = path.split(".");
-            let updateField = update;
-            let existingField = this._tenantConfig;
-            let field;
-            for (let i = 0; i < fields.length - 1; i++) {
-                field = fields[i];
-                if (updateField[field] == null) {
-                    console.warn(`Unable to find field '${field}' in update '${updateField}`);
-                    break;
-                }
-                if (Array.isArray(updateField[field]) ||
-                    Object(updateField[field]) !== updateField[field]) {
-                    console.warn(`Field '${field}' is singular and cannot have sub-fields`);
-                    break;
-                }
-                if (!existingField[field]) {
-                    existingField[field] = {};
-                }
-                updateField = updateField[field];
-                existingField = existingField[field];
-            }
-            field = fields[fields.length - 1];
-            if (updateField[field] == null) {
-                console.warn(`Unable to find field '${field}' in update '${JSON.stringify(updateField)}`);
-                continue;
-            }
-            existingField[field] = updateField[field];
-        }
-        return this.tenantConfig;
+        return applyMask(updateMask, this.tenantConfig, update);
     }
 }
 exports.TenantProjectState = TenantProjectState;
+var UsageMode;
+(function (UsageMode) {
+    UsageMode["USAGE_MODE_UNSPECIFIED"] = "USAGE_MODE_UNSPECIFIED";
+    UsageMode["DEFAULT"] = "DEFAULT";
+    UsageMode["PASSTHROUGH"] = "PASSTHROUGH";
+})(UsageMode = exports.UsageMode || (exports.UsageMode = {}));
+var BlockingFunctionEvents;
+(function (BlockingFunctionEvents) {
+    BlockingFunctionEvents["BEFORE_CREATE"] = "beforeCreate";
+    BlockingFunctionEvents["BEFORE_SIGN_IN"] = "beforeSignIn";
+})(BlockingFunctionEvents = exports.BlockingFunctionEvents || (exports.BlockingFunctionEvents = {}));
 function getProviderEmailsForUser(user) {
     var _a;
     const emails = new Set();
@@ -618,8 +627,35 @@ function getProviderEmailsForUser(user) {
     });
     return emails;
 }
-var UsageMode;
-(function (UsageMode) {
-    UsageMode["DEFAULT"] = "DEFAULT";
-    UsageMode["PASSTHROUGH"] = "PASSTHROUGH";
-})(UsageMode = exports.UsageMode || (exports.UsageMode = {}));
+function applyMask(updateMask, dest, update) {
+    const paths = updateMask.split(",");
+    for (const path of paths) {
+        const fields = path.split(".");
+        let updateField = update;
+        let existingField = dest;
+        let field;
+        for (let i = 0; i < fields.length - 1; i++) {
+            field = fields[i];
+            if (updateField[field] == null) {
+                console.warn(`Unable to find field '${field}' in update '${updateField}`);
+                break;
+            }
+            if (Array.isArray(updateField[field]) || Object(updateField[field]) !== updateField[field]) {
+                console.warn(`Field '${field}' is singular and cannot have sub-fields`);
+                break;
+            }
+            if (!existingField[field]) {
+                existingField[field] = {};
+            }
+            updateField = updateField[field];
+            existingField = existingField[field];
+        }
+        field = fields[fields.length - 1];
+        if (updateField[field] == null) {
+            console.warn(`Unable to find field '${field}' in update '${JSON.stringify(updateField)}`);
+            continue;
+        }
+        existingField[field] = updateField[field];
+    }
+    return dest;
+}

package/lib/emulator/commandUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
+exports.JAVA_DEPRECATION_WARNING = exports.checkJavaSupported = exports.emulatorExec = exports.shutdownWhenKilled = exports.setExportOnExitOptions = exports.parseInspectionPort = exports.beforeEmulatorCommand = exports.warnEmulatorNotSupported = exports.printNoticeIfEmulated = exports.DESC_TEST_PARAMS = exports.FLAG_TEST_PARAMS = exports.DESC_TEST_CONFIG = exports.FLAG_TEST_CONFIG = exports.DESC_UI = exports.FLAG_UI = exports.EXPORT_ON_EXIT_CWD_DANGER = exports.EXPORT_ON_EXIT_USAGE_ERROR = exports.DESC_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT = exports.FLAG_EXPORT_ON_EXIT_NAME = exports.DESC_IMPORT = exports.FLAG_IMPORT = exports.DESC_INSPECT_FUNCTIONS = exports.FLAG_INSPECT_FUNCTIONS = exports.DESC_ONLY = exports.FLAG_ONLY = void 0;
 const clc = require("cli-color");
 const childProcess = require("child_process");
 const controller = require("../emulator/controller");
@@ -287,15 +287,19 @@ async function emulatorExec(script, options) {
         extraEnv.GCLOUD_PROJECT = projectId;
     }
     let exitCode = 0;
+    let deprecationNotices;
     try {
         const showUI = !!options.ui;
-        await controller.startAll(options, showUI);
+        ({ deprecationNotices } = await controller.startAll(options, showUI));
         exitCode = await runScript(script, extraEnv);
         await (0, controller_1.onExit)(options);
     }
     finally {
         await controller.cleanShutdown();
     }
+    for (const notice of deprecationNotices) {
+        utils.logLabeledWarning("emulators", notice, "warn");
+    }
     if (exitCode !== 0) {
         throw new error_1.FirebaseError(`Script "${clc.bold(script)}" exited with code ${exitCode}`, {
             exit: exitCode,
@@ -303,3 +307,69 @@ async function emulatorExec(script, options) {
     }
 }
 exports.emulatorExec = emulatorExec;
+const JAVA_VERSION_REGEX = /version "([1-9][0-9]*)/;
+const MIN_SUPPORTED_JAVA_MAJOR_VERSION = 11;
+const JAVA_HINT = "Please make sure Java is installed and on your system PATH.";
+async function checkJavaSupported() {
+    return new Promise((resolve, reject) => {
+        var _a, _b;
+        let child;
+        try {
+            child = childProcess.spawn("java", ["-Duser.language=en", "-Dfile.encoding=UTF-8", "-version"], {
+                stdio: ["inherit", "pipe", "pipe"],
+            });
+        }
+        catch (err) {
+            return reject(new error_1.FirebaseError(`Could not spawn \`java -version\`. ${JAVA_HINT}`, { original: err }));
+        }
+        let output = "";
+        let error = "";
+        (_a = child.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
+            const str = data.toString("utf8");
+            logger_1.logger.debug(str);
+            output += str;
+        });
+        (_b = child.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
+            const str = data.toString("utf8");
+            logger_1.logger.debug(str);
+            error += str;
+        });
+        child.once("error", (err) => {
+            reject(new error_1.FirebaseError(`Could not spawn \`java -version\`. ${JAVA_HINT}`, { original: err }));
+        });
+        child.once("exit", (code, signal) => {
+            if (signal) {
+                reject(new error_1.FirebaseError(`Process \`java -version\` was killed by signal ${signal}.`));
+            }
+            else if (code && code !== 0) {
+                reject(new error_1.FirebaseError(`Process \`java -version\` has exited with code ${code}. ${JAVA_HINT}\n` +
+                    `-----Original stdout-----\n${output}` +
+                    `-----Original stderr-----\n${error}`));
+            }
+            else {
+                resolve(`${output}\n${error}`);
+            }
+        });
+    }).then((output) => {
+        const match = output.match(JAVA_VERSION_REGEX);
+        if (match) {
+            const version = match[1];
+            const versionInt = parseInt(version, 10);
+            if (!versionInt) {
+                utils.logLabeledWarning("emulators", `Failed to parse Java version. Got "${match[0]}".`, "warn");
+            }
+            else {
+                logger_1.logger.debug(`Parsed Java major version: ${versionInt}`);
+                return versionInt >= MIN_SUPPORTED_JAVA_MAJOR_VERSION;
+            }
+        }
+        else {
+            logger_1.logger.debug("java -version outputs:", output);
+            logger_1.logger.warn(`Failed to parse Java version.`);
+        }
+        return false;
+    });
+}
+exports.checkJavaSupported = checkJavaSupported;
+exports.JAVA_DEPRECATION_WARNING = "Support for Java version <= 10 will be dropped soon in firebase-tools@11. " +
+    "Please upgrade to Java version 11 or above to continue using the emulators.";

package/lib/emulator/controller.js

@@ -39,6 +39,7 @@ const auth_2 = require("../auth");
 const extensionsEmulator_1 = require("./extensionsEmulator");
 const previews_1 = require("../previews");
 const projectConfig_1 = require("../functions/projectConfig");
+const downloadableEmulators_1 = require("./downloadableEmulators");
 const START_LOGGING_EMULATOR = utils.envOverride("START_LOGGING_EMULATOR", "false", (val) => val === "true");
 async function getAndCheckAddress(emulator, options) {
     var _a, _b, _c, _d;
@@ -216,6 +217,13 @@ async function startAll(options, showUI = true) {
     if (targets.length === 0) {
         throw new error_1.FirebaseError(`No emulators to start, run ${clc.bold("firebase init emulators")} to get started.`);
     }
+    const deprecationNotices = [];
+    if (targets.some(downloadableEmulators_1.requiresJava)) {
+        if (!(await commandUtils.checkJavaSupported())) {
+            utils.logLabeledWarning("emulators", commandUtils_1.JAVA_DEPRECATION_WARNING, "warn");
+            deprecationNotices.push(commandUtils_1.JAVA_DEPRECATION_WARNING);
+        }
+    }
     const hubLogger = emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.HUB);
     hubLogger.logLabeled("BULLET", "emulators", `Starting emulators: ${targets.join(", ")}`);
     const projectId = (0, projectUtils_1.getProjectId)(options) || "";
@@ -479,6 +487,7 @@ async function startAll(options, showUI = true) {
             await instance.connect();
         }
     }
+    return { deprecationNotices };
 }
 exports.startAll = startAll;
 async function exportEmulatorData(exportPath, options) {

package/lib/emulator/downloadableEmulators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = exports.DownloadDetails = void 0;
+exports.start = exports.downloadIfNecessary = exports.stop = exports.getPID = exports.get = exports.getDownloadDetails = exports.requiresJava = exports.handleEmulatorProcessError = exports._getCommand = exports.getLogFileName = exports.DownloadDetails = void 0;
 const types_1 = require("./types");
 const constants_1 = require("./constants");
 const error_1 = require("../error");
@@ -29,13 +29,13 @@ exports.DownloadDetails = {
         },
     },
     firestore: {
-        downloadPath: path.join(CACHE_DIR, "cloud-firestore-emulator-v1.13.1.jar"),
-        version: "1.13.1",
+        downloadPath: path.join(CACHE_DIR, "cloud-firestore-emulator-v1.14.1.jar"),
+        version: "1.14.1",
         opts: {
             cacheDir: CACHE_DIR,
-            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.13.1.jar",
-            expectedSize: 60486708,
-            expectedChecksum: "e0590880408eacb790874643147c0081",
+            remoteUrl: "https://storage.googleapis.com/firebase-preview-drop/emulator/cloud-firestore-emulator-v1.14.1.jar",
+            expectedSize: 60416634,
+            expectedChecksum: "33cffe8065d4250816f257eb19245932",
             namePrefix: "cloud-firestore-emulator",
         },
     },
@@ -236,6 +236,13 @@ async function handleEmulatorProcessError(emulator, err) {
     }
 }
 exports.handleEmulatorProcessError = handleEmulatorProcessError;
+function requiresJava(emulator) {
+    if (emulator in Commands) {
+        return Commands[emulator].binary === "java";
+    }
+    return false;
+}
+exports.requiresJava = requiresJava;
 async function _runBinary(emulator, command, extraEnv) {
     return new Promise((resolve) => {
         var _a, _b;

package/lib/emulator/shared/request.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.reqBodyToBuffer = void 0;
+async function reqBodyToBuffer(req) {
+    if (req.body instanceof Buffer) {
+        return Buffer.from(req.body);
+    }
+    const bufs = [];
+    req.on("data", (data) => {
+        bufs.push(data);
+    });
+    await new Promise((resolve) => {
+        req.on("end", () => {
+            resolve();
+        });
+    });
+    return Buffer.concat(bufs);
+}
+exports.reqBodyToBuffer = reqBodyToBuffer;

package/lib/emulator/storage/apis/firebase.js

@@ -10,6 +10,7 @@ const registry_1 = require("../../registry");
 const multipart_1 = require("../multipart");
 const errors_1 = require("../errors");
 const upload_1 = require("../upload");
+const request_1 = require("../../shared/request");
 function createFirebaseEndpoints(emulator) {
     const firebaseStorageAPI = (0, express_1.Router)();
     const { storageLayer, uploadService } = emulator;
@@ -71,7 +72,7 @@ function createFirebaseEndpoints(emulator) {
         let metadata;
         let data;
         try {
-            ({ metadata, data } = await storageLayer.handleGetObject({
+            ({ metadata, data } = await storageLayer.getObject({
                 bucketId: req.params.bucketId,
                 decodedObjectId: decodeURIComponent(req.params.objectId),
                 authorization: req.header("authorization"),
@@ -117,11 +118,11 @@ function createFirebaseEndpoints(emulator) {
         return res.json(new metadata_1.OutgoingFirebaseMetadata(metadata));
     });
     firebaseStorageAPI.get("/b/:bucketId/o", async (req, res) => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const maxResults = (_a = req.query.maxResults) === null || _a === void 0 ? void 0 : _a.toString();
-        let response;
+        let listResponse;
         try {
-            response = await storageLayer.handleListObjects({
+            listResponse = await storageLayer.listObjects({
                 bucketId: req.params.bucketId,
                 prefix: req.query.prefix ? req.query.prefix.toString() : "",
                 delimiter: req.query.delimiter ? req.query.delimiter.toString() : "",
@@ -141,23 +142,14 @@ function createFirebaseEndpoints(emulator) {
             }
             throw err;
         }
-        return res.json(response);
-    });
-    const reqBodyToBuffer = async (req) => {
-        if (req.body instanceof Buffer) {
-            return Buffer.from(req.body);
-        }
-        const bufs = [];
-        req.on("data", (data) => {
-            bufs.push(data);
+        return res.status(200).json({
+            nextPageToken: listResponse.nextPageToken,
+            prefixes: (_c = listResponse.prefixes) !== null && _c !== void 0 ? _c : [],
+            items: (_e = (_d = listResponse.items) === null || _d === void 0 ? void 0 : _d.map((item) => {
+                return { name: item.name, bucket: item.bucket };
+            })) !== null && _e !== void 0 ? _e : [],
         });
-        await new Promise((resolve) => {
-            req.on("end", () => {
-                resolve();
-            });
-        });
-        return Buffer.concat(bufs);
-    };
+    });
     const handleUpload = async (req, res) => {
         if (!req.query.name) {
             res.sendStatus(400);
@@ -174,7 +166,7 @@ function createFirebaseEndpoints(emulator) {
             let metadataRaw;
             let dataRaw;
             try {
-                ({ metadataRaw, dataRaw } = (0, multipart_1.parseObjectUploadMultipartRequest)(contentTypeHeader, await reqBodyToBuffer(req)));
+                ({ metadataRaw, dataRaw } = (0, multipart_1.parseObjectUploadMultipartRequest)(contentTypeHeader, await (0, request_1.reqBodyToBuffer)(req)));
             }
             catch (err) {
                 if (err instanceof Error) {
@@ -196,7 +188,7 @@ function createFirebaseEndpoints(emulator) {
             });
             let metadata;
             try {
-                metadata = await storageLayer.handleUploadObject(upload);
+                metadata = await storageLayer.uploadObject(upload);
             }
             catch (err) {
                 if (err instanceof errors_1.ForbiddenError) {
@@ -268,7 +260,7 @@ function createFirebaseEndpoints(emulator) {
         if (uploadCommand.includes("upload")) {
             let upload;
             try {
-                upload = uploadService.continueResumableUpload(uploadId, await reqBodyToBuffer(req));
+                upload = uploadService.continueResumableUpload(uploadId, await (0, request_1.reqBodyToBuffer)(req));
             }
             catch (err) {
                 if (err instanceof errors_1.NotFoundError) {
@@ -301,7 +293,7 @@ function createFirebaseEndpoints(emulator) {
             }
             let metadata;
             try {
-                metadata = await storageLayer.handleUploadObject(upload);
+                metadata = await storageLayer.uploadObject(upload);
             }
             catch (err) {
                 if (err instanceof errors_1.ForbiddenError) {
@@ -333,7 +325,7 @@ function createFirebaseEndpoints(emulator) {
                 return res.sendStatus(400);
             }
             try {
-                metadata = storageLayer.handleCreateDownloadToken({
+                metadata = storageLayer.createDownloadToken({
                     bucketId,
                     decodedObjectId,
                     authorization,
@@ -356,7 +348,7 @@ function createFirebaseEndpoints(emulator) {
         }
         else {
             try {
-                metadata = storageLayer.handleDeleteDownloadToken({
+                metadata = storageLayer.deleteDownloadToken({
                     bucketId,
                     decodedObjectId,
                     token: (_b = (_a = req.query["delete_token"]) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : "",
@@ -390,7 +382,7 @@ function createFirebaseEndpoints(emulator) {
     const handleMetadataUpdate = async (req, res) => {
         let metadata;
         try {
-            metadata = await storageLayer.handleUpdateObjectMetadata({
+            metadata = await storageLayer.updateObjectMetadata({
                 bucketId: req.params.bucketId,
                 decodedObjectId: decodeURIComponent(req.params.objectId),
                 metadata: req.body,
@@ -427,7 +419,7 @@ function createFirebaseEndpoints(emulator) {
     firebaseStorageAPI.post("/b/:bucketId/o/:objectId?", handleObjectPostRequest);
     firebaseStorageAPI.delete("/b/:bucketId/o/:objectId", async (req, res) => {
         try {
-            await storageLayer.handleDeleteObject({
+            await storageLayer.deleteObject({
                 bucketId: req.params.bucketId,
                 decodedObjectId: decodeURIComponent(req.params.objectId),
                 authorization: req.header("authorization"),

package/lib/emulator/storage/apis/gcloud.js

@@ -11,33 +11,34 @@ const crc_1 = require("../crc");
 const multipart_1 = require("../multipart");
 const upload_1 = require("../upload");
 const errors_1 = require("../errors");
+const request_1 = require("../../shared/request");
 function createCloudEndpoints(emulator) {
     const gcloudStorageAPI = (0, express_1.Router)();
-    const { storageLayer, uploadService } = emulator;
+    const { adminStorageLayer, uploadService } = emulator;
     gcloudStorageAPI.use(/.*\/b\/(.+?)\/.*/, (req, res, next) => {
-        storageLayer.createBucket(req.params[0]);
+        adminStorageLayer.createBucket(req.params[0]);
         next();
     });
     gcloudStorageAPI.get("/b", async (req, res) => {
         res.json({
             kind: "storage#buckets",
-            items: await storageLayer.listBuckets(),
+            items: await adminStorageLayer.listBuckets(),
         });
     });
     gcloudStorageAPI.get(["/b/:bucketId/o/:objectId", "/download/storage/v1/b/:bucketId/o/:objectId"], async (req, res) => {
         let getObjectResponse;
         try {
-            getObjectResponse = await storageLayer.handleGetObject({
+            getObjectResponse = await adminStorageLayer.getObject({
                 bucketId: req.params.bucketId,
                 decodedObjectId: req.params.objectId,
-            }, true);
+            });
         }
         catch (err) {
             if (err instanceof errors_1.NotFoundError) {
                 return sendObjectNotFound(req, res);
             }
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
@@ -49,67 +50,67 @@ function createCloudEndpoints(emulator) {
     gcloudStorageAPI.patch("/b/:bucketId/o/:objectId", async (req, res) => {
         let updatedMetadata;
         try {
-            updatedMetadata = await storageLayer.handleUpdateObjectMetadata({
+            updatedMetadata = await adminStorageLayer.updateObjectMetadata({
                 bucketId: req.params.bucketId,
                 decodedObjectId: req.params.objectId,
                 metadata: req.body,
-            }, true);
+            });
         }
         catch (err) {
             if (err instanceof errors_1.NotFoundError) {
                 return sendObjectNotFound(req, res);
             }
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
         return res.json(new metadata_1.CloudStorageObjectMetadata(updatedMetadata));
     });
-    gcloudStorageAPI.get("/b/:bucketId/o", (req, res) => {
-        let maxRes = undefined;
-        if (req.query.maxResults) {
-            maxRes = +req.query.maxResults.toString();
-        }
-        const delimiter = req.query.delimiter ? req.query.delimiter.toString() : "";
-        const pageToken = req.query.pageToken ? req.query.pageToken.toString() : undefined;
-        const prefix = req.query.prefix ? req.query.prefix.toString() : "";
-        const listResult = storageLayer.listItems(req.params.bucketId, prefix, delimiter, pageToken, maxRes);
-        res.json(Object.assign(Object.assign({}, listResult), { kind: "#storage/objects" }));
+    gcloudStorageAPI.get("/b/:bucketId/o", async (req, res) => {
+        var _a;
+        let listResponse;
+        try {
+            listResponse = await adminStorageLayer.listObjects({
+                bucketId: req.params.bucketId,
+                prefix: req.query.prefix ? req.query.prefix.toString() : "",
+                delimiter: req.query.delimiter ? req.query.delimiter.toString() : "",
+                pageToken: req.query.pageToken ? req.query.pageToken.toString() : undefined,
+                maxResults: req.query.maxResults ? +req.query.maxResults.toString() : undefined,
+                authorization: req.header("authorization"),
+            });
+        }
+        catch (err) {
+            if (err instanceof errors_1.ForbiddenError) {
+                return res.sendStatus(403);
+            }
+            throw err;
+        }
+        return res.status(200).json({
+            kind: "#storage/objects",
+            nextPageToken: listResponse.nextPageToken,
+            prefixes: listResponse.prefixes,
+            items: (_a = listResponse.items) === null || _a === void 0 ? void 0 : _a.map((item) => new metadata_1.CloudStorageObjectMetadata(item)),
+        });
     });
     gcloudStorageAPI.delete("/b/:bucketId/o/:objectId", async (req, res) => {
         try {
-            await storageLayer.handleDeleteObject({
+            await adminStorageLayer.deleteObject({
                 bucketId: req.params.bucketId,
                 decodedObjectId: req.params.objectId,
-            }, true);
+            });
         }
         catch (err) {
             if (err instanceof errors_1.NotFoundError) {
                 return sendObjectNotFound(req, res);
             }
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
         return res.sendStatus(204);
     });
-    const reqBodyToBuffer = async (req) => {
-        if (req.body instanceof Buffer) {
-            return Buffer.from(req.body);
-        }
-        const bufs = [];
-        req.on("data", (data) => {
-            bufs.push(data);
-        });
-        await new Promise((resolve) => {
-            req.on("end", () => {
-                resolve();
-            });
-        });
-        return Buffer.concat(bufs);
-    };
     gcloudStorageAPI.put("/upload/storage/v1/b/:bucketId/o", async (req, res) => {
         if (!req.query.upload_id) {
             res.sendStatus(400);
@@ -118,7 +119,7 @@ function createCloudEndpoints(emulator) {
         const uploadId = req.query.upload_id.toString();
         let upload;
         try {
-            uploadService.continueResumableUpload(uploadId, await reqBodyToBuffer(req));
+            uploadService.continueResumableUpload(uploadId, await (0, request_1.reqBodyToBuffer)(req));
             upload = uploadService.finalizeResumableUpload(uploadId);
         }
         catch (err) {
@@ -132,11 +133,11 @@ function createCloudEndpoints(emulator) {
         }
         let metadata;
         try {
-            metadata = await storageLayer.handleUploadObject(upload, true);
+            metadata = await adminStorageLayer.uploadObject(upload);
         }
         catch (err) {
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
@@ -147,17 +148,17 @@ function createCloudEndpoints(emulator) {
         emulatorLogger_1.EmulatorLogger.forEmulator(types_1.Emulators.STORAGE).log("WARN_ONCE", "Cloud Storage ACLs are not supported in the Storage Emulator. All related methods will succeed, but have no effect.");
         let getObjectResponse;
         try {
-            getObjectResponse = await storageLayer.handleGetObject({
+            getObjectResponse = await adminStorageLayer.getObject({
                 bucketId: req.params.bucketId,
                 decodedObjectId: req.params.objectId,
-            }, true);
+            });
         }
         catch (err) {
             if (err instanceof errors_1.NotFoundError) {
                 return sendObjectNotFound(req, res);
             }
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
@@ -206,7 +207,7 @@ function createCloudEndpoints(emulator) {
         let metadataRaw;
         let dataRaw;
         try {
-            ({ metadataRaw, dataRaw } = (0, multipart_1.parseObjectUploadMultipartRequest)(contentTypeHeader, await reqBodyToBuffer(req)));
+            ({ metadataRaw, dataRaw } = (0, multipart_1.parseObjectUploadMultipartRequest)(contentTypeHeader, await (0, request_1.reqBodyToBuffer)(req)));
         }
         catch (err) {
             return res.status(400).json({
@@ -225,11 +226,11 @@ function createCloudEndpoints(emulator) {
         });
         let metadata;
         try {
-            metadata = await storageLayer.handleUploadObject(upload, true);
+            metadata = await adminStorageLayer.uploadObject(upload);
         }
         catch (err) {
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
@@ -238,34 +239,45 @@ function createCloudEndpoints(emulator) {
     gcloudStorageAPI.get("/:bucketId/:objectId(**)", async (req, res) => {
         let getObjectResponse;
         try {
-            getObjectResponse = await storageLayer.handleGetObject({
+            getObjectResponse = await adminStorageLayer.getObject({
                 bucketId: req.params.bucketId,
                 decodedObjectId: req.params.objectId,
-            }, true);
+            });
         }
         catch (err) {
             if (err instanceof errors_1.NotFoundError) {
                 return sendObjectNotFound(req, res);
             }
             if (err instanceof errors_1.ForbiddenError) {
-                throw new Error("Request failed unexpectedly due to Firebase Rules.");
+                return res.sendStatus(403);
             }
             throw err;
         }
         return sendFileBytes(getObjectResponse.metadata, getObjectResponse.data, req, res);
     });
     gcloudStorageAPI.post("/b/:bucketId/o/:objectId/:method(rewriteTo|copyTo)/b/:destBucketId/o/:destObjectId", (req, res, next) => {
-        const md = storageLayer.getMetadata(req.params.bucketId, req.params.objectId);
-        if (!md) {
-            return sendObjectNotFound(req, res);
-        }
         if (req.params.method === "rewriteTo" && req.query.rewriteToken) {
             return next();
         }
-        const metadata = storageLayer.copyFile(md, req.params.destBucketId, req.params.destObjectId, req.body);
-        if (!metadata) {
-            res.sendStatus(400);
-            return;
+        let metadata;
+        try {
+            metadata = adminStorageLayer.copyObject({
+                sourceBucket: req.params.bucketId,
+                sourceObject: req.params.objectId,
+                destinationBucket: req.params.destBucketId,
+                destinationObject: req.params.destObjectId,
+                incomingMetadata: req.body,
+                authorization: "Bearer owner",
+            });
+        }
+        catch (err) {
+            if (err instanceof errors_1.NotFoundError) {
+                return sendObjectNotFound(req, res);
+            }
+            if (err instanceof errors_1.ForbiddenError) {
+                return res.sendStatus(403);
+            }
+            throw err;
         }
         const resource = new metadata_1.CloudStorageObjectMetadata(metadata);
         res.status(200);

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,7 @@ 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));
+        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 +166,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 +200,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 +253,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 +262,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 +276,7 @@ class StorageLayer {
         metadata.addDownloadToken();
         return metadata;
     }
-    handleDeleteDownloadToken(request) {
+    deleteDownloadToken(request) {
         if (!this._adminCredsValidator.validate(request.authorization)) {
             throw new errors_1.ForbiddenError();
         }

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._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();
     }

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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "firebase-tools",
-  "version": "10.4.2",
+  "version": "10.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "firebase-tools",
-      "version": "10.4.2",
+      "version": "10.5.0",
       "license": "MIT",
       "dependencies": {
         "@google-cloud/pubsub": "^2.18.4",

package/package.json

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

package/lib/emulator/storage/list.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ListResponse = exports.ListItem = void 0;
-class ListItem {
-    constructor(name, bucket) {
-        this.name = name;
-        this.bucket = bucket;
-    }
-}
-exports.ListItem = ListItem;
-class ListResponse {
-    constructor(prefixes, items, nextPageToken) {
-        this.prefixes = prefixes;
-        this.items = items;
-        this.nextPageToken = nextPageToken;
-    }
-}
-exports.ListResponse = ListResponse;