firebase-tools 11.0.0 → 11.0.1

package/lib/appdistribution/client.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppDistributionClient = exports.UploadReleaseResult = exports.IntegrationState = void 0;
 const _ = require("lodash");
-const api = require("../api");
 const utils = require("../utils");
 const operationPoller = require("../operation-poller");
 const error_1 = require("../error");
 const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
 var IntegrationState;
 (function (IntegrationState) {
     IntegrationState["AAB_INTEGRATION_STATE_UNSPECIFIED"] = "AAB_INTEGRATION_STATE_UNSPECIFIED";
@@ -27,35 +27,33 @@ var UploadReleaseResult;
 class AppDistributionClient {
     constructor() {
         this.appDistroV2Client = new apiv2_1.Client({
-            urlPrefix: api.appDistributionOrigin,
+            urlPrefix: api_1.appDistributionOrigin,
             apiVersion: "v1",
         });
     }
     async getAabInfo(appName) {
-        const apiResponse = await api.request("GET", `/v1/${appName}/aabInfo`, {
-            origin: api.appDistributionOrigin,
-            auth: true,
-        });
-        return _.get(apiResponse, "body");
+        const apiResponse = await this.appDistroV2Client.get(`/${appName}/aabInfo`);
+        return apiResponse.body;
     }
     async uploadRelease(appName, distribution) {
-        const apiResponse = await api.request("POST", `/upload/v1/${appName}/releases:upload`, {
-            auth: true,
-            origin: api.appDistributionOrigin,
+        const client = new apiv2_1.Client({ urlPrefix: api_1.appDistributionOrigin });
+        const apiResponse = await client.request({
+            method: "POST",
+            path: `/upload/v1/${appName}/releases:upload`,
             headers: {
                 "X-Goog-Upload-File-Name": distribution.getFileName(),
                 "X-Goog-Upload-Protocol": "raw",
                 "Content-Type": "application/octet-stream",
             },
-            data: distribution.readStream(),
-            json: false,
+            responseType: "json",
+            body: distribution.readStream(),
         });
-        return _.get(JSON.parse(apiResponse.body), "name");
+        return apiResponse.body.name;
     }
     async pollUploadStatus(operationName) {
         return operationPoller.pollOperation({
             pollerName: "App Distribution Upload Poller",
-            apiOrigin: api.appDistributionOrigin,
+            apiOrigin: api_1.appDistributionOrigin,
             apiVersion: "v1",
             operationResourceName: operationName,
             masterTimeout: 5 * 60 * 1000,
@@ -75,15 +73,12 @@ class AppDistributionClient {
                 text: releaseNotes,
             },
         };
+        const queryParams = { updateMask: "release_notes.text" };
         try {
-            await api.request("PATCH", `/v1/${releaseName}?updateMask=release_notes.text`, {
-                origin: api.appDistributionOrigin,
-                auth: true,
-                data,
-            });
+            await this.appDistroV2Client.patch(`/${releaseName}`, data, { queryParams });
         }
         catch (err) {
-            throw new error_1.FirebaseError(`failed to update release notes with ${err === null || err === void 0 ? void 0 : err.message}`, { exit: 1 });
+            throw new error_1.FirebaseError(`failed to update release notes with ${err === null || err === void 0 ? void 0 : err.message}`);
         }
         utils.logSuccess("added release notes successfully");
     }
@@ -98,11 +93,7 @@ class AppDistributionClient {
             groupAliases,
         };
         try {
-            await api.request("POST", `/v1/${releaseName}:distribute`, {
-                origin: api.appDistributionOrigin,
-                auth: true,
-                data,
-            });
+            await this.appDistroV2Client.post(`/${releaseName}:distribute`, data);
         }
         catch (err) {
             let errorMessage = err.message;

package/lib/commands/ext-configure.js

@@ -23,6 +23,7 @@ marked.setOptions({
 exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
     .description("configure an existing extension instance")
     .withForce()
+    .option("--local", "deprecated")
     .before(requirePermissions_1.requirePermissions, [
     "firebaseextensions.instances.update",
     "firebaseextensions.instances.get",
@@ -35,6 +36,9 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
         throw new error_1.FirebaseError(`Command not supported in non-interactive mode, edit ./extensions/${instanceId}.env directly instead. ` +
             `See https://firebase.google.com/docs/extensions/manifest for more details.`);
     }
+    if (options.local) {
+        utils.logLabeledWarning(extensionsHelper_1.logPrefix, "As of firebase-tools@11.0.0, the `--local` flag is no longer required, as it is the default behavior.");
+    }
     const config = manifest.loadConfig(options);
     const refOrPath = manifest.getInstanceTarget(instanceId, config);
     const isLocalSource = (0, extensionsHelper_1.isLocalPath)(refOrPath);

package/lib/commands/ext-install.js

@@ -29,6 +29,7 @@ exports.default = new command_1.Command("ext:install [extensionName]")
         ? "install a local extension if [localPathOrUrl] or [url#root] is provided; install a published extension (not authored by Firebase) if [publisherId/extensionId] is provided "
         : "") +
     "or run with `-i` to see all available extensions.")
+    .option("--local", "deprecated")
     .withForce()
     .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.create"])
     .before(extensionsHelper_1.ensureExtensionsApiEnabled)
@@ -55,6 +56,9 @@ exports.default = new command_1.Command("ext:install [extensionName]")
     if ((0, extensionsHelper_1.isUrlPath)(extensionName)) {
         throw new error_1.FirebaseError(`Installing with a source url is no longer supported in the CLI. Please use Firebase Console instead.`);
     }
+    if (options.local) {
+        utils.logLabeledWarning(extensionsHelper_1.logPrefix, "As of firebase-tools@11.0.0, the `--local` flag is no longer required, as it is the default behavior.");
+    }
     if ((0, extensionsHelper_1.isLocalPath)(extensionName)) {
         source = await (0, extensionsHelper_1.createSourceFromLocation)((0, projectUtils_1.needProjectId)({ projectId }), extensionName);
         (0, displayExtensionInfo_1.displayExtInfo)(extensionName, "", source.spec);

package/lib/commands/ext-uninstall.js

@@ -6,18 +6,23 @@ const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
 const requirePermissions_1 = require("../requirePermissions");
+const utils_1 = require("../utils");
 const manifest = require("../extensions/manifest");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
 exports.default = new command_1.Command("ext:uninstall <extensionInstanceId>")
     .description("uninstall an extension that is installed in your Firebase project by instance ID")
+    .option("--local", "deprecated")
     .withForce()
     .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.delete"])
     .before(extensionsHelper_1.ensureExtensionsApiEnabled)
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
     .before(extensionsHelper_1.diagnoseAndFixProject)
     .action((instanceId, options) => {
+    if (options.local) {
+        (0, utils_1.logLabeledWarning)(extensionsHelper_1.logPrefix, "As of firebase-tools@11.0.0, the `--local` flag is no longer required, as it is the default behavior.");
+    }
     const config = manifest.loadConfig(options);
     manifest.removeFromManifest(instanceId, config);
     manifest.showPostDeprecationNotice();

package/lib/commands/ext-update.js

@@ -31,10 +31,14 @@ exports.default = new command_1.Command("ext:update <extensionInstanceId> [updat
     .before(extensionsHelper_1.ensureExtensionsApiEnabled)
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
     .before(extensionsHelper_1.diagnoseAndFixProject)
+    .option("--local", "deprecated")
     .withForce()
     .action(async (instanceId, updateSource, options) => {
     const projectId = (0, projectUtils_1.getProjectId)(options);
     const config = manifest.loadConfig(options);
+    if (options.local) {
+        utils.logLabeledWarning(extensionsHelper_1.logPrefix, "As of firebase-tools@11.0.0, the `--local` flag is no longer required, as it is the default behavior.");
+    }
     const oldRefOrPath = manifest.getInstanceTarget(instanceId, config);
     if ((0, extensionsHelper_1.isLocalPath)(oldRefOrPath)) {
         throw new error_1.FirebaseError(`Updating an extension with local source is not neccessary. ` +

package/lib/deploy/remoteconfig/functions.js

@@ -1,21 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishTemplate = exports.deployTemplate = exports.validateInputRemoteConfigTemplate = exports.getEtag = void 0;
+const api_1 = require("../../api");
+const apiv2_1 = require("../../apiv2");
 const error_1 = require("../../error");
-const api = require("../../api");
 const TIMEOUT = 30000;
+const client = new apiv2_1.Client({ urlPrefix: api_1.remoteConfigApiOrigin, apiVersion: "v1" });
 async function getEtag(projectNumber, versionNumber) {
-    let reqPath = `/v1/projects/${projectNumber}/remoteConfig`;
+    const reqPath = `/projects/${projectNumber}/remoteConfig`;
+    const queryParams = {};
     if (versionNumber) {
-        reqPath = reqPath + "?versionNumber=" + versionNumber;
+        queryParams.versionNumber = versionNumber;
     }
-    const response = await api.request("GET", reqPath, {
-        auth: true,
-        origin: api.remoteConfigApiOrigin,
-        timeout: TIMEOUT,
+    const response = await client.request({
+        method: "GET",
+        path: reqPath,
+        queryParams,
         headers: { "Accept-Encoding": "gzip" },
+        timeout: TIMEOUT,
     });
-    return response.response.headers.etag;
+    return response.response.headers.get("etag") || "";
 }
 exports.getEtag = getEtag;
 function validateInputRemoteConfigTemplate(template) {
@@ -33,20 +37,20 @@ function validateInputRemoteConfigTemplate(template) {
 }
 exports.validateInputRemoteConfigTemplate = validateInputRemoteConfigTemplate;
 async function deployTemplate(projectNumber, template, etag, options) {
-    const reqPath = `/v1/projects/${projectNumber}/remoteConfig`;
+    const reqPath = `/projects/${projectNumber}/remoteConfig`;
     if (options === null || options === void 0 ? void 0 : options.force) {
         etag = "*";
     }
-    const response = await api.request("PUT", reqPath, {
-        auth: true,
-        origin: api.remoteConfigApiOrigin,
-        timeout: TIMEOUT,
+    const response = await client.request({
+        method: "PUT",
+        path: reqPath,
         headers: { "If-Match": etag },
-        data: {
+        body: {
             conditions: template.conditions,
             parameters: template.parameters,
             parameterGroups: template.parameterGroups,
         },
+        timeout: TIMEOUT,
     });
     return response.body;
 }

package/lib/emulator/databaseEmulator.js

@@ -6,7 +6,6 @@ const clc = require("cli-color");
 const fs = require("fs");
 const path = require("path");
 const http = require("http");
-const api = require("../api");
 const downloadableEmulators = require("./downloadableEmulators");
 const types_1 = require("../emulator/types");
 const constants_1 = require("./constants");
@@ -14,6 +13,7 @@ const registry_1 = require("./registry");
 const emulatorLogger_1 = require("./emulatorLogger");
 const error_1 = require("../error");
 const parseBoltRules = require("../parseBoltRules");
+const apiv2_1 = require("../apiv2");
 class DatabaseEmulator {
     constructor(args) {
         this.args = args;
@@ -129,11 +129,13 @@ class DatabaseEmulator {
             : fs.readFileSync(rulesPath, "utf8");
         const info = this.getInfo();
         try {
-            await api.request("PUT", `/.settings/rules.json?ns=${instance}`, {
-                origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(info)}`,
+            const client = new apiv2_1.Client({
+                urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(info)}`,
+                auth: false,
+            });
+            await client.put(`/.settings/rules.json`, content, {
                 headers: { Authorization: "Bearer owner" },
-                data: content,
-                json: false,
+                queryParams: { ns: instance },
             });
         }
         catch (e) {

package/lib/emulator/firestoreEmulator.js

@@ -5,12 +5,12 @@ const chokidar = require("chokidar");
 const fs = require("fs");
 const clc = require("cli-color");
 const path = require("path");
-const api = require("../api");
 const utils = require("../utils");
 const downloadableEmulators = require("./downloadableEmulators");
 const types_1 = require("../emulator/types");
 const registry_1 = require("./registry");
 const constants_1 = require("./constants");
+const apiv2_1 = require("../apiv2");
 class FirestoreEmulator {
     constructor(args) {
         this.args = args;
@@ -65,7 +65,7 @@ class FirestoreEmulator {
     getName() {
         return types_1.Emulators.FIRESTORE;
     }
-    updateRules(content) {
+    async updateRules(content) {
         const projectId = this.args.projectId;
         const info = this.getInfo();
         const body = {
@@ -79,17 +79,15 @@ class FirestoreEmulator {
                 ],
             },
         };
-        return api
-            .request("PUT", `/emulator/v1/projects/${projectId}:securityRules`, {
-            origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(info)}`,
-            data: body,
-        })
-            .then((res) => {
-            if (res.body && res.body.issues) {
-                return res.body.issues;
-            }
-            return [];
+        const client = new apiv2_1.Client({
+            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(info)}`,
+            auth: false,
         });
+        const res = await client.put(`/emulator/v1/projects/${projectId}:securityRules`, body);
+        if (res.body && Array.isArray(res.body.issues)) {
+            return res.body.issues;
+        }
+        return [];
     }
     prettyPrintRulesIssue(filePath, issue) {
         const relativePath = path.relative(process.cwd(), filePath);

package/lib/emulator/functionsEmulator.js

@@ -11,7 +11,6 @@ const jwt = require("jsonwebtoken");
 const cors = require("cors");
 const url_1 = require("url");
 const events_1 = require("events");
-const api = require("../api");
 const logger_1 = require("../logger");
 const track_1 = require("../track");
 const constants_1 = require("./constants");
@@ -34,6 +33,7 @@ const runtimes = require("../deploy/functions/runtimes");
 const backend = require("../deploy/functions/backend");
 const functionsEnv = require("../functions/env");
 const v1_1 = require("../functions/events/v1");
+const apiv2_1 = require("../apiv2");
 const EVENT_INVOKE = "functions:invoke";
 const DATABASE_PATH_PATTERN = new RegExp("^projects/[^/]+/instances/([^/]+)/refs(/.*)$");
 class FunctionsEmulator {
@@ -382,15 +382,12 @@ class FunctionsEmulator {
         }
         const path = `/identitytoolkit.googleapis.com/v2/projects/${this.getProjectId()}/config?updateMask=blockingFunctions`;
         try {
-            await api.request("PATCH", path, {
-                origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(authEmu.getInfo())}`,
-                headers: {
-                    Authorization: "Bearer owner",
-                },
-                data: {
-                    blockingFunctions: this.blockingFunctionsConfig,
-                },
-                json: true,
+            const client = new apiv2_1.Client({
+                urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(authEmu.getInfo())}`,
+                auth: false,
+            });
+            await client.patch(path, { blockingFunctions: this.blockingFunctionsConfig }, {
+                headers: { Authorization: "Bearer owner" },
             });
         }
         catch (err) {
@@ -398,15 +395,15 @@ class FunctionsEmulator {
             throw err;
         }
     }
-    addRealtimeDatabaseTrigger(projectId, key, eventTrigger) {
+    async addRealtimeDatabaseTrigger(projectId, key, eventTrigger) {
         const databaseEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.DATABASE);
         if (!databaseEmu) {
-            return Promise.resolve(false);
+            return false;
         }
         const result = DATABASE_PATH_PATTERN.exec(eventTrigger.resource);
         if (result === null || result.length !== 3) {
             this.logger.log("WARN", `Event function "${key}" has malformed "resource" member. ` + `${eventTrigger.resource}`);
-            return Promise.reject();
+            throw new error_1.FirebaseError(`Event function ${key} has malformed resource member`);
         }
         const instance = result[1];
         const bundle = JSON.stringify({
@@ -423,24 +420,20 @@ class FunctionsEmulator {
         else {
             this.logger.log("WARN", `No project in use. Registering function for sentinel namespace '${constants_1.Constants.DEFAULT_DATABASE_EMULATOR_NAMESPACE}'`);
         }
-        return api
-            .request("POST", setTriggersPath, {
-            origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(databaseEmu.getInfo())}`,
-            headers: {
-                Authorization: "Bearer owner",
-            },
-            data: bundle,
-            json: false,
-        })
-            .then(() => {
-            return true;
-        })
-            .catch((err) => {
+        const client = new apiv2_1.Client({
+            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(databaseEmu.getInfo())}`,
+            auth: false,
+        });
+        try {
+            await client.post(setTriggersPath, bundle, { headers: { Authorization: "Bearer owner" } });
+        }
+        catch (err) {
             this.logger.log("WARN", "Error adding Realtime Database function: " + err);
             throw err;
-        });
+        }
+        return true;
     }
-    addFirestoreTrigger(projectId, key, eventTrigger) {
+    async addFirestoreTrigger(projectId, key, eventTrigger) {
         const firestoreEmu = registry_1.EmulatorRegistry.get(types_1.Emulators.FIRESTORE);
         if (!firestoreEmu) {
             return Promise.resolve(false);
@@ -449,19 +442,18 @@ class FunctionsEmulator {
             eventTrigger: Object.assign(Object.assign({}, eventTrigger), { service: "firestore.googleapis.com" }),
         });
         logger_1.logger.debug(`addFirestoreTrigger`, JSON.stringify(bundle));
-        return api
-            .request("PUT", `/emulator/v1/projects/${projectId}/triggers/${key}`, {
-            origin: `http://${registry_1.EmulatorRegistry.getInfoHostString(firestoreEmu.getInfo())}`,
-            data: bundle,
-            json: false,
-        })
-            .then(() => {
-            return true;
-        })
-            .catch((err) => {
+        const client = new apiv2_1.Client({
+            urlPrefix: `http://${registry_1.EmulatorRegistry.getInfoHostString(firestoreEmu.getInfo())}`,
+            auth: false,
+        });
+        try {
+            await client.put(`/emulator/v1/projects/${projectId}/triggers/${key}`, bundle);
+        }
+        catch (err) {
             this.logger.log("WARN", "Error adding firestore function: " + err);
             throw err;
-        });
+        }
+        return true;
     }
     async addPubsubTrigger(triggerName, key, eventTrigger, signatureType, schedule) {
         const pubsubEmulator = registry_1.EmulatorRegistry.get(types_1.Emulators.PUBSUB);
@@ -617,7 +609,13 @@ class FunctionsEmulator {
             this.logger.logLabeled("SUCCESS", "functions", `Using node@${requestedMajorVersion} from host.`);
         }
         else {
-            this.logger.log("WARN", `Your requested "node" version "${requestedMajorVersion}" doesn't match your global version "${hostMajorVersion}". Using node@${hostMajorVersion} from host.`);
+            if (process.env.FIREPIT_VERSION) {
+                this.logger.log("WARN", `You've requested "node" version "${requestedMajorVersion}", but the standalone Firebase CLI comes with bundled Node "${hostMajorVersion}".`);
+                this.logger.log("INFO", `To use a different Node.js version, consider removing the standalone Firebase CLI and switching to "firebase-tools" on npm.`);
+            }
+            else {
+                this.logger.log("WARN", `Your requested "node" version "${requestedMajorVersion}" doesn't match your global version "${hostMajorVersion}". Using node@${hostMajorVersion} from host.`);
+            }
         }
         return process.execPath;
     }

package/lib/emulator/hubClient.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmulatorHubClient = void 0;
-const api = require("../api");
 const hub_1 = require("./hub");
 const error_1 = require("../error");
+const apiv2_1 = require("../apiv2");
 class EmulatorHubClient {
     constructor(projectId) {
         this.projectId = projectId;
@@ -12,29 +12,18 @@ class EmulatorHubClient {
     foundHub() {
         return this.locator !== undefined;
     }
-    getStatus() {
-        return api.request("GET", "/", {
-            origin: this.origin,
-        });
+    async getStatus() {
+        const apiClient = new apiv2_1.Client({ urlPrefix: this.origin, auth: false });
+        await apiClient.get("/");
     }
-    getEmulators() {
-        return api
-            .request("GET", hub_1.EmulatorHub.PATH_EMULATORS, {
-            origin: this.origin,
-            json: true,
-        })
-            .then((res) => {
-            return res.body;
-        });
+    async getEmulators() {
+        const apiClient = new apiv2_1.Client({ urlPrefix: this.origin, auth: false });
+        const res = await apiClient.get(hub_1.EmulatorHub.PATH_EMULATORS);
+        return res.body;
     }
-    postExport(path) {
-        return api.request("POST", hub_1.EmulatorHub.PATH_EXPORT, {
-            origin: this.origin,
-            json: true,
-            data: {
-                path,
-            },
-        });
+    async postExport(path) {
+        const apiClient = new apiv2_1.Client({ urlPrefix: this.origin, auth: false });
+        await apiClient.post(hub_1.EmulatorHub.PATH_EXPORT, { path });
     }
     get origin() {
         const locator = this.assertLocator();

package/lib/emulator/hubExport.js

@@ -5,7 +5,6 @@ const path = require("path");
 const fs = require("fs");
 const fse = require("fs-extra");
 const http = require("http");
-const api = require("../api");
 const logger_1 = require("../logger");
 const types_1 = require("./types");
 const registry_1 = require("./registry");
@@ -13,6 +12,7 @@ const error_1 = require("../error");
 const hub_1 = require("./hub");
 const downloadableEmulators_1 = require("./downloadableEmulators");
 const rimraf = require("rimraf");
+const apiv2_1 = require("../apiv2");
 class HubExport {
     constructor(projectId, exportPath) {
         this.projectId = projectId;
@@ -80,24 +80,27 @@ class HubExport {
             export_directory: this.tmpDir,
             export_name: metadata.firestore.path,
         };
-        return api.request("POST", `/emulator/v1/projects/${this.projectId}:export`, {
-            origin: firestoreHost,
-            json: true,
-            data: firestoreExportBody,
-        });
+        const client = new apiv2_1.Client({ urlPrefix: firestoreHost, auth: false });
+        await client.post(`/emulator/v1/projects/${this.projectId}:export`, firestoreExportBody);
     }
     async exportDatabase(metadata) {
         const databaseEmulator = registry_1.EmulatorRegistry.get(types_1.Emulators.DATABASE);
         const databaseAddr = `http://${registry_1.EmulatorRegistry.getInfoHostString(databaseEmulator.getInfo())}`;
-        const inspectURL = `/.inspect/databases.json?ns=${this.projectId}`;
-        const inspectRes = await api.request("GET", inspectURL, { origin: databaseAddr, auth: true });
+        const client = new apiv2_1.Client({ urlPrefix: databaseAddr, auth: true });
+        const inspectURL = `/.inspect/databases.json`;
+        const inspectRes = await client.get(inspectURL, {
+            queryParams: { ns: this.projectId },
+        });
         const namespaces = inspectRes.body.map((instance) => instance.name);
         const namespacesToExport = [];
         for (const ns of namespaces) {
-            const checkDataPath = `/.json?ns=${ns}&shallow=true&limitToFirst=1`;
-            const checkDataRes = await api.request("GET", checkDataPath, {
-                origin: databaseAddr,
-                auth: true,
+            const checkDataPath = `/.json`;
+            const checkDataRes = await client.get(checkDataPath, {
+                queryParams: {
+                    ns,
+                    shallow: "true",
+                    limitToFirst: 1,
+                },
             });
             if (checkDataRes.body !== null) {
                 namespacesToExport.push(ns);
@@ -162,11 +165,18 @@ class HubExport {
         const storageExportBody = {
             path: storageExportPath,
         };
-        return api.request("POST", "/internal/export", {
-            origin: storageHost,
-            json: true,
-            data: storageExportBody,
+        const client = new apiv2_1.Client({ urlPrefix: storageHost, auth: false });
+        const res = await client.request({
+            method: "POST",
+            path: "/internal/export",
+            headers: { "Content-Type": "application/json" },
+            body: storageExportBody,
+            responseType: "stream",
+            resolveOnHTTPError: true,
         });
+        if (res.status >= 400) {
+            throw new error_1.FirebaseError(`Failed to export storage: ${await res.response.text()}`);
+        }
     }
 }
 exports.HubExport = HubExport;

package/lib/firestore/checkDatabaseType.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDatabaseType = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 async function checkDatabaseType(projectId) {
     try {
-        const resp = await api.request("GET", "/v1/apps/" + projectId, {
-            auth: true,
-            origin: api.appengineOrigin,
-        });
+        const client = new apiv2_1.Client({ urlPrefix: api_1.appengineOrigin, apiVersion: "v1" });
+        const resp = await client.get(`/apps/${projectId}`);
         return resp.body.databaseType;
     }
     catch (err) {