firebase-tools 10.9.2 → 11.1.0

package/lib/init/features/functions/npm-dependencies.js

@@ -1,34 +1,37 @@
 "use strict";
-var spawn = require("cross-spawn");
-const { logger } = require("../../../logger");
-var { prompt } = require("../../../prompt");
-exports.askInstallDependencies = function (setup, config) {
-    return prompt(setup, [
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.askInstallDependencies = void 0;
+const spawn = require("cross-spawn");
+const logger_1 = require("../../../logger");
+const prompt_1 = require("../../../prompt");
+function askInstallDependencies(setup, config) {
+    return (0, prompt_1.prompt)(setup, [
         {
             name: "npm",
             type: "confirm",
             message: "Do you want to install dependencies with npm now?",
             default: true,
         },
-    ]).then(function () {
+    ]).then(() => {
         if (setup.npm) {
-            return new Promise(function (resolve) {
-                var installer = spawn("npm", ["install"], {
+            return new Promise((resolve) => {
+                const installer = spawn("npm", ["install"], {
                     cwd: config.projectDir + "/functions",
                     stdio: "inherit",
                 });
-                installer.on("error", function (err) {
-                    logger.debug(err.stack);
+                installer.on("error", (err) => {
+                    logger_1.logger.debug(err.stack);
                 });
-                installer.on("close", function (code) {
+                installer.on("close", (code) => {
                     if (code === 0) {
                         return resolve();
                     }
-                    logger.info();
-                    logger.error("NPM install failed, continuing with Firebase initialization...");
+                    logger_1.logger.info();
+                    logger_1.logger.error("NPM install failed, continuing with Firebase initialization...");
                     return resolve();
                 });
             });
         }
     });
-};
+}
+exports.askInstallDependencies = askInstallDependencies;

package/lib/init/features/functions/typescript.js

@@ -1,19 +1,21 @@
 "use strict";
-var _ = require("lodash");
-var fs = require("fs");
-var path = require("path");
-var npmDependencies = require("./npm-dependencies");
-var { prompt } = require("../../../prompt");
-var TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/typescript/");
-var PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
-var PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
-var ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
-var TSCONFIG_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.json"), "utf8");
-var TSCONFIG_DEV_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.dev.json"), "utf8");
-var INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.ts"), "utf8");
-var GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
-module.exports = function (setup, config) {
-    return prompt(setup.functions, [
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setup = void 0;
+const _ = require("lodash");
+const fs = require("fs");
+const path = require("path");
+const npm_dependencies_1 = require("./npm-dependencies");
+const prompt_1 = require("../../../prompt");
+const TEMPLATE_ROOT = path.resolve(__dirname, "../../../../templates/init/functions/typescript/");
+const PACKAGE_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.lint.json"), "utf8");
+const PACKAGE_NO_LINTING_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "package.nolint.json"), "utf8");
+const ESLINT_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_eslintrc"), "utf8");
+const TSCONFIG_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.json"), "utf8");
+const TSCONFIG_DEV_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "tsconfig.dev.json"), "utf8");
+const INDEX_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "index.ts"), "utf8");
+const GITIGNORE_TEMPLATE = fs.readFileSync(path.join(TEMPLATE_ROOT, "_gitignore"), "utf8");
+function setup(setup, config) {
+    return (0, prompt_1.prompt)(setup.functions, [
         {
             name: "lint",
             type: "confirm",
@@ -21,7 +23,7 @@ module.exports = function (setup, config) {
             default: true,
         },
     ])
-        .then(function () {
+        .then(() => {
         if (setup.functions.lint) {
             _.set(setup, "config.functions.predeploy", [
                 'npm --prefix "$RESOURCE_DIR" run lint',
@@ -29,28 +31,29 @@ module.exports = function (setup, config) {
             ]);
             return config
                 .askWriteProjectFile("functions/package.json", PACKAGE_LINTING_TEMPLATE)
-                .then(function () {
+                .then(() => {
                 return config.askWriteProjectFile("functions/.eslintrc.js", ESLINT_TEMPLATE);
             });
         }
         _.set(setup, "config.functions.predeploy", 'npm --prefix "$RESOURCE_DIR" run build');
         return config.askWriteProjectFile("functions/package.json", PACKAGE_NO_LINTING_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/tsconfig.json", TSCONFIG_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         if (setup.functions.lint) {
             return config.askWriteProjectFile("functions/tsconfig.dev.json", TSCONFIG_DEV_TEMPLATE);
         }
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/src/index.ts", INDEX_TEMPLATE);
     })
-        .then(function () {
+        .then(() => {
         return config.askWriteProjectFile("functions/.gitignore", GITIGNORE_TEMPLATE);
     })
-        .then(function () {
-        return npmDependencies.askInstallDependencies(setup.functions, config);
+        .then(() => {
+        return (0, npm_dependencies_1.askInstallDependencies)(setup.functions, config);
     });
-};
+}
+exports.setup = setup;

package/lib/init/features/hosting/github.js

@@ -7,7 +7,7 @@ const yaml = require("js-yaml");
 const js_yaml_1 = require("js-yaml");
 const ora = require("ora");
 const path = require("path");
-const sodium = require("tweetsodium");
+const libsodium = require("libsodium-wrappers");
 const auth_1 = require("../../../auth");
 const fsutils_1 = require("../../../fsutils");
 const iam_1 = require("../../../gcp/iam");
@@ -60,7 +60,7 @@ async function initGitHub(setup, config, options) {
     const spinnerSecrets = ora(`Uploading service account secrets to repository: ${repo}`);
     spinnerSecrets.start();
     const encryptedServiceAccountJSON = encryptServiceAccountJSON(serviceAccountJSON, key);
-    await uploadSecretToGitHub(repo, ghAccessToken, encryptedServiceAccountJSON, keyId, githubSecretName);
+    await uploadSecretToGitHub(repo, ghAccessToken, await encryptedServiceAccountJSON, keyId, githubSecretName);
     spinnerSecrets.stop();
     (0, utils_1.logSuccess)(`Uploaded service account JSON to GitHub as secret ${(0, cli_color_1.bold)(githubSecretName)}.`);
     (0, utils_1.logBullet)(`You can manage your secrets at https://github.com/${repo}/settings/secrets.`);
@@ -374,9 +374,10 @@ async function createServiceAccountAndKey(options, repo, accountId) {
     const serviceAccountJSON = buf.toString();
     return serviceAccountJSON;
 }
-function encryptServiceAccountJSON(serviceAccountJSON, key) {
+async function encryptServiceAccountJSON(serviceAccountJSON, key) {
     const messageBytes = Buffer.from(serviceAccountJSON);
     const keyBytes = Buffer.from(key, "base64");
-    const encryptedBytes = sodium.seal(messageBytes, keyBytes);
+    await libsodium.ready;
+    const encryptedBytes = libsodium.crypto_box_seal(messageBytes, keyBytes);
     return Buffer.from(encryptedBytes).toString("base64");
 }

package/lib/loadCJSON.js

@@ -1,14 +1,17 @@
 "use strict";
-var { FirebaseError } = require("./error");
-var cjson = require("cjson");
-module.exports = function (path) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadCJSON = void 0;
+const error_1 = require("./error");
+const cjson = require("cjson");
+function loadCJSON(path) {
     try {
         return cjson.load(path);
     }
     catch (e) {
         if (e.code === "ENOENT") {
-            throw new FirebaseError("File " + path + " does not exist", { exit: 1 });
+            throw new error_1.FirebaseError(`File ${path} does not exist`);
         }
-        throw new FirebaseError("Parse Error in " + path + ":\n\n" + e.message);
+        throw new error_1.FirebaseError(`Parse Error in ${path}:\n\n${e.message}`);
     }
-};
+}
+exports.loadCJSON = loadCJSON;

package/lib/logError.js

@@ -1,26 +1,29 @@
 "use strict";
-const { logger } = require("./logger");
-var clc = require("cli-color");
-module.exports = function (error) {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logError = void 0;
+const logger_1 = require("./logger");
+const clc = require("cli-color");
+function logError(error) {
     if (error.children && error.children.length) {
-        logger.error(clc.bold.red("Error:"), clc.underline(error.message) + ":");
-        error.children.forEach(function (child) {
-            var out = "- ";
+        logger_1.logger.error(clc.bold.red("Error:"), clc.underline(error.message) + ":");
+        error.children.forEach((child) => {
+            let out = "- ";
             if (child.name) {
                 out += clc.bold(child.name) + " ";
             }
             out += child.message;
-            logger.error(out);
+            logger_1.logger.error(out);
         });
     }
     else {
         if (error.original) {
-            logger.debug(error.original.stack);
+            logger_1.logger.debug(error.original.stack);
         }
-        logger.error();
-        logger.error(clc.bold.red("Error:"), error.message);
+        logger_1.logger.error();
+        logger_1.logger.error(clc.bold.red("Error:"), error.message);
     }
     if (error.context) {
-        logger.debug("Error Context:", JSON.stringify(error.context, undefined, 2));
+        logger_1.logger.debug("Error Context:", JSON.stringify(error.context, undefined, 2));
     }
-};
+}
+exports.logError = logError;

package/lib/management/apps.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteAppAndroidSha = exports.createAppAndroidSha = exports.listAppAndroidSha = exports.getAppConfig = exports.getAppConfigFile = exports.listFirebaseApps = exports.createWebApp = exports.createAndroidApp = exports.createIosApp = exports.getAppPlatform = exports.ShaCertificateType = exports.AppPlatform = void 0;
+exports.deleteAppAndroidSha = exports.createAppAndroidSha = exports.listAppAndroidSha = exports.getAppConfig = exports.getAppConfigFile = exports.listFirebaseApps = exports.createWebApp = exports.createAndroidApp = exports.createIosApp = exports.getAppPlatform = exports.ShaCertificateType = exports.AppPlatform = exports.APP_LIST_PAGE_SIZE = void 0;
 const fs = require("fs");
-const api = require("../api");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const operation_poller_1 = require("../operation-poller");
 const TIMEOUT_MILLIS = 30000;
-const APP_LIST_PAGE_SIZE = 100;
+exports.APP_LIST_PAGE_SIZE = 100;
 const CREATE_APP_API_REQUEST_TIMEOUT_MILLIS = 15000;
 const WEB_CONFIG_FILE_NAME = "google-config.js";
 var AppPlatform;
@@ -39,17 +40,18 @@ function getAppPlatform(platform) {
     }
 }
 exports.getAppPlatform = getAppPlatform;
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.firebaseApiOrigin, apiVersion: "v1beta1" });
 async function createIosApp(projectId, options) {
     try {
-        const response = await api.request("POST", `/v1beta1/projects/${projectId}/iosApps`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await apiClient.request({
+            method: "POST",
+            path: `/projects/${projectId}/iosApps`,
             timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
-            data: options,
+            body: options,
         });
         const appData = await (0, operation_poller_1.pollOperation)({
             pollerName: "Create iOS app Poller",
-            apiOrigin: api.firebaseApiOrigin,
+            apiOrigin: api_1.firebaseApiOrigin,
             apiVersion: "v1beta1",
             operationResourceName: response.body.name,
         });
@@ -63,15 +65,15 @@ async function createIosApp(projectId, options) {
 exports.createIosApp = createIosApp;
 async function createAndroidApp(projectId, options) {
     try {
-        const response = await api.request("POST", `/v1beta1/projects/${projectId}/androidApps`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await apiClient.request({
+            method: "POST",
+            path: `/projects/${projectId}/androidApps`,
             timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
-            data: options,
+            body: options,
         });
         const appData = await (0, operation_poller_1.pollOperation)({
             pollerName: "Create Android app Poller",
-            apiOrigin: api.firebaseApiOrigin,
+            apiOrigin: api_1.firebaseApiOrigin,
             apiVersion: "v1beta1",
             operationResourceName: response.body.name,
         });
@@ -88,15 +90,15 @@ async function createAndroidApp(projectId, options) {
 exports.createAndroidApp = createAndroidApp;
 async function createWebApp(projectId, options) {
     try {
-        const response = await api.request("POST", `/v1beta1/projects/${projectId}/webApps`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await apiClient.request({
+            method: "POST",
+            path: `/projects/${projectId}/webApps`,
             timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
-            data: options,
+            body: options,
         });
         const appData = await (0, operation_poller_1.pollOperation)({
             pollerName: "Create Web app Poller",
-            apiOrigin: api.firebaseApiOrigin,
+            apiOrigin: api_1.firebaseApiOrigin,
             apiVersion: "v1beta1",
             operationResourceName: response.body.name,
         });
@@ -126,18 +128,21 @@ function getListAppsResourceString(projectId, platform) {
         default:
             throw new error_1.FirebaseError("Unexpected platform. Only support iOS, Android and Web apps");
     }
-    return `/v1beta1/projects/${projectId}${resourceSuffix}`;
+    return `/projects/${projectId}${resourceSuffix}`;
 }
-async function listFirebaseApps(projectId, platform, pageSize = APP_LIST_PAGE_SIZE) {
+async function listFirebaseApps(projectId, platform, pageSize = exports.APP_LIST_PAGE_SIZE) {
     const apps = [];
     try {
-        let nextPageToken = "";
+        let nextPageToken;
         do {
-            const pageTokenQueryString = nextPageToken ? `&pageToken=${nextPageToken}` : "";
-            const response = await api.request("GET", getListAppsResourceString(projectId, platform) +
-                `?pageSize=${pageSize}${pageTokenQueryString}`, {
-                auth: true,
-                origin: api.firebaseApiOrigin,
+            const queryParams = { pageSize };
+            if (nextPageToken) {
+                queryParams.pageToken = nextPageToken;
+            }
+            const response = await apiClient.request({
+                method: "GET",
+                path: getListAppsResourceString(projectId, platform),
+                queryParams,
                 timeout: TIMEOUT_MILLIS,
             });
             if (response.body.apps) {
@@ -173,7 +178,7 @@ function getAppConfigResourceString(appId, platform) {
         default:
             throw new error_1.FirebaseError("Unexpected app platform");
     }
-    return `/v1beta1/projects/-/${platformResource}/${appId}/config`;
+    return `/projects/-/${platformResource}/${appId}/config`;
 }
 function parseConfigFromResponse(responseBody, platform) {
     if (platform === AppPlatform.WEB) {
@@ -196,13 +201,13 @@ function getAppConfigFile(config, platform) {
 }
 exports.getAppConfigFile = getAppConfigFile;
 async function getAppConfig(appId, platform) {
-    let response;
     try {
-        response = await api.request("GET", getAppConfigResourceString(appId, platform), {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await apiClient.request({
+            method: "GET",
+            path: getAppConfigResourceString(appId, platform),
             timeout: TIMEOUT_MILLIS,
         });
+        return response.body;
     }
     catch (err) {
         logger_1.logger.debug(err.message);
@@ -211,15 +216,15 @@ async function getAppConfig(appId, platform) {
             original: err,
         });
     }
-    return response.body;
 }
 exports.getAppConfig = getAppConfig;
 async function listAppAndroidSha(projectId, appId) {
     const shaCertificates = [];
     try {
-        const response = await api.request("GET", `/v1beta1/projects/${projectId}/androidApps/${appId}/sha`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await apiClient.request({
+            method: "GET",
+            path: `/projects/${projectId}/androidApps/${appId}/sha`,
+            timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
         });
         if (response.body.certificates) {
             shaCertificates.push(...response.body.certificates);
@@ -238,11 +243,11 @@ async function listAppAndroidSha(projectId, appId) {
 exports.listAppAndroidSha = listAppAndroidSha;
 async function createAppAndroidSha(projectId, appId, options) {
     try {
-        const response = await api.request("POST", `/v1beta1/projects/${projectId}/androidApps/${appId}/sha`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await apiClient.request({
+            method: "POST",
+            path: `/projects/${projectId}/androidApps/${appId}/sha`,
+            body: options,
             timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
-            data: options,
         });
         const shaCertificate = response.body;
         return shaCertificate;
@@ -258,11 +263,10 @@ async function createAppAndroidSha(projectId, appId, options) {
 exports.createAppAndroidSha = createAppAndroidSha;
 async function deleteAppAndroidSha(projectId, appId, shaId) {
     try {
-        await api.request("DELETE", `/v1beta1/projects/${projectId}/androidApps/${appId}/sha/${shaId}`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        await apiClient.request({
+            method: "DELETE",
+            path: `/projects/${projectId}/androidApps/${appId}/sha/${shaId}`,
             timeout: CREATE_APP_API_REQUEST_TIMEOUT_MILLIS,
-            data: null,
         });
     }
     catch (err) {

package/lib/management/database.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listDatabaseInstances = exports.parseDatabaseLocation = exports.checkInstanceNameAvailable = exports.createInstance = exports.getDatabaseInstanceDetails = exports.populateInstanceDetails = exports.DatabaseLocation = exports.DatabaseInstanceState = exports.DatabaseInstanceType = void 0;
-const api = require("../api");
+exports.listDatabaseInstances = exports.parseDatabaseLocation = exports.checkInstanceNameAvailable = exports.createInstance = exports.getDatabaseInstanceDetails = exports.populateInstanceDetails = exports.DatabaseLocation = exports.DatabaseInstanceState = exports.DatabaseInstanceType = exports.APP_LIST_PAGE_SIZE = exports.MGMT_API_VERSION = void 0;
+const apiv2_1 = require("../apiv2");
+const constants_1 = require("../emulator/constants");
+const error_1 = require("../error");
 const logger_1 = require("../logger");
+const api_1 = require("../api");
 const utils = require("../utils");
-const error_1 = require("../error");
-const constants_1 = require("../emulator/constants");
-const MGMT_API_VERSION = "v1beta";
+exports.MGMT_API_VERSION = "v1beta";
+exports.APP_LIST_PAGE_SIZE = 100;
 const TIMEOUT_MILLIS = 10000;
-const APP_LIST_PAGE_SIZE = 100;
 const INSTANCE_RESOURCE_NAME_REGEX = /projects\/([^/]+?)\/locations\/([^/]+?)\/instances\/([^/]*)/;
 var DatabaseInstanceType;
 (function (DatabaseInstanceType) {
@@ -30,6 +31,7 @@ var DatabaseLocation;
     DatabaseLocation["ASIA_SOUTHEAST1"] = "asia-southeast1";
     DatabaseLocation["ANY"] = "-";
 })(DatabaseLocation = exports.DatabaseLocation || (exports.DatabaseLocation = {}));
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.rtdbManagementOrigin, apiVersion: exports.MGMT_API_VERSION });
 async function populateInstanceDetails(options) {
     options.instanceDetails = await getDatabaseInstanceDetails(options.project, options.instance);
     return Promise.resolve();
@@ -37,9 +39,9 @@ async function populateInstanceDetails(options) {
 exports.populateInstanceDetails = populateInstanceDetails;
 async function getDatabaseInstanceDetails(projectId, instanceName) {
     try {
-        const response = await api.request("GET", `/${MGMT_API_VERSION}/projects/${projectId}/locations/-/instances/${instanceName}`, {
-            auth: true,
-            origin: api.rtdbManagementOrigin,
+        const response = await apiClient.request({
+            method: "GET",
+            path: `/projects/${projectId}/locations/-/instances/${instanceName}`,
             timeout: TIMEOUT_MILLIS,
         });
         return convertDatabaseInstance(response.body);
@@ -57,8 +59,8 @@ async function getDatabaseInstanceDetails(projectId, instanceName) {
                 state: DatabaseInstanceState.ACTIVE,
             });
         }
-        return utils.reject(`Failed to get instance details for instance: ${instanceName}. See firebase-debug.log for more details.`, {
-            code: 2,
+        throw new error_1.FirebaseError(`Failed to get instance details for instance: ${instanceName}. See firebase-debug.log for more details.`, {
+            exit: 2,
             original: err,
         });
     }
@@ -66,13 +68,12 @@ async function getDatabaseInstanceDetails(projectId, instanceName) {
 exports.getDatabaseInstanceDetails = getDatabaseInstanceDetails;
 async function createInstance(projectId, instanceName, location, databaseType) {
     try {
-        const response = await api.request("POST", `/${MGMT_API_VERSION}/projects/${projectId}/locations/${location}/instances?databaseId=${instanceName}`, {
-            auth: true,
-            origin: api.rtdbManagementOrigin,
+        const response = await apiClient.request({
+            method: "POST",
+            path: `/projects/${projectId}/locations/${location}/instances`,
+            queryParams: { databaseId: instanceName },
+            body: { type: databaseType },
             timeout: TIMEOUT_MILLIS,
-            data: {
-                type: databaseType,
-            },
         });
         return convertDatabaseInstance(response.body);
     }
@@ -91,17 +92,14 @@ async function checkInstanceNameAvailable(projectId, instanceName, databaseType,
         location = DatabaseLocation.US_CENTRAL1;
     }
     try {
-        await api.request("POST", `/${MGMT_API_VERSION}/projects/${projectId}/locations/${location}/instances?databaseId=${instanceName}&validateOnly=true`, {
-            auth: true,
-            origin: api.rtdbManagementOrigin,
+        await apiClient.request({
+            method: "POST",
+            path: `/projects/${projectId}/locations/${location}/instances`,
+            queryParams: { databaseId: instanceName, validateOnly: "true" },
+            body: { type: databaseType },
             timeout: TIMEOUT_MILLIS,
-            data: {
-                type: databaseType,
-            },
         });
-        return {
-            available: true,
-        };
+        return { available: true };
     }
     catch (err) {
         logger_1.logger.debug(`Invalid Realtime Database instance name: ${instanceName}.${err.message ? " " + err.message : ""}`);
@@ -136,15 +134,19 @@ function parseDatabaseLocation(location, defaultLocation) {
     }
 }
 exports.parseDatabaseLocation = parseDatabaseLocation;
-async function listDatabaseInstances(projectId, location, pageSize = APP_LIST_PAGE_SIZE) {
+async function listDatabaseInstances(projectId, location, pageSize = exports.APP_LIST_PAGE_SIZE) {
     const instances = [];
     try {
         let nextPageToken = "";
         do {
-            const pageTokenQueryString = nextPageToken ? `&pageToken=${nextPageToken}` : "";
-            const response = await api.request("GET", `/${MGMT_API_VERSION}/projects/${projectId}/locations/${location}/instances?pageSize=${pageSize}${pageTokenQueryString}`, {
-                auth: true,
-                origin: api.rtdbManagementOrigin,
+            const queryParams = { pageSize };
+            if (nextPageToken) {
+                queryParams.pageToken = nextPageToken;
+            }
+            const response = await apiClient.request({
+                method: "GET",
+                path: `/projects/${projectId}/locations/${location}/instances`,
+                queryParams,
                 timeout: TIMEOUT_MILLIS,
             });
             if (response.body.instances) {

package/lib/management/projects.js

@@ -172,11 +172,17 @@ async function promptAvailableProjectId() {
 exports.promptAvailableProjectId = promptAvailableProjectId;
 async function createCloudProject(projectId, options) {
     try {
-        const response = await api.request("POST", "/v1/projects", {
-            auth: true,
-            origin: api.resourceManagerOrigin,
+        const client = new apiv2_1.Client({ urlPrefix: api.resourceManagerOrigin, apiVersion: "v1" });
+        const data = {
+            projectId,
+            name: options.displayName || projectId,
+            parent: options.parentResource,
+        };
+        const response = await client.request({
+            method: "POST",
+            path: "/projects",
+            body: data,
             timeout: CREATE_PROJECT_API_REQUEST_TIMEOUT_MILLIS,
-            data: { projectId, name: options.displayName || projectId, parent: options.parentResource },
         });
         const projectInfo = await (0, operation_poller_1.pollOperation)({
             pollerName: "Project Creation Poller",
@@ -204,9 +210,9 @@ async function createCloudProject(projectId, options) {
 exports.createCloudProject = createCloudProject;
 async function addFirebaseToCloudProject(projectId) {
     try {
-        const response = await api.request("POST", `/v1beta1/projects/${projectId}:addFirebase`, {
-            auth: true,
-            origin: api.firebaseApiOrigin,
+        const response = await firebaseAPIClient.request({
+            method: "POST",
+            path: `/projects/${projectId}:addFirebase`,
             timeout: CREATE_PROJECT_API_REQUEST_TIMEOUT_MILLIS,
         });
         const projectInfo = await (0, operation_poller_1.pollOperation)({

package/lib/parseBoltRules.js

@@ -1,28 +1,29 @@
 "use strict";
-var fs = require("fs");
-var spawn = require("cross-spawn");
-var { FirebaseError } = require("./error");
-var clc = require("cli-color");
-var _ = require("lodash");
-module.exports = function (filename) {
-    var ruleSrc = fs.readFileSync(filename, "utf8");
-    var result = spawn.sync("npx", ["--no-install", "firebase-bolt"], {
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseBoltRules = void 0;
+const fs = require("fs");
+const spawn = require("cross-spawn");
+const clc = require("cli-color");
+const _ = require("lodash");
+const error_1 = require("./error");
+function parseBoltRules(filename) {
+    const ruleSrc = fs.readFileSync(filename, "utf8");
+    const result = spawn.sync("npx", ["--no-install", "firebase-bolt"], {
         input: ruleSrc,
         timeout: 10000,
         encoding: "utf-8",
     });
     if (result.error && _.get(result.error, "code") === "ENOENT") {
-        throw new FirebaseError("Bolt not installed, run " + clc.bold("npm install -g firebase-bolt"), {
-            exit: 1,
-        });
+        throw new error_1.FirebaseError("Bolt not installed, run " + clc.bold("npm install -g firebase-bolt"));
     }
     else if (result.error) {
-        throw new FirebaseError("Unexpected error parsing Bolt rules file", {
+        throw new error_1.FirebaseError("Unexpected error parsing Bolt rules file", {
             exit: 2,
         });
     }
     else if (result.status != null && result.status > 0) {
-        throw new FirebaseError(result.stderr.toString(), { exit: 1 });
+        throw new error_1.FirebaseError(result.stderr.toString(), { exit: 1 });
     }
     return result.stdout;
-};
+}
+exports.parseBoltRules = parseBoltRules;