firebase-tools 10.9.1 → 11.0.1

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/rtdb.js

@@ -1,33 +1,35 @@
 "use strict";
-var api = require("./api");
-var { FirebaseError } = require("./error");
-var utils = require("./utils");
-const { populateInstanceDetails } = require("./management/database");
-const { realtimeOriginOrCustomUrl } = require("./database/api");
-exports.updateRules = function (projectId, instance, src, options) {
-    options = options || {};
-    var path = ".settings/rules.json";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateRules = void 0;
+const apiv2_1 = require("./apiv2");
+const database_1 = require("./management/database");
+const error_1 = require("./error");
+const api_1 = require("./database/api");
+const utils = require("./utils");
+async function updateRules(projectId, instance, src, options = {}) {
+    const queryParams = {};
     if (options.dryRun) {
-        path += "?dryRun=true";
+        queryParams.dryRun = "true";
     }
-    var downstreamOptions = { instance: instance, project: projectId };
-    return populateInstanceDetails(downstreamOptions)
-        .then(function () {
-        const origin = utils.getDatabaseUrl(realtimeOriginOrCustomUrl(downstreamOptions.instanceDetails.databaseUrl), instance, "");
-        return api.request("PUT", path, {
-            origin: origin,
-            auth: true,
-            data: src,
-            json: false,
-            resolveOnHTTPError: true,
-        });
-    })
-        .then(function (response) {
-        if (response.status === 400) {
-            throw new FirebaseError("Syntax error in database rules:\n\n" + JSON.parse(response.body).error);
-        }
-        else if (response.status > 400) {
-            throw new FirebaseError("Unexpected error while deploying database rules.", { exit: 2 });
-        }
+    const downstreamOptions = { instance: instance, project: projectId };
+    await (0, database_1.populateInstanceDetails)(downstreamOptions);
+    if (!downstreamOptions.instanceDetails) {
+        throw new error_1.FirebaseError(`Could not get instance details`, { exit: 2 });
+    }
+    const origin = utils.getDatabaseUrl((0, api_1.realtimeOriginOrCustomUrl)(downstreamOptions.instanceDetails.databaseUrl), instance, "");
+    const client = new apiv2_1.Client({ urlPrefix: origin });
+    const response = await client.request({
+        method: "PUT",
+        path: ".settings/rules.json",
+        queryParams,
+        body: src,
+        resolveOnHTTPError: true,
     });
-};
+    if (response.status === 400) {
+        throw new error_1.FirebaseError(`Syntax error in database rules:\n\n${response.body.error}`);
+    }
+    else if (response.status > 400) {
+        throw new error_1.FirebaseError("Unexpected error while deploying database rules.", { exit: 2 });
+    }
+}
+exports.updateRules = updateRules;