firebase-tools 11.0.1 → 11.1.0

package/lib/api.js

@@ -1,221 +1,80 @@
 "use strict";
-var _ = require("lodash");
-var querystring = require("querystring");
-var request = require("request");
-var url = require("url");
-var { Constants } = require("./emulator/constants");
-var { FirebaseError } = require("./error");
-const { logger } = require("./logger");
-var responseToError = require("./responseToError");
-var scopes = require("./scopes");
-var utils = require("./utils");
-var CLI_VERSION = require("../package.json").version;
-var accessToken;
-var refreshToken;
-var commandScopes;
-var _request = function (options, logOptions) {
-    logOptions = logOptions || {};
-    var qsLog = "";
-    var bodyLog = "<request body omitted>";
-    if (options.qs && !logOptions.skipQueryParams) {
-        qsLog = JSON.stringify(options.qs);
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getScopes = exports.githubClientSecret = exports.githubClientId = exports.secretManagerOrigin = exports.githubApiOrigin = exports.githubOrigin = exports.serviceUsageOrigin = exports.cloudRunApiOrigin = exports.hostingApiOrigin = exports.firebaseStorageOrigin = exports.storageOrigin = exports.runtimeconfigOrigin = exports.rulesOrigin = exports.resourceManagerOrigin = exports.remoteConfigApiOrigin = exports.rtdbMetadataOrigin = exports.rtdbManagementOrigin = exports.realtimeOrigin = exports.extensionsOrigin = exports.iamOrigin = exports.identityOrigin = exports.hostingOrigin = exports.googleOrigin = exports.pubsubOrigin = exports.cloudTasksOrigin = exports.cloudschedulerOrigin = exports.functionsDefaultRegion = exports.runOrigin = exports.functionsV2Origin = exports.functionsOrigin = exports.firestoreOrigin = exports.firestoreOriginOrEmulator = exports.firedataOrigin = exports.firebaseExtensionsRegistryOrigin = exports.firebaseApiOrigin = exports.dynamicLinksKey = exports.dynamicLinksOrigin = exports.deployOrigin = exports.consoleOrigin = exports.authOrigin = exports.appengineOrigin = exports.appDistributionOrigin = exports.artifactRegistryDomain = exports.containerRegistryDomain = exports.cloudMonitoringOrigin = exports.cloudloggingOrigin = exports.cloudbillingOrigin = exports.clientSecret = exports.clientId = exports.authProxyOrigin = void 0;
+exports.setScopes = void 0;
+const constants_1 = require("./emulator/constants");
+const logger_1 = require("./logger");
+const scopes = require("./scopes");
+const utils = require("./utils");
+let commandScopes = new Set();
+exports.authProxyOrigin = utils.envOverride("FIREBASE_AUTHPROXY_URL", "https://auth.firebase.tools");
+exports.clientId = utils.envOverride("FIREBASE_CLIENT_ID", "563584335869-fgrhgmd47bqnekij5i8b5pr03ho849e6.apps.googleusercontent.com");
+exports.clientSecret = utils.envOverride("FIREBASE_CLIENT_SECRET", "j9iVZfS8kkCEFUPaAeJV0sAi");
+exports.cloudbillingOrigin = utils.envOverride("FIREBASE_CLOUDBILLING_URL", "https://cloudbilling.googleapis.com");
+exports.cloudloggingOrigin = utils.envOverride("FIREBASE_CLOUDLOGGING_URL", "https://logging.googleapis.com");
+exports.cloudMonitoringOrigin = utils.envOverride("CLOUD_MONITORING_URL", "https://monitoring.googleapis.com");
+exports.containerRegistryDomain = utils.envOverride("CONTAINER_REGISTRY_DOMAIN", "gcr.io");
+exports.artifactRegistryDomain = utils.envOverride("ARTIFACT_REGISTRY_DOMAIN", "https://artifactregistry.googleapis.com");
+exports.appDistributionOrigin = utils.envOverride("FIREBASE_APP_DISTRIBUTION_URL", "https://firebaseappdistribution.googleapis.com");
+exports.appengineOrigin = utils.envOverride("FIREBASE_APPENGINE_URL", "https://appengine.googleapis.com");
+exports.authOrigin = utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com");
+exports.consoleOrigin = utils.envOverride("FIREBASE_CONSOLE_URL", "https://console.firebase.google.com");
+exports.deployOrigin = utils.envOverride("FIREBASE_DEPLOY_URL", utils.envOverride("FIREBASE_UPLOAD_URL", "https://deploy.firebase.com"));
+exports.dynamicLinksOrigin = utils.envOverride("FIREBASE_DYNAMIC_LINKS_URL", "https://firebasedynamiclinks.googleapis.com");
+exports.dynamicLinksKey = utils.envOverride("FIREBASE_DYNAMIC_LINKS_KEY", "AIzaSyB6PtY5vuiSB8MNgt20mQffkOlunZnHYiQ");
+exports.firebaseApiOrigin = utils.envOverride("FIREBASE_API_URL", "https://firebase.googleapis.com");
+exports.firebaseExtensionsRegistryOrigin = utils.envOverride("FIREBASE_EXT_REGISTRY_ORIGIN", "https://extensions-registry.firebaseapp.com");
+exports.firedataOrigin = utils.envOverride("FIREBASE_FIREDATA_URL", "https://mobilesdk-pa.googleapis.com");
+exports.firestoreOriginOrEmulator = utils.envOverride(constants_1.Constants.FIRESTORE_EMULATOR_HOST, utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com"), (val) => {
+    if (val.startsWith("http")) {
+        return val;
     }
-    if (!logOptions.skipRequestBody) {
-        bodyLog = options.body || options.form || "";
+    return `http://${val}`;
+});
+exports.firestoreOrigin = utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com");
+exports.functionsOrigin = utils.envOverride("FIREBASE_FUNCTIONS_URL", "https://cloudfunctions.googleapis.com");
+exports.functionsV2Origin = utils.envOverride("FIREBASE_FUNCTIONS_V2_URL", "https://cloudfunctions.googleapis.com");
+exports.runOrigin = utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com");
+exports.functionsDefaultRegion = utils.envOverride("FIREBASE_FUNCTIONS_DEFAULT_REGION", "us-central1");
+exports.cloudschedulerOrigin = utils.envOverride("FIREBASE_CLOUDSCHEDULER_URL", "https://cloudscheduler.googleapis.com");
+exports.cloudTasksOrigin = utils.envOverride("FIREBASE_CLOUD_TAKS_URL", "https://cloudtasks.googleapis.com");
+exports.pubsubOrigin = utils.envOverride("FIREBASE_PUBSUB_URL", "https://pubsub.googleapis.com");
+exports.googleOrigin = utils.envOverride("FIREBASE_TOKEN_URL", utils.envOverride("FIREBASE_GOOGLE_URL", "https://www.googleapis.com"));
+exports.hostingOrigin = utils.envOverride("FIREBASE_HOSTING_URL", "https://web.app");
+exports.identityOrigin = utils.envOverride("FIREBASE_IDENTITY_URL", "https://identitytoolkit.googleapis.com");
+exports.iamOrigin = utils.envOverride("FIREBASE_IAM_URL", "https://iam.googleapis.com");
+exports.extensionsOrigin = utils.envOverride("FIREBASE_EXT_URL", "https://firebaseextensions.googleapis.com");
+exports.realtimeOrigin = utils.envOverride("FIREBASE_REALTIME_URL", "https://firebaseio.com");
+exports.rtdbManagementOrigin = utils.envOverride("FIREBASE_RTDB_MANAGEMENT_URL", "https://firebasedatabase.googleapis.com");
+exports.rtdbMetadataOrigin = utils.envOverride("FIREBASE_RTDB_METADATA_URL", "https://metadata-dot-firebase-prod.appspot.com");
+exports.remoteConfigApiOrigin = utils.envOverride("FIREBASE_REMOTE_CONFIG_URL", "https://firebaseremoteconfig.googleapis.com");
+exports.resourceManagerOrigin = utils.envOverride("FIREBASE_RESOURCEMANAGER_URL", "https://cloudresourcemanager.googleapis.com");
+exports.rulesOrigin = utils.envOverride("FIREBASE_RULES_URL", "https://firebaserules.googleapis.com");
+exports.runtimeconfigOrigin = utils.envOverride("FIREBASE_RUNTIMECONFIG_URL", "https://runtimeconfig.googleapis.com");
+exports.storageOrigin = utils.envOverride("FIREBASE_STORAGE_URL", "https://storage.googleapis.com");
+exports.firebaseStorageOrigin = utils.envOverride("FIREBASE_FIREBASESTORAGE_URL", "https://firebasestorage.googleapis.com");
+exports.hostingApiOrigin = utils.envOverride("FIREBASE_HOSTING_API_URL", "https://firebasehosting.googleapis.com");
+exports.cloudRunApiOrigin = utils.envOverride("CLOUD_RUN_API_URL", "https://run.googleapis.com");
+exports.serviceUsageOrigin = utils.envOverride("FIREBASE_SERVICE_USAGE_URL", "https://serviceusage.googleapis.com");
+exports.githubOrigin = utils.envOverride("GITHUB_URL", "https://github.com");
+exports.githubApiOrigin = utils.envOverride("GITHUB_API_URL", "https://api.github.com");
+exports.secretManagerOrigin = utils.envOverride("CLOUD_SECRET_MANAGER_URL", "https://secretmanager.googleapis.com");
+exports.githubClientId = utils.envOverride("GITHUB_CLIENT_ID", "89cf50f02ac6aaed3484");
+exports.githubClientSecret = utils.envOverride("GITHUB_CLIENT_SECRET", "3330d14abc895d9a74d5f17cd7a00711fa2c5bf0");
+function getScopes() {
+    return Array.from(commandScopes);
+}
+exports.getScopes = getScopes;
+function setScopes(sps = []) {
+    commandScopes = new Set([
+        scopes.EMAIL,
+        scopes.OPENID,
+        scopes.CLOUD_PROJECTS_READONLY,
+        scopes.FIREBASE_PLATFORM,
+    ]);
+    for (const s of sps) {
+        commandScopes.add(s);
     }
-    logger.debug(">>> HTTP REQUEST", options.method, options.url, qsLog, "\n", bodyLog);
-    options.headers = options.headers || {};
-    options.headers["connection"] = "keep-alive";
-    return new Promise(function (resolve, reject) {
-        var req = request(options, function (err, response, body) {
-            if (err) {
-                return reject(new FirebaseError("Server Error. " + err.message, {
-                    original: err,
-                    exit: 2,
-                }));
-            }
-            logger.debug("<<< HTTP RESPONSE", response.statusCode, response.headers);
-            if (response.statusCode >= 400 && !logOptions.skipResponseBody) {
-                logger.debug("<<< HTTP RESPONSE BODY", response.body);
-                if (!options.resolveOnHTTPError) {
-                    return reject(responseToError(response, body));
-                }
-            }
-            return resolve({
-                status: response.statusCode,
-                response: response,
-                body: body,
-            });
-        });
-        if (_.size(options.files) > 0) {
-            var form = req.form();
-            _.forEach(options.files, function (details, param) {
-                form.append(param, details.stream, {
-                    knownLength: details.knownLength,
-                    filename: details.filename,
-                    contentType: details.contentType,
-                });
-            });
-        }
-    });
-};
-var _appendQueryData = function (path, data) {
-    if (data && _.size(data) > 0) {
-        path += _.includes(path, "?") ? "&" : "?";
-        path += querystring.stringify(data);
-    }
-    return path;
-};
-var api = {
-    authProxyOrigin: utils.envOverride("FIREBASE_AUTHPROXY_URL", "https://auth.firebase.tools"),
-    clientId: utils.envOverride("FIREBASE_CLIENT_ID", "563584335869-fgrhgmd47bqnekij5i8b5pr03ho849e6.apps.googleusercontent.com"),
-    clientSecret: utils.envOverride("FIREBASE_CLIENT_SECRET", "j9iVZfS8kkCEFUPaAeJV0sAi"),
-    cloudbillingOrigin: utils.envOverride("FIREBASE_CLOUDBILLING_URL", "https://cloudbilling.googleapis.com"),
-    cloudloggingOrigin: utils.envOverride("FIREBASE_CLOUDLOGGING_URL", "https://logging.googleapis.com"),
-    cloudMonitoringOrigin: utils.envOverride("CLOUD_MONITORING_URL", "https://monitoring.googleapis.com"),
-    containerRegistryDomain: utils.envOverride("CONTAINER_REGISTRY_DOMAIN", "gcr.io"),
-    artifactRegistryDomain: utils.envOverride("ARTIFACT_REGISTRY_DOMAIN", "https://artifactregistry.googleapis.com"),
-    appDistributionOrigin: utils.envOverride("FIREBASE_APP_DISTRIBUTION_URL", "https://firebaseappdistribution.googleapis.com"),
-    appengineOrigin: utils.envOverride("FIREBASE_APPENGINE_URL", "https://appengine.googleapis.com"),
-    authOrigin: utils.envOverride("FIREBASE_AUTH_URL", "https://accounts.google.com"),
-    consoleOrigin: utils.envOverride("FIREBASE_CONSOLE_URL", "https://console.firebase.google.com"),
-    deployOrigin: utils.envOverride("FIREBASE_DEPLOY_URL", utils.envOverride("FIREBASE_UPLOAD_URL", "https://deploy.firebase.com")),
-    dynamicLinksOrigin: utils.envOverride("FIREBASE_DYNAMIC_LINKS_URL", "https://firebasedynamiclinks.googleapis.com"),
-    dynamicLinksKey: utils.envOverride("FIREBASE_DYNAMIC_LINKS_KEY", "AIzaSyB6PtY5vuiSB8MNgt20mQffkOlunZnHYiQ"),
-    firebaseApiOrigin: utils.envOverride("FIREBASE_API_URL", "https://firebase.googleapis.com"),
-    firebaseExtensionsRegistryOrigin: utils.envOverride("FIREBASE_EXT_REGISTRY_ORIGIN", "https://extensions-registry.firebaseapp.com"),
-    firedataOrigin: utils.envOverride("FIREBASE_FIREDATA_URL", "https://mobilesdk-pa.googleapis.com"),
-    firestoreOriginOrEmulator: utils.envOverride(Constants.FIRESTORE_EMULATOR_HOST, utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com"), (val) => {
-        if (val.startsWith("http")) {
-            return val;
-        }
-        return `http://${val}`;
-    }),
-    firestoreOrigin: utils.envOverride("FIRESTORE_URL", "https://firestore.googleapis.com"),
-    functionsOrigin: utils.envOverride("FIREBASE_FUNCTIONS_URL", "https://cloudfunctions.googleapis.com"),
-    functionsV2Origin: utils.envOverride("FIREBASE_FUNCTIONS_V2_URL", "https://cloudfunctions.googleapis.com"),
-    runOrigin: utils.envOverride("CLOUD_RUN_URL", "https://run.googleapis.com"),
-    functionsDefaultRegion: utils.envOverride("FIREBASE_FUNCTIONS_DEFAULT_REGION", "us-central1"),
-    cloudschedulerOrigin: utils.envOverride("FIREBASE_CLOUDSCHEDULER_URL", "https://cloudscheduler.googleapis.com"),
-    cloudTasksOrigin: utils.envOverride("FIREBASE_CLOUD_TAKS_URL", "https://cloudtasks.googleapis.com"),
-    pubsubOrigin: utils.envOverride("FIREBASE_PUBSUB_URL", "https://pubsub.googleapis.com"),
-    googleOrigin: utils.envOverride("FIREBASE_TOKEN_URL", utils.envOverride("FIREBASE_GOOGLE_URL", "https://www.googleapis.com")),
-    hostingOrigin: utils.envOverride("FIREBASE_HOSTING_URL", "https://web.app"),
-    identityOrigin: utils.envOverride("FIREBASE_IDENTITY_URL", "https://identitytoolkit.googleapis.com"),
-    iamOrigin: utils.envOverride("FIREBASE_IAM_URL", "https://iam.googleapis.com"),
-    extensionsOrigin: utils.envOverride("FIREBASE_EXT_URL", "https://firebaseextensions.googleapis.com"),
-    realtimeOrigin: utils.envOverride("FIREBASE_REALTIME_URL", "https://firebaseio.com"),
-    rtdbManagementOrigin: utils.envOverride("FIREBASE_RTDB_MANAGEMENT_URL", "https://firebasedatabase.googleapis.com"),
-    rtdbMetadataOrigin: utils.envOverride("FIREBASE_RTDB_METADATA_URL", "https://metadata-dot-firebase-prod.appspot.com"),
-    remoteConfigApiOrigin: utils.envOverride("FIREBASE_REMOTE_CONFIG_URL", "https://firebaseremoteconfig.googleapis.com"),
-    resourceManagerOrigin: utils.envOverride("FIREBASE_RESOURCEMANAGER_URL", "https://cloudresourcemanager.googleapis.com"),
-    rulesOrigin: utils.envOverride("FIREBASE_RULES_URL", "https://firebaserules.googleapis.com"),
-    runtimeconfigOrigin: utils.envOverride("FIREBASE_RUNTIMECONFIG_URL", "https://runtimeconfig.googleapis.com"),
-    storageOrigin: utils.envOverride("FIREBASE_STORAGE_URL", "https://storage.googleapis.com"),
-    firebaseStorageOrigin: utils.envOverride("FIREBASE_FIREBASESTORAGE_URL", "https://firebasestorage.googleapis.com"),
-    hostingApiOrigin: utils.envOverride("FIREBASE_HOSTING_API_URL", "https://firebasehosting.googleapis.com"),
-    cloudRunApiOrigin: utils.envOverride("CLOUD_RUN_API_URL", "https://run.googleapis.com"),
-    serviceUsageOrigin: utils.envOverride("FIREBASE_SERVICE_USAGE_URL", "https://serviceusage.googleapis.com"),
-    githubOrigin: utils.envOverride("GITHUB_URL", "https://github.com"),
-    githubApiOrigin: utils.envOverride("GITHUB_API_URL", "https://api.github.com"),
-    secretManagerOrigin: utils.envOverride("CLOUD_SECRET_MANAGER_URL", "https://secretmanager.googleapis.com"),
-    githubClientId: utils.envOverride("GITHUB_CLIENT_ID", "89cf50f02ac6aaed3484"),
-    githubClientSecret: utils.envOverride("GITHUB_CLIENT_SECRET", "3330d14abc895d9a74d5f17cd7a00711fa2c5bf0"),
-    setRefreshToken: function (token) {
-        refreshToken = token;
-    },
-    setAccessToken: function (token) {
-        accessToken = token;
-    },
-    getScopes: function () {
-        return commandScopes;
-    },
-    setScopes: function (s) {
-        commandScopes = _.uniq(_.flatten([
-            scopes.EMAIL,
-            scopes.OPENID,
-            scopes.CLOUD_PROJECTS_READONLY,
-            scopes.FIREBASE_PLATFORM,
-        ].concat(s || [])));
-        logger.debug("> command requires scopes:", JSON.stringify(commandScopes));
-    },
-    getAccessToken: function () {
-        return accessToken
-            ? Promise.resolve({ access_token: accessToken })
-            : require("./auth").getAccessToken(refreshToken, commandScopes);
-    },
-    addRequestHeaders: function (reqOptions, options) {
-        _.set(reqOptions, ["headers", "User-Agent"], "FirebaseCLI/" + CLI_VERSION);
-        _.set(reqOptions, ["headers", "X-Client-Version"], "FirebaseCLI/" + CLI_VERSION);
-        var secureRequest = true;
-        if (options && options.origin) {
-            const originUrl = url.parse(options.origin);
-            secureRequest = originUrl.protocol === "https:";
-        }
-        var getTokenPromise = secureRequest
-            ? api.getAccessToken()
-            : Promise.resolve({ access_token: "owner" });
-        return getTokenPromise.then(function (result) {
-            _.set(reqOptions, "headers.authorization", "Bearer " + result.access_token);
-            return reqOptions;
-        });
-    },
-    request: function (method, resource, options) {
-        options = _.extend({
-            data: {},
-            resolveOnHTTPError: false,
-            json: true,
-        }, options);
-        if (!options.origin) {
-            throw new FirebaseError("Cannot make request without an origin", { exit: 2 });
-        }
-        var validMethods = ["GET", "PUT", "POST", "DELETE", "PATCH"];
-        if (validMethods.indexOf(method) < 0) {
-            method = "GET";
-        }
-        var reqOptions = {
-            method: method,
-        };
-        if (options.query) {
-            resource = _appendQueryData(resource, options.query);
-        }
-        if (method === "GET") {
-            resource = _appendQueryData(resource, options.data);
-        }
-        else {
-            if (_.size(options.data) > 0) {
-                reqOptions.body = options.data;
-            }
-            else if (_.size(options.form) > 0) {
-                reqOptions.form = options.form;
-            }
-        }
-        reqOptions.url = options.origin + resource;
-        reqOptions.files = options.files;
-        reqOptions.resolveOnHTTPError = options.resolveOnHTTPError;
-        reqOptions.json = options.json;
-        reqOptions.qs = options.qs;
-        reqOptions.headers = options.headers;
-        reqOptions.timeout = options.timeout;
-        var requestFunction = function () {
-            return _request(reqOptions, options.logOptions);
-        };
-        if (options.auth === true) {
-            requestFunction = function () {
-                return api.addRequestHeaders(reqOptions, options).then(function (reqOptionsWithToken) {
-                    return _request(reqOptionsWithToken, options.logOptions);
-                });
-            };
-        }
-        return requestFunction().catch(function (err) {
-            if (options.retryCodes &&
-                _.includes(options.retryCodes, _.get(err, "context.response.statusCode"))) {
-                return new Promise(function (resolve) {
-                    setTimeout(resolve, 1000);
-                }).then(requestFunction);
-            }
-            return Promise.reject(err);
-        });
-    },
-};
-module.exports = api;
+    logger_1.logger.debug("> command requires scopes:", Array.from(commandScopes));
+}
+exports.setScopes = setScopes;

