firebase-tools 10.1.5 → 10.2.2

package/lib/api.js

@@ -67,6 +67,7 @@ var _appendQueryData = function (path, 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"),

package/lib/apiv2.js

@@ -259,6 +259,9 @@ class Client {
                             }
                         }
                     }
+                    else if (options.responseType === "xml") {
+                        body = (await res.text());
+                    }
                     else if (options.responseType === "stream") {
                         body = res.body;
                     }

package/lib/appdistribution/options-parser-util.js

@@ -16,7 +16,7 @@ function getTestersOrGroups(value, file) {
 }
 exports.getTestersOrGroups = getTestersOrGroups;
 function getEmails(emails, file) {
-    if (emails.length == 0) {
+    if (emails.length === 0) {
         ensureFileExists(file);
         const readFile = fs.readFileSync(file, "utf8");
         return splitter(readFile);

package/lib/auth.js

@@ -19,6 +19,10 @@ const logger_1 = require("./logger");
 const prompt_1 = require("./prompt");
 const scopes = require("./scopes");
 const defaultCredentials_1 = require("./defaultCredentials");
+const uuid_1 = require("uuid");
+const crypto_1 = require("crypto");
+const cli_color_1 = require("cli-color");
+const track_1 = require("./track");
 portfinder.basePort = 9005;
 function getGlobalDefaultAccount() {
     const user = configstore_1.configstore.get("user");
@@ -182,19 +186,23 @@ function getLoginUrl(callbackUrl, userHint) {
             login_hint: userHint,
         }));
 }
-async function getTokensFromAuthorizationCode(code, callbackUrl) {
+async function getTokensFromAuthorizationCode(code, callbackUrl, verifier) {
     var _a, _b;
     let res;
+    const params = {
+        code: code,
+        client_id: api.clientId,
+        client_secret: api.clientSecret,
+        redirect_uri: callbackUrl,
+        grant_type: "authorization_code",
+    };
+    if (verifier) {
+        params["code_verifier"] = verifier;
+    }
     try {
         res = await api.request("POST", "/o/oauth2/token", {
             origin: api.authOrigin,
-            form: {
-                code: code,
-                client_id: api.clientId,
-                client_secret: api.clientSecret,
-                redirect_uri: callbackUrl,
-                grant_type: "authorization_code",
-            },
+            form: params,
         });
     }
     catch (err) {
@@ -248,31 +256,58 @@ async function respondWithFile(req, res, statusCode, filename) {
     res.end(response);
     req.socket.destroy();
 }
-async function loginWithoutLocalhost(userHint) {
-    const callbackUrl = getCallbackUrl();
-    const authUrl = getLoginUrl(callbackUrl, userHint);
+function urlsafeBase64(base64string) {
+    return base64string.replace(/\+/g, "-").replace(/=+$/, "").replace(/\//g, "_");
+}
+async function loginRemotely(userHint) {
+    var _a;
+    const authProxyClient = new apiv2.Client({
+        urlPrefix: api.authProxyOrigin,
+        auth: false,
+    });
+    const sessionId = (0, uuid_1.v4)();
+    const codeVerifier = (0, crypto_1.randomBytes)(32).toString("hex");
+    const codeChallenge = urlsafeBase64((0, crypto_1.createHash)("sha256").update(codeVerifier).digest("base64"));
+    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}`;
+    logger_1.logger.info();
+    logger_1.logger.info("To sign in to the Firebase CLI:");
     logger_1.logger.info();
-    logger_1.logger.info("Visit this URL on any device to log in:");
-    logger_1.logger.info(clc.bold.underline(authUrl));
+    logger_1.logger.info("1. Take note of your session ID:");
+    logger_1.logger.info();
+    logger_1.logger.info(`   ${(0, cli_color_1.bold)(sessionId.substring(0, 5).toUpperCase())}`);
+    logger_1.logger.info();
+    logger_1.logger.info("2. Visit the URL below on any device and follow the instructions to get your code:");
+    logger_1.logger.info();
+    logger_1.logger.info(`   ${loginUrl}`);
+    logger_1.logger.info();
+    logger_1.logger.info("3. Paste or enter the authorization code below once you have it:");
     logger_1.logger.info();
-    open(authUrl);
     const code = await (0, prompt_1.promptOnce)({
         type: "input",
-        name: "code",
-        message: "Paste authorization code here:",
+        message: "Enter authorization code:",
     });
-    const tokens = await getTokensFromAuthorizationCode(code, callbackUrl);
-    return {
-        user: jwt.decode(tokens.id_token),
-        tokens: tokens,
-        scopes: SCOPES,
-    };
+    try {
+        const tokens = await getTokensFromAuthorizationCode(code, `${api.authProxyOrigin}/complete`, codeVerifier);
+        void (0, track_1.track)("login", "google_remote");
+        return {
+            user: jwt.decode(tokens.id_token),
+            tokens: tokens,
+            scopes: SCOPES,
+        };
+    }
+    catch (e) {
+        throw new error_1.FirebaseError("Unable to authenticate using the provided code. Please try again.");
+    }
 }
 async function loginWithLocalhostGoogle(port, userHint) {
     const callbackUrl = getCallbackUrl(port);
     const authUrl = getLoginUrl(callbackUrl, userHint);
     const successTemplate = "../templates/loginSuccess.html";
     const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokensFromAuthorizationCode);
+    void (0, track_1.track)("login", "google_localhost");
     return {
         user: jwt.decode(tokens.id_token),
         tokens: tokens,
@@ -283,7 +318,9 @@ async function loginWithLocalhostGitHub(port) {
     const callbackUrl = getCallbackUrl(port);
     const authUrl = getGithubLoginUrl(callbackUrl);
     const successTemplate = "../templates/loginSuccessGithub.html";
-    return loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getGithubTokensFromAuthorizationCode);
+    const tokens = await loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getGithubTokensFromAuthorizationCode);
+    void (0, track_1.track)("login", "google_localhost");
+    return tokens;
 }
 async function loginWithLocalhost(port, callbackUrl, authUrl, successTemplate, getTokens) {
     return new Promise((resolve, reject) => {
@@ -331,10 +368,10 @@ async function loginGoogle(localhost, userHint) {
             return await loginWithLocalhostGoogle(port, userHint);
         }
         catch (_a) {
-            return await loginWithoutLocalhost(userHint);
+            return await loginRemotely(userHint);
         }
     }
-    return await loginWithoutLocalhost(userHint);
+    return await loginRemotely(userHint);
 }
 exports.loginGoogle = loginGoogle;
 async function loginGithub() {

package/lib/command.js

@@ -85,7 +85,7 @@ class Command {
                     }, null, 2));
                 }
                 const duration = new Date().getTime() - start;
-                track(this.name, "success", duration).then(() => process.exit());
+                void track(this.name, "success", duration).then(() => process.exit());
             })
                 .catch(async (err) => {
                 if ((0, utils_1.getInheritedOption)(options, "json")) {

package/lib/commands/apps-android-sha-create.js

@@ -9,9 +9,9 @@ const utils_1 = require("../utils");
 function getCertHashType(shaHash) {
     shaHash = shaHash.replace(/:/g, "");
     const shaHashCount = shaHash.length;
-    if (shaHashCount == 40)
+    if (shaHashCount === 40)
         return apps_1.ShaCertificateType.SHA_1.toString();
-    if (shaHashCount == 64)
+    if (shaHashCount === 64)
         return apps_1.ShaCertificateType.SHA_256.toString();
     return apps_1.ShaCertificateType.SHA_CERTIFICATE_TYPE_UNSPECIFIED.toString();
 }

package/lib/commands/apps-sdkconfig.js

@@ -70,7 +70,7 @@ module.exports = new command_1.Command("apps:sdkconfig [platform] [appId]")
     }
     spinner.succeed();
     const fileInfo = (0, apps_1.getAppConfigFile)(configData, appPlatform);
-    if (appPlatform == apps_1.AppPlatform.WEB) {
+    if (appPlatform === apps_1.AppPlatform.WEB) {
         fileInfo.sdkConfig = configData;
     }
     if (options.out === undefined) {

package/lib/commands/auth-import.js

@@ -93,7 +93,7 @@ module.exports = new command_1.Command("auth:import [dataFile]")
                     if (err) {
                         throw new error_1.FirebaseError(`Validation Error: ${err}`);
                     }
-                    currentBatch.push(user);
+                    currentBatch.push(value);
                     if (currentBatch.length === MAX_BATCH_SIZE) {
                         batches.push(currentBatch);
                         currentBatch = [];

package/lib/commands/database-rules-list.js

@@ -18,10 +18,10 @@ exports.default = new command_1.Command("database:rules:list")
     const rulesets = await metadata.listAllRulesets(options.instance);
     for (const ruleset of rulesets) {
         const labels = [];
-        if (ruleset.id == labeled.stable) {
+        if (ruleset.id === labeled.stable) {
             labels.push("stable");
         }
-        if (ruleset.id == labeled.canary) {
+        if (ruleset.id === labeled.canary) {
             labels.push("canary");
         }
         logger_1.logger.info(`${ruleset.id}  ${ruleset.createdAt}  ${labels.join(",")}`);

package/lib/commands/emulators-start.js

@@ -59,9 +59,9 @@ module.exports = new command_1.Command("emulators:start")
     emulatorsTable.push(...controller
         .filterEmulatorTargets(options)
         .map((emulator) => {
-        const info = registry_1.EmulatorRegistry.getInfo(emulator);
         const emulatorName = constants_1.Constants.description(emulator).replace(/ emulator/i, "");
         const isSupportedByUi = types_1.EMULATORS_SUPPORTED_BY_UI.includes(emulator);
+        const info = registry_1.EmulatorRegistry.getInfo(emulator === types_1.Emulators.EXTENSIONS ? types_1.Emulators.FUNCTIONS : emulator);
         if (!info) {
             return [emulatorName, "Failed to initialize (see above)", "", ""];
         }

package/lib/commands/ext-configure.js

@@ -27,6 +27,7 @@ exports.default = new command_1.Command("ext:configure <extensionInstanceId>")
     "firebaseextensions.instances.get",
 ])
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
+    .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (instanceId, options) => {
     const spinner = ora(`Configuring ${clc.bold(instanceId)}. This usually takes 3 to 5 minutes...`);
     try {

package/lib/commands/ext-dev-init.js

@@ -24,6 +24,55 @@ function readCommonTemplates() {
         changelogTemplate: fs.readFileSync(path.join(TEMPLATE_ROOT, "CHANGELOG.md"), "utf8"),
     };
 }
+exports.default = new command_1.Command("ext:dev:init")
+    .description("initialize files for writing an extension in the current directory")
+    .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extDevMinVersion")
+    .action(async (options) => {
+    const cwd = options.cwd || process.cwd();
+    const config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
+    try {
+        const lang = await (0, prompt_1.promptOnce)({
+            type: "list",
+            name: "language",
+            message: "In which language do you want to write the Cloud Functions for your extension?",
+            default: "javascript",
+            choices: [
+                {
+                    name: "JavaScript",
+                    value: "javascript",
+                },
+                {
+                    name: "TypeScript",
+                    value: "typescript",
+                },
+            ],
+        });
+        switch (lang) {
+            case "javascript": {
+                await javascriptSelected(config);
+                break;
+            }
+            case "typescript": {
+                await typescriptSelected(config);
+                break;
+            }
+            default: {
+                throw new error_1.FirebaseError(`${lang} is not supported.`);
+            }
+        }
+        await npmDependencies.askInstallDependencies({}, config);
+        const welcome = fs.readFileSync(path.join(TEMPLATE_ROOT, lang, "WELCOME.md"), "utf8");
+        return logger_1.logger.info("\n" + marked(welcome));
+    }
+    catch (err) {
+        if (!(err instanceof error_1.FirebaseError)) {
+            throw new error_1.FirebaseError(`Error occurred when initializing files for new extension: ${err.message}`, {
+                original: err,
+            });
+        }
+        throw err;
+    }
+});
 async function typescriptSelected(config) {
     const packageLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "package.lint.json"), "utf8");
     const packageNoLintingTemplate = fs.readFileSync(path.join(TEMPLATE_ROOT, "typescript", "package.nolint.json"), "utf8");
@@ -84,52 +133,3 @@ async function javascriptSelected(config) {
     }
     await config.askWriteProjectFile("functions/.gitignore", gitignoreTemplate);
 }
-exports.default = new command_1.Command("ext:dev:init")
-    .description("initialize files for writing an extension in the current directory")
-    .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extDevMinVersion")
-    .action(async (options) => {
-    const cwd = options.cwd || process.cwd();
-    const config = new config_1.Config({}, { projectDir: cwd, cwd: cwd });
-    try {
-        const lang = await (0, prompt_1.promptOnce)({
-            type: "list",
-            name: "language",
-            message: "In which language do you want to write the Cloud Functions for your extension?",
-            default: "javascript",
-            choices: [
-                {
-                    name: "JavaScript",
-                    value: "javascript",
-                },
-                {
-                    name: "TypeScript",
-                    value: "typescript",
-                },
-            ],
-        });
-        switch (lang) {
-            case "javascript": {
-                await javascriptSelected(config);
-                break;
-            }
-            case "typescript": {
-                await typescriptSelected(config);
-                break;
-            }
-            default: {
-                throw new error_1.FirebaseError(`${lang} is not supported.`);
-            }
-        }
-        await npmDependencies.askInstallDependencies({}, config);
-        const welcome = fs.readFileSync(path.join(TEMPLATE_ROOT, lang, "WELCOME.md"), "utf8");
-        return logger_1.logger.info("\n" + marked(welcome));
-    }
-    catch (err) {
-        if (!(err instanceof error_1.FirebaseError)) {
-            throw new error_1.FirebaseError(`Error occurred when initializing files for new extension: ${err.message}`, {
-                original: err,
-            });
-        }
-        throw err;
-    }
-});

package/lib/commands/ext-export.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const checkMinRequiredVersion_1 = require("../checkMinRequiredVersion");
 const command_1 = require("../command");
+const config_1 = require("../config");
 const planner = require("../deploy/extensions/planner");
+const error_1 = require("../error");
 const export_1 = require("../extensions/export");
 const extensionsHelper_1 = require("../extensions/extensionsHelper");
+const manifest_1 = require("../extensions/manifest");
 const functional_1 = require("../functional");
 const getProjectNumber_1 = require("../getProjectNumber");
 const logger_1 = require("../logger");
@@ -24,7 +27,7 @@ module.exports = new command_1.Command("ext:export")
         const subbed = await (0, export_1.setSecretParamsToLatest)(i);
         return (0, export_1.parameterizeProject)(projectId, projectNumber, subbed);
     }));
-    if (have.length == 0) {
+    if (have.length === 0) {
         logger_1.logger.info(`No extension instances installed on ${projectId}, so there is nothing to export.`);
         return;
     }
@@ -40,5 +43,12 @@ module.exports = new command_1.Command("ext:export")
         logger_1.logger.info("Exiting. No changes made.");
         return;
     }
-    await (0, export_1.writeFiles)(withRef, options);
+    const existingConfig = config_1.Config.load(options, true);
+    if (!existingConfig) {
+        throw new error_1.FirebaseError("Not currently in a Firebase directory. Please run `firebase init` to create a Firebase directory.");
+    }
+    await (0, manifest_1.writeToManifest)(withRef, existingConfig, {
+        nonInteractive: options.nonInteractive,
+        force: options.force,
+    });
 });

package/lib/commands/ext-install.js

@@ -30,6 +30,110 @@ const previews_1 = require("../previews");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
+exports.default = new command_1.Command("ext:install [extensionName]")
+    .description("install an official extension if [extensionName] or [extensionName@version] is provided; " +
+    (previews_1.previews.extdev
+        ? "install a local extension if [localPathOrUrl] or [url#root] is provided; install a published extension (not authored by Firebase) if [publisherId/extensionId] is provided "
+        : "") +
+    "or run with `-i` to see all available extensions.")
+    .withForce()
+    .option("--params <paramsFile>", "name of params variables file with .env format.")
+    .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.create"])
+    .before(extensionsHelper_1.ensureExtensionsApiEnabled)
+    .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
+    .before(extensionsHelper_1.diagnoseAndFixProject)
+    .action(async (extensionName, options) => {
+    const projectId = (0, projectUtils_1.needProjectId)(options);
+    const paramsEnvPath = options.params;
+    let learnMore = false;
+    if (!extensionName) {
+        if (options.interactive) {
+            learnMore = true;
+            extensionName = await (0, extensionsHelper_1.promptForOfficialExtension)("Which official extension do you wish to install?\n" +
+                "  Select an extension, then press Enter to learn more.");
+        }
+        else {
+            throw new error_1.FirebaseError(`Unable to find published extension '${clc.bold(extensionName)}'. ` +
+                `Run ${clc.bold("firebase ext:install -i")} to select from the list of all available published extensions.`);
+        }
+    }
+    let source;
+    let extVersion;
+    if ((0, extensionsHelper_1.isLocalOrURLPath)(extensionName)) {
+        (0, track_1.track)("Extension Install", "Install by Source", options.interactive ? 1 : 0);
+        source = await infoInstallBySource(projectId, extensionName);
+    }
+    else {
+        (0, track_1.track)("Extension Install", "Install by Extension Ref", options.interactive ? 1 : 0);
+        extVersion = await infoInstallByReference(extensionName, options.interactive);
+    }
+    if (!(await (0, extensionsHelper_1.confirm)({
+        nonInteractive: options.nonInteractive,
+        force: options.force,
+        default: true,
+    }))) {
+        return;
+    }
+    if (!source && !extVersion) {
+        throw new error_1.FirebaseError("Could not find a source. Please specify a valid source to continue.");
+    }
+    const spec = (source === null || source === void 0 ? void 0 : source.spec) || (extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec);
+    if (!spec) {
+        throw new error_1.FirebaseError(`Could not find the extension.yaml for extension '${clc.bold(extensionName)}'. Please make sure this is a valid extension and try again.`);
+    }
+    if (learnMore) {
+        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `You selected: ${clc.bold(spec.displayName)}.\n` +
+            `${spec.description}\n` +
+            `View details: https://firebase.google.com/products/extensions/${spec.name}\n`);
+    }
+    try {
+        return installExtension({
+            paramsEnvPath,
+            projectId,
+            extensionName,
+            source,
+            extVersion,
+            nonInteractive: options.nonInteractive,
+            force: options.force,
+        });
+    }
+    catch (err) {
+        if (!(err instanceof error_1.FirebaseError)) {
+            throw new error_1.FirebaseError(`Error occurred installing the extension: ${err.message}`, {
+                original: err,
+            });
+        }
+        throw err;
+    }
+});
+async function infoInstallBySource(projectId, extensionName) {
+    let source;
+    try {
+        source = await (0, extensionsHelper_1.createSourceFromLocation)(projectId, extensionName);
+    }
+    catch (err) {
+        throw new error_1.FirebaseError(`Unable to find published extension '${clc.bold(extensionName)}', ` +
+            `and encountered the following error when trying to create an instance of extension '${clc.bold(extensionName)}':\n ${err.message}`);
+    }
+    (0, displayExtensionInfo_1.displayExtInfo)(extensionName, "", source.spec);
+    return source;
+}
+async function infoInstallByReference(extensionName, interactive) {
+    if (extensionName.split("/").length < 2) {
+        const [extensionID, version] = extensionName.split("@");
+        extensionName = `firebase/${extensionID}@${version || "latest"}`;
+    }
+    const ref = refs.parse(extensionName);
+    const extension = await extensionsApi.getExtension(refs.toExtensionRef(ref));
+    if (!ref.version) {
+        (0, track_1.track)("Extension Install", "Install by Extension Version Ref", interactive ? 1 : 0);
+        extensionName = `${extensionName}@latest`;
+    }
+    const extVersion = await extensionsApi.getExtensionVersion(extensionName);
+    (0, displayExtensionInfo_1.displayExtInfo)(extensionName, ref.publisherId, extVersion.spec, true);
+    await (0, warnings_1.displayWarningPrompts)(ref.publisherId, extension.registryLaunchStage, extVersion);
+    return extVersion;
+}
 async function installExtension(options) {
     const { projectId, extensionName, source, extVersion, paramsEnvPath, nonInteractive, force } = options;
     const spec = (source === null || source === void 0 ? void 0 : source.spec) || (extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec);
@@ -162,106 +266,3 @@ async function installExtension(options) {
         });
     }
 }
-async function infoInstallBySource(projectId, extensionName) {
-    let source;
-    try {
-        source = await (0, extensionsHelper_1.createSourceFromLocation)(projectId, extensionName);
-    }
-    catch (err) {
-        throw new error_1.FirebaseError(`Unable to find published extension '${clc.bold(extensionName)}', ` +
-            `and encountered the following error when trying to create an instance of extension '${clc.bold(extensionName)}':\n ${err.message}`);
-    }
-    (0, displayExtensionInfo_1.displayExtInfo)(extensionName, "", source.spec);
-    return source;
-}
-async function infoInstallByReference(extensionName, interactive) {
-    if (extensionName.split("/").length < 2) {
-        const [extensionID, version] = extensionName.split("@");
-        extensionName = `firebase/${extensionID}@${version || "latest"}`;
-    }
-    const ref = refs.parse(extensionName);
-    const extension = await extensionsApi.getExtension(refs.toExtensionRef(ref));
-    if (!ref.version) {
-        (0, track_1.track)("Extension Install", "Install by Extension Version Ref", interactive ? 1 : 0);
-        extensionName = `${extensionName}@latest`;
-    }
-    const extVersion = await extensionsApi.getExtensionVersion(extensionName);
-    (0, displayExtensionInfo_1.displayExtInfo)(extensionName, ref.publisherId, extVersion.spec, true);
-    await (0, warnings_1.displayWarningPrompts)(ref.publisherId, extension.registryLaunchStage, extVersion);
-    return extVersion;
-}
-exports.default = new command_1.Command("ext:install [extensionName]")
-    .description("install an official extension if [extensionName] or [extensionName@version] is provided; " +
-    (previews_1.previews.extdev
-        ? "install a local extension if [localPathOrUrl] or [url#root] is provided; install a published extension (not authored by Firebase) if [publisherId/extensionId] is provided "
-        : "") +
-    "or run with `-i` to see all available extensions.")
-    .withForce()
-    .option("--params <paramsFile>", "name of params variables file with .env format.")
-    .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.create"])
-    .before(extensionsHelper_1.ensureExtensionsApiEnabled)
-    .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
-    .action(async (extensionName, options) => {
-    const projectId = (0, projectUtils_1.needProjectId)(options);
-    const paramsEnvPath = options.params;
-    let learnMore = false;
-    if (!extensionName) {
-        if (options.interactive) {
-            learnMore = true;
-            extensionName = await (0, extensionsHelper_1.promptForOfficialExtension)("Which official extension do you wish to install?\n" +
-                "  Select an extension, then press Enter to learn more.");
-        }
-        else {
-            throw new error_1.FirebaseError(`Unable to find published extension '${clc.bold(extensionName)}'. ` +
-                `Run ${clc.bold("firebase ext:install -i")} to select from the list of all available published extensions.`);
-        }
-    }
-    let source;
-    let extVersion;
-    if ((0, extensionsHelper_1.isLocalOrURLPath)(extensionName)) {
-        (0, track_1.track)("Extension Install", "Install by Source", options.interactive ? 1 : 0);
-        source = await infoInstallBySource(projectId, extensionName);
-    }
-    else {
-        (0, track_1.track)("Extension Install", "Install by Extension Ref", options.interactive ? 1 : 0);
-        extVersion = await infoInstallByReference(extensionName, options.interactive);
-    }
-    if (!(await (0, extensionsHelper_1.confirm)({
-        nonInteractive: options.nonInteractive,
-        force: options.force,
-        default: true,
-    }))) {
-        return;
-    }
-    if (!source && !extVersion) {
-        throw new error_1.FirebaseError("Could not find a source. Please specify a valid source to continue.");
-    }
-    const spec = (source === null || source === void 0 ? void 0 : source.spec) || (extVersion === null || extVersion === void 0 ? void 0 : extVersion.spec);
-    if (!spec) {
-        throw new error_1.FirebaseError(`Could not find the extension.yaml for extension '${clc.bold(extensionName)}'. Please make sure this is a valid extension and try again.`);
-    }
-    if (learnMore) {
-        utils.logLabeledBullet(extensionsHelper_1.logPrefix, `You selected: ${clc.bold(spec.displayName)}.\n` +
-            `${spec.description}\n` +
-            `View details: https://firebase.google.com/products/extensions/${spec.name}\n`);
-    }
-    try {
-        return installExtension({
-            paramsEnvPath,
-            projectId,
-            extensionName,
-            source,
-            extVersion,
-            nonInteractive: options.nonInteractive,
-            force: options.force,
-        });
-    }
-    catch (err) {
-        if (!(err instanceof error_1.FirebaseError)) {
-            throw new error_1.FirebaseError(`Error occurred installing the extension: ${err.message}`, {
-                original: err,
-            });
-        }
-        throw err;
-    }
-});

package/lib/commands/ext-uninstall.js

@@ -19,20 +19,13 @@ const logger_1 = require("../logger");
 marked.setOptions({
     renderer: new TerminalRenderer(),
 });
-function consoleUninstallOnly(projectId, instanceId) {
-    const instanceURL = `https://console.firebase.google.com/project/${projectId}/extensions/instances/${instanceId}`;
-    const consoleUninstall = "This extension has additional uninstall checks that are not currently supported by the CLI, and can only be uninstalled through the Firebase Console. " +
-        `Please visit **[${instanceURL}](${instanceURL})** to uninstall this extension.`;
-    logger_1.logger.info("\n");
-    utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(consoleUninstall));
-    return Promise.resolve();
-}
 exports.default = new command_1.Command("ext:uninstall <extensionInstanceId>")
     .description("uninstall an extension that is installed in your Firebase project by instance ID")
     .withForce()
     .before(requirePermissions_1.requirePermissions, ["firebaseextensions.instances.delete"])
     .before(extensionsHelper_1.ensureExtensionsApiEnabled)
     .before(checkMinRequiredVersion_1.checkMinRequiredVersion, "extMinVersion")
+    .before(extensionsHelper_1.diagnoseAndFixProject)
     .action(async (instanceId, options) => {
     const projectId = (0, projectUtils_1.needProjectId)(options);
     let instance;
@@ -101,3 +94,11 @@ exports.default = new command_1.Command("ext:uninstall <extensionInstanceId>")
     }
     utils.logLabeledSuccess(extensionsHelper_1.logPrefix, `uninstalled ${clc.bold(instanceId)}`);
 });
+function consoleUninstallOnly(projectId, instanceId) {
+    const instanceURL = `https://console.firebase.google.com/project/${projectId}/extensions/instances/${instanceId}`;
+    const consoleUninstall = "This extension has additional uninstall checks that are not currently supported by the CLI, and can only be uninstalled through the Firebase Console. " +
+        `Please visit **[${instanceURL}](${instanceURL})** to uninstall this extension.`;
+    logger_1.logger.info("\n");
+    utils.logLabeledWarning(extensionsHelper_1.logPrefix, marked(consoleUninstall));
+    return Promise.resolve();
+}