firebase-tools 10.1.2 → 10.1.3

package/lib/deploy/hosting/convertConfig.js

@@ -1,11 +1,24 @@
 "use strict";
-const _ = require("lodash");
-const { FirebaseError } = require("../../error");
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.convertConfig = void 0;
+const error_1 = require("../../error");
+function has(obj, k) {
+    return obj[k] !== undefined;
+}
 function extractPattern(type, spec) {
-    const glob = spec.source || spec.glob;
-    const regex = spec.regex;
+    let glob = "";
+    let regex = "";
+    if ("source" in spec) {
+        glob = spec.source;
+    }
+    if ("glob" in spec) {
+        glob = spec.glob;
+    }
+    if ("regex" in spec) {
+        regex = spec.regex;
+    }
     if (glob && regex) {
-        throw new FirebaseError("Cannot specify a " + type + " pattern with both a glob and regex.");
+        throw new error_1.FirebaseError(`Cannot specify a ${type} pattern with both a glob and regex.`);
     }
     else if (glob) {
         return { glob: glob };
@@ -13,33 +26,38 @@ function extractPattern(type, spec) {
     else if (regex) {
         return { regex: regex };
     }
-    throw new FirebaseError("Cannot specify a " + type + " with no pattern (either a glob or regex required).");
+    throw new error_1.FirebaseError(`Cannot specify a ${type} with no pattern (either a glob or regex required).`);
 }
-module.exports = function (config) {
+function convertConfig(config) {
+    if (Array.isArray(config)) {
+        throw new error_1.FirebaseError(`convertConfig should be given a single configuration, not an array.`, {
+            exit: 2,
+        });
+    }
     const out = {};
     if (!config) {
         return out;
     }
-    if (_.isArray(config.rewrites)) {
-        out.rewrites = config.rewrites.map(function (rewrite) {
+    if (Array.isArray(config.rewrites)) {
+        out.rewrites = config.rewrites.map((rewrite) => {
             const vRewrite = extractPattern("rewrite", rewrite);
-            if (rewrite.destination) {
+            if ("destination" in rewrite) {
                 vRewrite.path = rewrite.destination;
             }
-            else if (rewrite.function) {
+            else if ("function" in rewrite) {
                 vRewrite.function = rewrite.function;
             }
-            else if (rewrite.dynamicLinks) {
+            else if ("dynamicLinks" in rewrite) {
                 vRewrite.dynamicLinks = rewrite.dynamicLinks;
             }
-            else if (rewrite.run) {
+            else if ("run" in rewrite) {
                 vRewrite.run = Object.assign({ region: "us-central1" }, rewrite.run);
             }
             return vRewrite;
         });
     }
-    if (_.isArray(config.redirects)) {
-        out.redirects = config.redirects.map(function (redirect) {
+    if (Array.isArray(config.redirects)) {
+        out.redirects = config.redirects.map((redirect) => {
             const vRedirect = extractPattern("redirect", redirect);
             vRedirect.location = redirect.destination;
             if (redirect.type) {
@@ -48,17 +66,19 @@ module.exports = function (config) {
             return vRedirect;
         });
     }
-    if (_.isArray(config.headers)) {
-        out.headers = config.headers.map(function (header) {
+    if (Array.isArray(config.headers)) {
+        out.headers = config.headers.map((header) => {
             const vHeader = extractPattern("header", header);
             vHeader.headers = {};
-            (header.headers || []).forEach(function (h) {
-                vHeader.headers[h.key] = h.value;
-            });
+            if (Array.isArray(header.headers) && header.headers.length) {
+                header.headers.forEach((h) => {
+                    vHeader.headers[h.key] = h.value;
+                });
+            }
             return vHeader;
         });
     }
-    if (_.has(config, "cleanUrls")) {
+    if (has(config, "cleanUrls")) {
         out.cleanUrls = config.cleanUrls;
     }
     if (config.trailingSlash === true) {
@@ -67,11 +87,12 @@ module.exports = function (config) {
     else if (config.trailingSlash === false) {
         out.trailingSlashBehavior = "REMOVE";
     }
-    if (_.has(config, "appAssociation")) {
+    if (has(config, "appAssociation")) {
         out.appAssociation = config.appAssociation;
     }
-    if (_.has(config, "i18n")) {
+    if (has(config, "i18n")) {
         out.i18n = config.i18n;
     }
     return out;
-};
+}
+exports.convertConfig = convertConfig;

package/lib/deploy/hosting/prepare.js

@@ -1,7 +1,7 @@
 "use strict";
 const _ = require("lodash");
 const api = require("../../api");
-const convertConfig = require("./convertConfig");
+const { convertConfig } = require("./convertConfig");
 const deploymentTool = require("../../deploymentTool");
 const { FirebaseError } = require("../../error");
 const { normalizedHostingConfigs } = require("../../hosting/normalizedHostingConfigs");

package/lib/emulator/functionsEmulator.js

@@ -525,7 +525,9 @@ class FunctionsEmulator {
         if (requestedMajorVersion === hostMajorVersion) {
             this.logger.logLabeled("SUCCESS", "functions", `Using node@${requestedMajorVersion} from host.`);
         }
-        this.logger.log("WARN", `Your requested "node" version "${requestedMajorVersion}" doesn't match your global version "${hostMajorVersion}"`);
+        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;
     }
     getUserEnvs(backend) {

package/lib/extensions/extensionsApi.js

@@ -256,7 +256,6 @@ async function listExtensions(publisherId) {
     const getNextPage = async (pageToken = "") => {
         const res = await apiClient.get(`/publishers/${publisherId}/extensions`, {
             queryParams: {
-                showUnpublished: "false",
                 pageSize: PAGE_SIZE_MAX,
                 pageToken,
             },

package/lib/gcp/cloudbilling.js

@@ -1,36 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listBillingAccounts = exports.setBillingAccount = exports.checkBillingEnabled = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const utils = require("../utils");
 const API_VERSION = "v1";
+const client = new apiv2_1.Client({ urlPrefix: api_1.cloudbillingOrigin, apiVersion: API_VERSION });
 async function checkBillingEnabled(projectId) {
-    const res = await api.request("GET", utils.endpoint([API_VERSION, "projects", projectId, "billingInfo"]), {
-        auth: true,
-        origin: api.cloudbillingOrigin,
-        retryCodes: [500, 503],
-    });
+    const res = await client.get(utils.endpoint(["projects", projectId, "billingInfo"]), { retryCodes: [500, 503] });
     return res.body.billingEnabled;
 }
 exports.checkBillingEnabled = checkBillingEnabled;
 async function setBillingAccount(projectId, billingAccountName) {
-    const res = await api.request("PUT", utils.endpoint([API_VERSION, "projects", projectId, "billingInfo"]), {
-        auth: true,
-        origin: api.cloudbillingOrigin,
-        retryCodes: [500, 503],
-        data: {
-            billingAccountName: billingAccountName,
-        },
-    });
+    const res = await client.put(utils.endpoint(["projects", projectId, "billingInfo"]), {
+        billingAccountName: billingAccountName,
+    }, { retryCodes: [500, 503] });
     return res.body.billingEnabled;
 }
 exports.setBillingAccount = setBillingAccount;
 async function listBillingAccounts() {
-    const res = await api.request("GET", utils.endpoint([API_VERSION, "billingAccounts"]), {
-        auth: true,
-        origin: api.cloudbillingOrigin,
-        retryCodes: [500, 503],
-    });
+    const res = await client.get(utils.endpoint(["billingAccounts"]), { retryCodes: [500, 503] });
     return res.body.billingAccounts || [];
 }
 exports.listBillingAccounts = listBillingAccounts;

package/lib/gcp/cloudfunctions.js

@@ -5,12 +5,14 @@ const clc = require("cli-color");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
 const previews_1 = require("../previews");
-const api = require("../api");
 const backend = require("../deploy/functions/backend");
 const utils = require("../utils");
 const proto = require("./proto");
 const runtimes = require("../deploy/functions/runtimes");
+const apiv2_1 = require("../apiv2");
+const api_1 = require("../api");
 exports.API_VERSION = "v1";
+const client = new apiv2_1.Client({ urlPrefix: api_1.functionsOrigin, apiVersion: exports.API_VERSION });
 function validateFunction(func) {
     proto.assertOneOf("Cloud Function", func, "sourceCode", "sourceArchiveUrl", "sourceRepository", "sourceUploadUrl");
     proto.assertOneOf("Cloud Function", func, "trigger", "httpsTrigger", "eventTrigger");
@@ -30,16 +32,10 @@ function functionsOpLogReject(funcName, type, err) {
 }
 async function generateUploadUrl(projectId, location) {
     const parent = "projects/" + projectId + "/locations/" + location;
-    const endpoint = "/" + exports.API_VERSION + "/" + parent + "/functions:generateUploadUrl";
+    const endpoint = `/${parent}/functions:generateUploadUrl`;
     try {
-        const res = await api.request("POST", endpoint, {
-            auth: true,
-            json: false,
-            origin: api.functionsOrigin,
-            retryCodes: [503],
-        });
-        const responseBody = JSON.parse(res.body);
-        return responseBody.uploadUrl;
+        const res = await client.post(endpoint, {}, { retryCodes: [503] });
+        return res.body.uploadUrl;
     }
     catch (err) {
         logger_1.logger.info("\n\nThere was an issue deploying your functions. Verify that your project has a Google App Engine instance setup at https://console.cloud.google.com/appengine and try again. If this issue persists, please contact support.");
@@ -49,18 +45,13 @@ async function generateUploadUrl(projectId, location) {
 exports.generateUploadUrl = generateUploadUrl;
 async function createFunction(cloudFunction) {
     const apiPath = cloudFunction.name.substring(0, cloudFunction.name.lastIndexOf("/"));
-    const endpoint = `/${exports.API_VERSION}/${apiPath}`;
+    const endpoint = `/${apiPath}`;
     try {
         const headers = {};
         if (previews_1.previews.artifactregistry) {
             headers["X-Firebase-Artifact-Registry"] = "optin";
         }
-        const res = await api.request("POST", endpoint, {
-            headers,
-            auth: true,
-            data: cloudFunction,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.post(endpoint, cloudFunction, { headers });
         return {
             name: res.body.name,
             type: "create",
@@ -73,15 +64,11 @@ async function createFunction(cloudFunction) {
 }
 exports.createFunction = createFunction;
 async function setIamPolicy(options) {
-    const endpoint = `/${exports.API_VERSION}/${options.name}:setIamPolicy`;
+    const endpoint = `/${options.name}:setIamPolicy`;
     try {
-        await api.request("POST", endpoint, {
-            auth: true,
-            data: {
-                policy: options.policy,
-                updateMask: Object.keys(options.policy).join(","),
-            },
-            origin: api.functionsOrigin,
+        await client.post(endpoint, {
+            policy: options.policy,
+            updateMask: Object.keys(options.policy).join(","),
         });
     }
     catch (err) {
@@ -92,12 +79,10 @@ async function setIamPolicy(options) {
 }
 exports.setIamPolicy = setIamPolicy;
 async function getIamPolicy(fnName) {
-    const endpoint = `/${exports.API_VERSION}/${fnName}:getIamPolicy`;
+    const endpoint = `/${fnName}:getIamPolicy`;
     try {
-        return await api.request("GET", endpoint, {
-            auth: true,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.get(endpoint);
+        return res.body;
     }
     catch (err) {
         throw new error_1.FirebaseError(`Failed to get the IAM Policy on the function ${fnName}`, {
@@ -148,21 +133,18 @@ async function setInvokerUpdate(projectId, fnName, invoker) {
 }
 exports.setInvokerUpdate = setInvokerUpdate;
 async function updateFunction(cloudFunction) {
-    const endpoint = `/${exports.API_VERSION}/${cloudFunction.name}`;
+    const endpoint = `/${cloudFunction.name}`;
     const fieldMasks = proto.fieldMasks(cloudFunction, "labels", "environmentVariables");
     try {
         const headers = {};
         if (previews_1.previews.artifactregistry) {
             headers["X-Firebase-Artifact-Registry"] = "optin";
         }
-        const res = await api.request("PATCH", endpoint, {
+        const res = await client.patch(endpoint, cloudFunction, {
             headers,
-            qs: {
+            queryParams: {
                 updateMask: fieldMasks.join(","),
             },
-            auth: true,
-            data: cloudFunction,
-            origin: api.functionsOrigin,
         });
         return {
             done: false,
@@ -176,12 +158,9 @@ async function updateFunction(cloudFunction) {
 }
 exports.updateFunction = updateFunction;
 async function deleteFunction(name) {
-    const endpoint = `/${exports.API_VERSION}/${name}`;
+    const endpoint = `/${name}`;
     try {
-        const res = await api.request("DELETE", endpoint, {
-            auth: true,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.delete(endpoint);
         return {
             done: false,
             name: res.body.name,
@@ -194,12 +173,9 @@ async function deleteFunction(name) {
 }
 exports.deleteFunction = deleteFunction;
 async function list(projectId, region) {
-    const endpoint = "/" + exports.API_VERSION + "/projects/" + projectId + "/locations/" + region + "/functions";
+    const endpoint = "/projects/" + projectId + "/locations/" + region + "/functions";
     try {
-        const res = await api.request("GET", endpoint, {
-            auth: true,
-            origin: api.functionsOrigin,
-        });
+        const res = await client.get(endpoint);
         if (res.body.unreachable && res.body.unreachable.length > 0) {
             logger_1.logger.debug(`[functions] unable to reach the following regions: ${res.body.unreachable.join(", ")}`);
         }

package/lib/gcp/cloudlogging.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listEntries = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 const API_VERSION = "v2";
 async function listEntries(projectId, filter, pageSize, order) {
-    const endpoint = `/${API_VERSION}/entries:list`;
+    const client = new apiv2_1.Client({ urlPrefix: api_1.cloudloggingOrigin, apiVersion: API_VERSION });
     try {
-        const result = await api.request("POST", endpoint, {
-            auth: true,
-            data: {
-                resourceNames: [`projects/${projectId}`],
-                filter: filter,
-                orderBy: "timestamp " + order,
-                pageSize: pageSize,
-            },
-            origin: api.cloudloggingOrigin,
+        const result = await client.post("/entries:list", {
+            resourceNames: [`projects/${projectId}`],
+            filter: filter,
+            orderBy: `timestamp ${order}`,
+            pageSize: pageSize,
         });
         return result.body.entries;
     }

package/lib/gcp/cloudmonitoring.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryTimeSeries = exports.ValueType = exports.Reducer = exports.MetricKind = exports.Aligner = exports.TimeSeriesView = exports.CLOUD_MONITORING_VERSION = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const error_1 = require("../error");
 exports.CLOUD_MONITORING_VERSION = "v3";
 var TimeSeriesView;
@@ -57,11 +58,13 @@ var ValueType;
     ValueType["STRING"] = "STRING";
 })(ValueType = exports.ValueType || (exports.ValueType = {}));
 async function queryTimeSeries(query, projectNumber) {
+    const client = new apiv2_1.Client({
+        urlPrefix: api_1.cloudMonitoringOrigin,
+        apiVersion: exports.CLOUD_MONITORING_VERSION,
+    });
     try {
-        const res = await api.request("GET", `/${exports.CLOUD_MONITORING_VERSION}/projects/${projectNumber}/timeSeries/`, {
-            auth: true,
-            origin: api.cloudMonitoringOrigin,
-            data: query,
+        const res = await client.get(`/projects/${projectNumber}/timeSeries/`, {
+            queryParams: query,
         });
         return res.body.timeSeries;
     }

package/lib/gcp/cloudscheduler.js

@@ -4,7 +4,8 @@ exports.jobFromEndpoint = exports.createOrReplaceJob = exports.updateJob = expor
 const _ = require("lodash");
 const error_1 = require("../error");
 const logger_1 = require("../logger");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const backend = require("../deploy/functions/backend");
 const proto = require("./proto");
 const functional_1 = require("../functional");
@@ -17,36 +18,24 @@ function assertValidJob(job) {
     }
 }
 exports.assertValidJob = assertValidJob;
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.cloudschedulerOrigin, apiVersion: VERSION });
 function createJob(job) {
     const strippedName = job.name.substring(0, job.name.lastIndexOf("/"));
-    return api.request("POST", `/${VERSION}/${strippedName}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
-        data: Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job),
-    });
+    return apiClient.post(`/${strippedName}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
 }
 exports.createJob = createJob;
 function deleteJob(name) {
-    return api.request("DELETE", `/${VERSION}/${name}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
-    });
+    return apiClient.delete(`/${name}`);
 }
 exports.deleteJob = deleteJob;
 function getJob(name) {
-    return api.request("GET", `/${VERSION}/${name}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
+    return apiClient.get(`/${name}`, {
         resolveOnHTTPError: true,
     });
 }
 exports.getJob = getJob;
 function updateJob(job) {
-    return api.request("PATCH", `/${VERSION}/${job.name}`, {
-        auth: true,
-        origin: api.cloudschedulerOrigin,
-        data: Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job),
-    });
+    return apiClient.patch(`/${job.name}`, Object.assign({ timeZone: DEFAULT_TIME_ZONE }, job));
 }
 exports.updateJob = updateJob;
 async function createOrReplaceJob(job) {

package/lib/gcp/firedata.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.listDatabaseInstances = void 0;
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const logger_1 = require("../logger");
 const utils = require("../utils");
 function _handleErrorResponse(response) {
@@ -14,9 +15,9 @@ function _handleErrorResponse(response) {
     });
 }
 async function listDatabaseInstances(projectNumber) {
-    const response = await api.request("GET", `/v1/projects/${projectNumber}/databases`, {
-        auth: true,
-        origin: api.firedataOrigin,
+    const client = new apiv2_1.Client({ urlPrefix: api_1.firedataOrigin, apiVersion: "v1" });
+    const response = await client.get(`/projects/${projectNumber}/databases`, {
+        resolveOnHTTPError: true,
     });
     if (response.status === 200) {
         return response.body.instance;

package/lib/gcp/firestore.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDocuments = exports.deleteDocument = exports.listCollectionIds = void 0;
 const api_1 = require("../api");
-const apiv2 = require("../apiv2");
-const _CLIENT = new apiv2.Client({
+const apiv2_1 = require("../apiv2");
+const apiClient = new apiv2_1.Client({
     auth: true,
     apiVersion: "v1",
     urlPrefix: api_1.firestoreOriginOrEmulator,
@@ -13,13 +13,13 @@ function listCollectionIds(project) {
     const data = {
         pageSize: 2147483647,
     };
-    return _CLIENT.post(url, data).then((res) => {
+    return apiClient.post(url, data).then((res) => {
         return res.body.collectionIds || [];
     });
 }
 exports.listCollectionIds = listCollectionIds;
 async function deleteDocument(doc) {
-    return _CLIENT.delete(doc.name);
+    return apiClient.delete(doc.name);
 }
 exports.deleteDocument = deleteDocument;
 async function deleteDocuments(project, docs) {
@@ -28,7 +28,7 @@ async function deleteDocuments(project, docs) {
         return { delete: doc.name };
     });
     const data = { writes };
-    const res = await _CLIENT.post(url, data);
+    const res = await apiClient.post(url, data);
     return res.body.writeResults.length;
 }
 exports.deleteDocuments = deleteDocuments;

package/lib/gcp/iam.js

@@ -1,72 +1,57 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.testIamPermissions = exports.testResourceIamPermissions = exports.getRole = exports.deleteServiceAccount = exports.createServiceAccountKey = exports.getServiceAccount = exports.createServiceAccount = void 0;
-const api = require("../api");
-const utils_1 = require("../utils");
+const api_1 = require("../api");
 const lodash_1 = require("lodash");
 const logger_1 = require("../logger");
+const apiv2_1 = require("../apiv2");
 const API_VERSION = "v1";
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.iamOrigin, apiVersion: API_VERSION });
 async function createServiceAccount(projectId, accountId, description, displayName) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}/serviceAccounts`, {
-        auth: true,
-        origin: api.iamOrigin,
-        data: {
-            accountId,
-            serviceAccount: {
-                displayName,
-                description,
-            },
+    const response = await apiClient.post(`/projects/${projectId}/serviceAccounts`, {
+        accountId,
+        serviceAccount: {
+            displayName,
+            description,
         },
     });
     return response.body;
 }
 exports.createServiceAccount = createServiceAccount;
 async function getServiceAccount(projectId, serviceAccountName) {
-    const response = await api.request("GET", `/${API_VERSION}/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com`, {
-        auth: true,
-        origin: api.iamOrigin,
-    });
+    const response = await apiClient.get(`/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com`);
     return response.body;
 }
 exports.getServiceAccount = getServiceAccount;
 async function createServiceAccountKey(projectId, serviceAccountName) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com/keys`, {
-        auth: true,
-        origin: api.iamOrigin,
-        data: {
-            keyAlgorithm: "KEY_ALG_UNSPECIFIED",
-            privateKeyType: "TYPE_GOOGLE_CREDENTIALS_FILE",
-        },
+    const response = await apiClient.post(`/projects/${projectId}/serviceAccounts/${serviceAccountName}@${projectId}.iam.gserviceaccount.com/keys`, {
+        keyAlgorithm: "KEY_ALG_UNSPECIFIED",
+        privateKeyType: "TYPE_GOOGLE_CREDENTIALS_FILE",
     });
     return response.body;
 }
 exports.createServiceAccountKey = createServiceAccountKey;
 function deleteServiceAccount(projectId, accountEmail) {
-    return api.request("DELETE", `/${API_VERSION}/projects/${projectId}/serviceAccounts/${accountEmail}`, {
-        auth: true,
-        origin: api.iamOrigin,
+    return apiClient.delete(`/projects/${projectId}/serviceAccounts/${accountEmail}`, {
         resolveOnHTTPError: true,
     });
 }
 exports.deleteServiceAccount = deleteServiceAccount;
 async function getRole(role) {
-    const response = await api.request("GET", (0, utils_1.endpoint)([API_VERSION, "roles", role]), {
-        auth: true,
-        origin: api.iamOrigin,
+    const response = await apiClient.get(`/roles/${role}`, {
         retryCodes: [500, 503],
     });
     return response.body;
 }
 exports.getRole = getRole;
 async function testResourceIamPermissions(origin, apiVersion, resourceName, permissions) {
+    const localClient = new apiv2_1.Client({ urlPrefix: origin, apiVersion });
     if (process.env.FIREBASE_SKIP_INFORMATIONAL_IAM) {
         logger_1.logger.debug("[iam] skipping informational check of permissions", JSON.stringify(permissions), "on resource", resourceName);
         return { allowed: permissions, missing: [], passed: true };
     }
-    const response = await api.request("POST", `/${apiVersion}/${resourceName}:testIamPermissions`, {
-        auth: true,
-        data: { permissions },
-        origin,
+    const response = await localClient.post(`/${resourceName}:testIamPermissions`, {
+        permissions,
     });
     const allowed = (response.body.permissions || []).sort();
     const missing = (0, lodash_1.difference)(permissions, allowed);
@@ -78,6 +63,6 @@ async function testResourceIamPermissions(origin, apiVersion, resourceName, perm
 }
 exports.testResourceIamPermissions = testResourceIamPermissions;
 async function testIamPermissions(projectId, permissions) {
-    return testResourceIamPermissions(api.resourceManagerOrigin, "v1", `projects/${projectId}`, permissions);
+    return testResourceIamPermissions(api_1.resourceManagerOrigin, "v1", `projects/${projectId}`, permissions);
 }
 exports.testIamPermissions = testIamPermissions;

package/lib/gcp/resourceManager.js

@@ -2,9 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addServiceAccountToRoles = exports.setIamPolicy = exports.getIamPolicy = exports.firebaseRoles = void 0;
 const lodash_1 = require("lodash");
-const api = require("../api");
+const api_1 = require("../api");
+const apiv2_1 = require("../apiv2");
 const iam_1 = require("./iam");
 const API_VERSION = "v1";
+const apiClient = new apiv2_1.Client({ urlPrefix: api_1.resourceManagerOrigin, apiVersion: API_VERSION });
 exports.firebaseRoles = {
     apiKeysViewer: "roles/serviceusage.apiKeysViewer",
     authAdmin: "roles/firebaseauth.admin",
@@ -12,21 +14,14 @@ exports.firebaseRoles = {
     runViewer: "roles/run.viewer",
 };
 async function getIamPolicy(projectId) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}:getIamPolicy`, {
-        auth: true,
-        origin: api.resourceManagerOrigin,
-    });
+    const response = await apiClient.post(`/projects/${projectId}:getIamPolicy`);
     return response.body;
 }
 exports.getIamPolicy = getIamPolicy;
-async function setIamPolicy(projectId, newPolicy, updateMask) {
-    const response = await api.request("POST", `/${API_VERSION}/projects/${projectId}:setIamPolicy`, {
-        auth: true,
-        origin: api.resourceManagerOrigin,
-        data: {
-            policy: newPolicy,
-            updateMask: updateMask,
-        },
+async function setIamPolicy(projectId, newPolicy, updateMask = "") {
+    const response = await apiClient.post(`/projects/${projectId}:setIamPolicy`, {
+        policy: newPolicy,
+        updateMask: updateMask,
     });
     return response.body;
 }