package/lib/apiv2.js

@@ -11,7 +11,8 @@ const util_1 = require("util");
 const auth = require("./auth");
 const error_1 = require("./error");
 const logger_1 = require("./logger");
-const responseToError = require("./responseToError");
+const responseToError_1 = require("./responseToError");
+const FormData = require("form-data");
 const pkg = require("../package.json");
 const CLI_VERSION = pkg.version;
 let accessToken = "";
@@ -277,13 +278,13 @@ class Client {
                 this.logResponse(res, body, options);
                 if (res.status >= 400) {
                     if ((_a = options.retryCodes) === null || _a === void 0 ? void 0 : _a.includes(res.status)) {
-                        const err = responseToError({ statusCode: res.status }, body) || undefined;
+                        const err = (0, responseToError_1.responseToError)({ statusCode: res.status }, body) || undefined;
                         if (operation.retry(err)) {
                             return;
                         }
                     }
                     if (!options.resolveOnHTTPError) {
-                        return reject(responseToError({ statusCode: res.status }, body));
+                        return reject((0, responseToError_1.responseToError)({ statusCode: res.status }, body));
                     }
                 }
                 resolve({
@@ -346,5 +347,5 @@ function bodyToString(body) {
     }
 }
 function isStream(o) {
-    return o instanceof stream_1.Readable;
+    return o instanceof stream_1.Readable || o instanceof FormData;
 }

package/lib/auth.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.logout = exports.getAccessToken = exports.findAccountByEmail = exports.loginGithub = exports.loginGoogle = exports.setGlobalDefaultAccount = exports.setProjectAccount = exports.loginAdditionalAccount = exports.selectAccount = exports.setRefreshToken = exports.setActiveAccount = exports.getAllAccounts = exports.getAdditionalAccounts = exports.getProjectDefaultAccount = exports.getGlobalDefaultAccount = void 0;
 const clc = require("cli-color");
+const FormData = require("form-data");
 const fs = require("fs");
-const jwt = require("jsonwebtoken");
 const http = require("http");
+const jwt = require("jsonwebtoken");
 const opn = require("open");
 const path = require("path");
 const portfinder = require("portfinder");
 const url = require("url");
 const util = require("util");
-const api = require("./api");
 const apiv2 = require("./apiv2");
 const configstore_1 = require("./configstore");
 const error_1 = require("./error");
@@ -23,6 +23,7 @@ const uuid_1 = require("uuid");
 const crypto_1 = require("crypto");
 const cli_color_1 = require("cli-color");
 const track_1 = require("./track");
+const api_1 = require("./api");
 portfinder.basePort = 9005;
 function getGlobalDefaultAccount() {
     const user = configstore_1.configstore.get("user");
@@ -72,7 +73,6 @@ function setActiveAccount(options, account) {
 }
 exports.setActiveAccount = setActiveAccount;
 function setRefreshToken(token) {
-    api.setRefreshToken(token);
     apiv2.setRefreshToken(token);
 }
 exports.setRefreshToken = setRefreshToken;
@@ -175,10 +175,10 @@ function queryParamString(args) {
     return tokens.join("&");
 }
 function getLoginUrl(callbackUrl, userHint) {
-    return (api.authOrigin +
+    return (api_1.authOrigin +
         "/o/oauth2/auth?" +
         queryParamString({
-            client_id: api.clientId,
+            client_id: api_1.clientId,
             scope: SCOPES.join(" "),
             response_type: "code",
             state: _nonce,
@@ -187,22 +187,29 @@ function getLoginUrl(callbackUrl, userHint) {
         }));
 }
 async function getTokensFromAuthorizationCode(code, callbackUrl, verifier) {
-    var _a, _b;
-    let res;
     const params = {
         code: code,
-        client_id: api.clientId,
-        client_secret: api.clientSecret,
+        client_id: api_1.clientId,
+        client_secret: api_1.clientSecret,
         redirect_uri: callbackUrl,
         grant_type: "authorization_code",
     };
     if (verifier) {
         params["code_verifier"] = verifier;
     }
+    let res;
     try {
-        res = await api.request("POST", "/o/oauth2/token", {
-            origin: api.authOrigin,
-            form: params,
+        const client = new apiv2.Client({ urlPrefix: api_1.authOrigin, auth: false });
+        const form = new FormData();
+        for (const [k, v] of Object.entries(params)) {
+            form.append(k, v);
+        }
+        res = await client.request({
+            method: "POST",
+            path: "/o/oauth2/token",
+            body: form,
+            headers: form.getHeaders(),
+            skipLog: { body: true, queryParams: true, resBody: true },
         });
     }
     catch (err) {
@@ -214,8 +221,8 @@ async function getTokensFromAuthorizationCode(code, callbackUrl, verifier) {
         }
         throw invalidCredentialError();
     }
-    if (!((_a = res === null || res === void 0 ? void 0 : res.body) === null || _a === void 0 ? void 0 : _a.access_token) && !((_b = res === null || res === void 0 ? void 0 : res.body) === null || _b === void 0 ? void 0 : _b.refresh_token)) {
-        logger_1.logger.debug("Token Fetch Error:", res.statusCode, res.body);
+    if (!res.body.access_token && !res.body.refresh_token) {
+        logger_1.logger.debug("Token Fetch Error:", res.status, res.body);
         throw invalidCredentialError();
     }
     lastAccessToken = Object.assign({
@@ -225,25 +232,35 @@ async function getTokensFromAuthorizationCode(code, callbackUrl, verifier) {
 }
 const GITHUB_SCOPES = ["read:user", "repo", "public_repo"];
 function getGithubLoginUrl(callbackUrl) {
-    return (api.githubOrigin +
+    return (api_1.githubOrigin +
         "/login/oauth/authorize?" +
         queryParamString({
-            client_id: api.githubClientId,
+            client_id: api_1.githubClientId,
             state: _nonce,
             redirect_uri: callbackUrl,
             scope: GITHUB_SCOPES.join(" "),
         }));
 }
 async function getGithubTokensFromAuthorizationCode(code, callbackUrl) {
-    const res = await api.request("POST", "/login/oauth/access_token", {
-        origin: api.githubOrigin,
-        form: {
-            client_id: api.githubClientId,
-            client_secret: api.githubClientSecret,
-            code,
-            redirect_uri: callbackUrl,
-            state: _nonce,
-        },
+    const client = new apiv2.Client({ urlPrefix: api_1.githubOrigin, auth: false });
+    const data = {
+        client_id: api_1.githubClientId,
+        client_secret: api_1.githubClientSecret,
+        code,
+        redirect_uri: callbackUrl,
+        state: _nonce,
+    };
+    const form = new FormData();
+    for (const [k, v] of Object.entries(data)) {
+        form.append(k, v);
+    }
+    const headers = form.getHeaders();
+    headers.accept = "application/json";
+    const res = await client.request({
+        method: "POST",
+        path: "/login/oauth/access_token",
+        body: form,
+        headers,
     });
     return res.body.access_token;
 }
@@ -262,7 +279,7 @@ function urlsafeBase64(base64string) {
 async function loginRemotely(userHint) {
     var _a;
     const authProxyClient = new apiv2.Client({
-        urlPrefix: api.authProxyOrigin,
+        urlPrefix: api_1.authProxyOrigin,
         auth: false,
     });
     const sessionId = (0, uuid_1.v4)();
@@ -271,7 +288,7 @@ async function loginRemotely(userHint) {
     const attestToken = (_a = (await authProxyClient.post("/attest", {
         session_id: sessionId,
     })).body) === null || _a === void 0 ? void 0 : _a.token;
-    const loginUrl = `${api.authProxyOrigin}/login?code_challenge=${codeChallenge}&session=${sessionId}&attest=${attestToken}`;
+    const loginUrl = `${api_1.authProxyOrigin}/login?code_challenge=${codeChallenge}&session=${sessionId}&attest=${attestToken}`;
     logger_1.logger.info();
     logger_1.logger.info("To sign in to the Firebase CLI:");
     logger_1.logger.info();
@@ -290,7 +307,7 @@ async function loginRemotely(userHint) {
         message: "Enter authorization code:",
     });
     try {
-        const tokens = await getTokensFromAuthorizationCode(code, `${api.authProxyOrigin}/complete`, codeVerifier);
+        const tokens = await getTokensFromAuthorizationCode(code, `${api_1.authProxyOrigin}/complete`, codeVerifier);
         void (0, track_1.track)("login", "google_remote");
         return {
             user: jwt.decode(tokens.id_token),
@@ -442,24 +459,33 @@ function logoutCurrentSession(refreshToken) {
     deleteAccount(account);
 }
 async function refreshTokens(refreshToken, authScopes) {
-    var _a, _b, _c;
+    var _a, _b;
     logger_1.logger.debug("> refreshing access token with scopes:", JSON.stringify(authScopes));
     try {
-        const res = await api.request("POST", "/oauth2/v3/token", {
-            origin: api.googleOrigin,
-            form: {
-                refresh_token: refreshToken,
-                client_id: api.clientId,
-                client_secret: api.clientSecret,
-                grant_type: "refresh_token",
-                scope: (authScopes || []).join(" "),
-            },
-            logOptions: { skipRequestBody: true, skipQueryParams: true, skipResponseBody: true },
+        const client = new apiv2.Client({ urlPrefix: api_1.googleOrigin, auth: false });
+        const data = {
+            refresh_token: refreshToken,
+            client_id: api_1.clientId,
+            client_secret: api_1.clientSecret,
+            grant_type: "refresh_token",
+            scope: (authScopes || []).join(" "),
+        };
+        const form = new FormData();
+        for (const [k, v] of Object.entries(data)) {
+            form.append(k, v);
+        }
+        const res = await client.request({
+            method: "POST",
+            path: "/oauth2/v3/token",
+            body: form,
+            headers: form.getHeaders(),
+            skipLog: { body: true, queryParams: true, resBody: true },
+            resolveOnHTTPError: true,
         });
         if (res.status === 401 || res.status === 400) {
             return { access_token: refreshToken };
         }
-        if (typeof ((_a = res.body) === null || _a === void 0 ? void 0 : _a.access_token) !== "string") {
+        if (typeof res.body.access_token !== "string") {
             throw invalidCredentialError();
         }
         lastAccessToken = Object.assign({
@@ -475,7 +501,7 @@ async function refreshTokens(refreshToken, authScopes) {
         return lastAccessToken;
     }
     catch (err) {
-        if (((_c = (_b = err === null || err === void 0 ? void 0 : err.context) === null || _b === void 0 ? void 0 : _b.body) === null || _c === void 0 ? void 0 : _c.error) === "invalid_scope") {
+        if (((_b = (_a = err === null || err === void 0 ? void 0 : err.context) === null || _a === void 0 ? void 0 : _a.body) === null || _b === void 0 ? void 0 : _b.error) === "invalid_scope") {
             throw new error_1.FirebaseError("This command requires new authorization scopes not granted to your current session. Please run " +
                 clc.bold("firebase login --reauth") +
                 "\n\n" +
@@ -498,12 +524,8 @@ async function logout(refreshToken) {
     }
     logoutCurrentSession(refreshToken);
     try {
-        await api.request("GET", "/o/oauth2/revoke", {
-            origin: api.authOrigin,
-            data: {
-                token: refreshToken,
-            },
-        });
+        const client = new apiv2.Client({ urlPrefix: api_1.authOrigin, auth: false });
+        await client.get("/o/oauth2/revoke", { queryParams: { token: refreshToken } });
     }
     catch (thrown) {
         const err = thrown instanceof Error ? thrown : new Error(thrown);