@microsoft/teamsfx-core 0.7.0 → 0.7.1-alpha.5e8f6dea.0

package/build/plugins/solution/fx-solution/solution.js

@@ -8,30 +8,33 @@ const tslib_1 = require("tslib");
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const commonQuestions_1 = require("./commonQuestions");
-const executor_1 = require("./executor");
-const util_1 = require("./utils/util");
+const axios_1 = tslib_1.__importDefault(require("axios"));
 const fs = tslib_1.__importStar(require("fs-extra"));
-const constants_1 = require("./constants");
-const question_1 = require("./question");
 const mustache_1 = tslib_1.__importDefault(require("mustache"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const typedi_1 = require("typedi");
 const util = tslib_1.__importStar(require("util"));
+const constants_1 = require("../../../common/constants");
+const localSettingsConstants_1 = require("../../../common/localSettingsConstants");
 const tools_1 = require("../../../common/tools");
-const ResourcePluginContainer_1 = require("./ResourcePluginContainer");
-const resource_1 = require("../../resource");
+const core_1 = require("../../../core");
 const errorHandler_1 = require("../../../core/middleware/errorHandler");
-const lib_1 = require("@feathersjs/hooks/lib");
-const typedi_1 = require("typedi");
-const arm_1 = require("./arm");
-const constants_2 = require("../../../common/constants");
-const localSettingsConstants_1 = require("../../../common/localSettingsConstants");
-const scaffolding_1 = require("./v2/scaffolding");
 const permissionRequest_1 = require("../../../core/permissionRequest");
-const axios_1 = tslib_1.__importDefault(require("axios"));
+const SolutionPluginContainer_1 = require("../../../core/SolutionPluginContainer");
+const resource_1 = require("../../resource");
+const arm_1 = require("./arm");
+const commonQuestions_1 = require("./commonQuestions");
+const constants_2 = require("./constants");
+const executor_1 = require("./executor");
+const question_1 = require("./question");
+const ResourcePluginContainer_1 = require("./ResourcePluginContainer");
+const util_1 = require("./utils/util");
 const executeUserTask_1 = require("./v2/executeUserTask");
-const envInfoLoader_1 = require("../../../core/middleware/envInfoLoader");
+const utils_1 = require("./v2/utils");
+const provision_1 = require("./v2/provision");
+const scaffolding_1 = require("./v2/scaffolding");
 // Maybe we need a state machine to track state transition.
 var SolutionRunningState;
 (function (SolutionRunningState) {
@@ -63,56 +66,10 @@ let TeamsAppSolution = class TeamsAppSolution {
     }
     assertSettingsNotEmpty(settings, key) {
         if (!settings) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`${key} is undefined`), "Solution", constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`${key} is undefined`), "Solution", constants_2.SolutionError.InternelError));
         }
         return teamsfx_api_1.ok(settings);
     }
-    fillInSolutionSettings(ctx) {
-        var _a;
-        const assertList = [
-            this.assertSettingsNotEmpty(ctx.answers, "answers"),
-            this.assertSettingsNotEmpty(ctx.projectSettings, "projectSettings"),
-            this.assertSettingsNotEmpty((_a = ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings, "solutionSettings"),
-        ];
-        const assertRes = teamsfx_api_1.combine(assertList);
-        if (assertRes.isErr()) {
-            return teamsfx_api_1.err(assertRes.error);
-        }
-        const [answers, projectSettings, solutionSettingsSource] = assertRes.value;
-        const capabilities = answers[question_1.AzureSolutionQuestionNames.Capabilities] || [];
-        if (!capabilities || capabilities.length === 0) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("capabilities is empty"), "Solution", constants_1.SolutionError.InternelError));
-        }
-        let hostType = answers[question_1.AzureSolutionQuestionNames.HostType];
-        if (capabilities.includes(question_1.BotOptionItem.id) || capabilities.includes(question_1.MessageExtensionItem.id))
-            hostType = question_1.HostTypeOptionAzure.id;
-        if (!hostType) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("hostType is undefined"), "Solution", constants_1.SolutionError.InternelError));
-        }
-        let azureResources;
-        if (hostType === question_1.HostTypeOptionAzure.id && capabilities.includes(question_1.TabOptionItem.id)) {
-            azureResources = answers[question_1.AzureSolutionQuestionNames.AzureResources];
-            if (azureResources) {
-                if ((azureResources.includes(question_1.AzureResourceSQL.id) ||
-                    azureResources.includes(question_1.AzureResourceApim.id)) &&
-                    !azureResources.includes(question_1.AzureResourceFunction.id)) {
-                    azureResources.push(question_1.AzureResourceFunction.id);
-                }
-            }
-            else
-                azureResources = [];
-        }
-        const solutionSettings = {
-            name: solutionSettingsSource.name,
-            version: solutionSettingsSource.version,
-            hostType: hostType,
-            capabilities: capabilities,
-            azureResources: azureResources || [],
-            activeResourcePlugins: [],
-        };
-        projectSettings.solutionSettings = solutionSettings;
-        return teamsfx_api_1.ok(solutionSettings);
-    }
     async fillInV1SolutionSettings(ctx) {
         var _a;
         const assertList = [
@@ -129,7 +86,7 @@ let TeamsAppSolution = class TeamsAppSolution {
         projectSettings.programmingLanguage = isTypescriptProject ? "typescript" : "javascript";
         const capability = answers[question_1.AzureSolutionQuestionNames.V1Capability];
         if (!capability) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("capabilities is empty"), "Solution", constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("capabilities is empty"), "Solution", constants_2.SolutionError.InternelError));
         }
         const solutionSettings = {
             name: solutionSettingsSource.name,
@@ -147,56 +104,59 @@ let TeamsAppSolution = class TeamsAppSolution {
      * create
      */
     async create(ctx) {
-        var _a, _b;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.CreateStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        var _a, _b, _c, _d;
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.CreateStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
+        if (!ctx.projectSettings)
+            return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionError.InternelError, "projectSettings undefined", "Solution"));
         // ensure that global namespace is present
-        if (!ctx.envInfo.profile.has(constants_1.GLOBAL_CONFIG)) {
-            ctx.envInfo.profile.set(constants_1.GLOBAL_CONFIG, new teamsfx_api_1.ConfigMap());
+        if (!ctx.envInfo.profile.has(constants_2.GLOBAL_CONFIG)) {
+            ctx.envInfo.profile.set(constants_2.GLOBAL_CONFIG, new teamsfx_api_1.ConfigMap());
         }
         // Only non-SPFx project will ask this question.
         const lang = ctx.answers[question_1.AzureSolutionQuestionNames.ProgrammingLanguage];
         if (lang) {
             ctx.projectSettings.programmingLanguage = lang;
         }
-        const settingsRes = this.fillInSolutionSettings(ctx);
+        const solutionSettings = ctx.projectSettings.solutionSettings;
+        const settingsRes = utils_1.fillInSolutionSettings(solutionSettings, ctx.answers);
         if (settingsRes.isErr()) {
-            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.Create, settingsRes.error, ctx.telemetryReporter));
+            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.Create, settingsRes.error, ctx.telemetryReporter));
         }
-        const solutionSettings = settingsRes.value;
         //Reload plugins according to user answers
         await this.reloadPlugins(solutionSettings);
         if (this.isAzureProject(ctx)) {
-            await fs.writeJSON(`${ctx.root}/permissions.json`, constants_1.DEFAULT_PERMISSION_REQUEST, { spaces: 4 });
-            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Create, {
-                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-                [constants_1.SolutionTelemetryProperty.Resources]: solutionSettings.azureResources.join(";"),
-                [constants_1.SolutionTelemetryProperty.Capabilities]: solutionSettings.capabilities.join(";"),
+            await fs.writeJSON(`${ctx.root}/permissions.json`, constants_2.DEFAULT_PERMISSION_REQUEST, { spaces: 4 });
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.Create, {
+                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+                [constants_2.SolutionTelemetryProperty.Resources]: solutionSettings.azureResources.join(";"),
+                [constants_2.SolutionTelemetryProperty.Capabilities]: solutionSettings.capabilities.join(";"),
+                [constants_2.SolutionTelemetryProperty.ProgrammingLanguage]: (_d = (_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.programmingLanguage) !== null && _d !== void 0 ? _d : "",
             });
         }
-        return teamsfx_api_1.ok(constants_1.Void);
+        return teamsfx_api_1.ok(constants_2.Void);
     }
     // Migrate
     async migrate(ctx) {
         var _a, _b, _c, _d, _e;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.MigrateStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.MigrateStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
         // ensure that global namespace is present
-        if (!ctx.envInfo.profile.has(constants_1.GLOBAL_CONFIG)) {
-            ctx.envInfo.profile.set(constants_1.GLOBAL_CONFIG, new teamsfx_api_1.ConfigMap());
+        if (!ctx.envInfo.profile.has(constants_2.GLOBAL_CONFIG)) {
+            ctx.envInfo.profile.set(constants_2.GLOBAL_CONFIG, new teamsfx_api_1.ConfigMap());
         }
         const settingsRes = await this.fillInV1SolutionSettings(ctx);
         if (settingsRes.isErr()) {
-            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.Migrate, settingsRes.error, ctx.telemetryReporter));
+            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.Migrate, settingsRes.error, ctx.telemetryReporter));
         }
         const solutionSettings = settingsRes.value;
         const selectedPlugins = await this.reloadPlugins(solutionSettings);
         const results = await Promise.all(selectedPlugins.map((migratePlugin) => {
             return this.executeUserTask({
-                namespace: `${constants_1.PluginNames.SOLUTION}/${migratePlugin.name}`,
+                namespace: `${constants_2.PluginNames.SOLUTION}/${migratePlugin.name}`,
                 method: "migrateV1Project",
                 params: {},
             }, ctx);
@@ -212,12 +172,12 @@ let TeamsAppSolution = class TeamsAppSolution {
         const azureResources = ((_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.solutionSettings)
             .azureResources;
         await scaffolding_1.scaffoldReadmeAndLocalSettings(capabilities, azureResources, ctx.root, true);
-        (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.Migrate, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-            [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+        (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.Migrate, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+            [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
         });
         (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("info", `Success: ${tools_1.getStrings().solution.MigrateSuccessNotice}`, false);
-        return teamsfx_api_1.ok(constants_1.Void);
+        return teamsfx_api_1.ok(constants_2.Void);
     }
     reloadPlugins(solutionSettings) {
         const res = ResourcePluginContainer_1.getActivatedResourcePlugins(solutionSettings);
@@ -237,7 +197,7 @@ let TeamsAppSolution = class TeamsAppSolution {
     }
     async update(ctx) {
         var _a;
-        const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+        const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
         if (v1Blocked.isErr()) {
             return v1Blocked;
         }
@@ -288,29 +248,29 @@ let TeamsAppSolution = class TeamsAppSolution {
                 .azureResources;
             await scaffolding_1.scaffoldReadmeAndLocalSettings(capabilities, azureResources, ctx.root);
         }
-        if (tools_1.isArmSupportEnabled() && generateResourceTemplate) {
+        if (tools_1.isArmSupportEnabled() && generateResourceTemplate && this.isAzureProject(ctx)) {
             return await arm_1.generateArmTemplate(ctx);
         }
         else {
             return res;
         }
     }
-    async ensurePermissionRequest(ctx) {
-        var _a, _b;
-        if ((_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings) === null || _b === void 0 ? void 0 : _b.migrateFromV1) {
-            return teamsfx_api_1.ok(undefined);
-        }
-        if (!this.isAzureProject(ctx)) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Cannot update permission for SPFx project"), "Solution", constants_1.SolutionError.CannotUpdatePermissionForSPFx));
-        }
-        if (ctx.permissionRequestProvider === undefined) {
-            ctx.permissionRequestProvider = new permissionRequest_1.PermissionRequestFileProvider(ctx.root);
-        }
-        const result = await ctx.permissionRequestProvider.checkPermissionRequest();
-        if (result.isErr()) {
-            return result;
+    async createEnv(ctx) {
+        if (tools_1.isArmSupportEnabled() &&
+            utils_1.isAzureProject(ctx.projectSettings.solutionSettings)) {
+            try {
+                if (ctx.answers.copy === true) {
+                    await arm_1.copyParameterJson(ctx, ctx.answers.targetEnvName, ctx.answers.sourceEnvName);
+                }
+                else {
+                    await arm_1.getParameterJson(ctx);
+                }
+            }
+            catch (e) {
+                return teamsfx_api_1.err(core_1.CopyFileError(e));
+            }
         }
-        return teamsfx_api_1.ok(undefined);
+        return teamsfx_api_1.ok(constants_2.Void);
     }
     /**
      * Checks whether solution's state is idle
@@ -318,24 +278,18 @@ let TeamsAppSolution = class TeamsAppSolution {
     checkWhetherSolutionIsIdle() {
         switch (this.runningState) {
             case SolutionRunningState.Idle:
-                return teamsfx_api_1.ok(constants_1.Void);
+                return teamsfx_api_1.ok(constants_2.Void);
             case SolutionRunningState.ProvisionInProgress:
-                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Provision in progress. Please wait for its completion."), "Solution", constants_1.SolutionError.ProvisionInProgress));
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Provision in progress. Please wait for its completion."), "Solution", constants_2.SolutionError.ProvisionInProgress));
             case SolutionRunningState.DeployInProgress:
-                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Deployment in progress. Please wait for its completion."), "Solution", constants_1.SolutionError.DeploymentInProgress));
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Deployment in progress. Please wait for its completion."), "Solution", constants_2.SolutionError.DeploymentInProgress));
             case SolutionRunningState.PublishInProgress:
-                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Publish in progress. Please wait for its completion."), "Solution", constants_1.SolutionError.PublishInProgress));
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Publish in progress. Please wait for its completion."), "Solution", constants_2.SolutionError.PublishInProgress));
         }
     }
     checkWetherProvisionSucceeded(solutionConfig) {
         var _a;
-        return !!((_a = solutionConfig.get(constants_1.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.getBoolean(constants_1.SOLUTION_PROVISION_SUCCEEDED));
-    }
-    blockV1Project(solutionSettings) {
-        if (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.migrateFromV1) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Command is not supported in Teams Toolkit V1 Project"), "Solution", constants_1.SolutionError.V1ProjectNotSupported));
-        }
-        return teamsfx_api_1.ok(null);
+        return !!((_a = solutionConfig.get(constants_2.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.getBoolean(constants_2.SOLUTION_PROVISION_SUCCEEDED));
     }
     /**
      * Provision resources. It can only run in a non-SPFx project when solution's running state is Idle.
@@ -343,8 +297,8 @@ let TeamsAppSolution = class TeamsAppSolution {
      *
      */
     async provision(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
         if (v1Blocked.isErr()) {
             return v1Blocked;
         }
@@ -359,23 +313,26 @@ let TeamsAppSolution = class TeamsAppSolution {
             await ((_b = ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getAccessToken());
             this.runningState = SolutionRunningState.ProvisionInProgress;
             if (this.isAzureProject(ctx)) {
-                const result = await this.ensurePermissionRequest(ctx);
+                if (ctx.permissionRequestProvider === undefined) {
+                    ctx.permissionRequestProvider = new permissionRequest_1.PermissionRequestFileProvider(ctx.root);
+                }
+                const result = await utils_1.ensurePermissionRequest((_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.solutionSettings, ctx.permissionRequestProvider);
                 if (result.isErr()) {
                     return result;
                 }
             }
             const provisionResult = await this.doProvision(ctx);
             if (provisionResult.isOk()) {
-                const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, (_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.appName);
-                (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
-                (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("info", msg, false);
-                (_f = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _f === void 0 ? void 0 : _f.set(constants_1.SOLUTION_PROVISION_SUCCEEDED, true);
+                const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, (_d = ctx.projectSettings) === null || _d === void 0 ? void 0 : _d.appName);
+                (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(msg);
+                (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", msg, false);
+                (_g = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _g === void 0 ? void 0 : _g.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, true);
             }
             else {
                 if (!tools_1.isUserCancelError(provisionResult.error)) {
-                    const msg = util.format(tools_1.getStrings().solution.ProvisionFailNotice, (_g = ctx.projectSettings) === null || _g === void 0 ? void 0 : _g.appName);
-                    (_h = ctx.logProvider) === null || _h === void 0 ? void 0 : _h.error(msg);
-                    (_j = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _j === void 0 ? void 0 : _j.set(constants_1.SOLUTION_PROVISION_SUCCEEDED, false);
+                    const msg = util.format(tools_1.getStrings().solution.ProvisionFailNotice, (_h = ctx.projectSettings) === null || _h === void 0 ? void 0 : _h.appName);
+                    (_j = ctx.logProvider) === null || _j === void 0 ? void 0 : _j.error(msg);
+                    (_k = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _k === void 0 ? void 0 : _k.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, false);
                 }
             }
             return provisionResult;
@@ -388,7 +345,7 @@ let TeamsAppSolution = class TeamsAppSolution {
      * provision
      */
     async doProvision(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a;
         const maybeSelectedPlugins = this.getSelectedPlugins(ctx);
         if (maybeSelectedPlugins.isErr()) {
             return maybeSelectedPlugins;
@@ -401,34 +358,9 @@ let TeamsAppSolution = class TeamsAppSolution {
             if (res.isErr()) {
                 return res;
             }
-            const azureToken = await ((_b = ctx.azureAccountProvider) === null || _b === void 0 ? void 0 : _b.getAccountCredentialAsync());
-            // Only Azure project requires this confirm dialog
-            const username = azureToken.username ? azureToken.username : "";
-            const subscriptionInfo = await ((_c = ctx.azureAccountProvider) === null || _c === void 0 ? void 0 : _c.getSelectedSubscription());
-            const subscriptionId = subscriptionInfo === null || subscriptionInfo === void 0 ? void 0 : subscriptionInfo.subscriptionId;
-            const subscriptionName = subscriptionInfo === null || subscriptionInfo === void 0 ? void 0 : subscriptionInfo.subscriptionName;
-            const msg = util.format(tools_1.getStrings().solution.ProvisionConfirmNotice, username, subscriptionName ? subscriptionName : subscriptionId);
-            let confirmRes = undefined;
-            if (tools_1.isMultiEnvEnabled()) {
-                const msgNew = util.format(tools_1.getStrings().solution.ProvisionConfirmEnvNotice, ctx.projectSettings.activeEnvironment, username, subscriptionName ? subscriptionName : subscriptionId);
-                confirmRes = await ((_d = ctx.ui) === null || _d === void 0 ? void 0 : _d.showMessage("warn", msgNew, true, "Provision", "Switch environment", "Pricing calculator"));
-            }
-            else {
-                confirmRes = await ((_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("warn", msg, true, "Provision", "Pricing calculator"));
-            }
-            const confirm = (confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) ? confirmRes.value : undefined;
-            if (confirm !== "Provision") {
-                if (confirm === "Pricing calculator") {
-                    (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.openUrl("https://azure.microsoft.com/en-us/pricing/calculator/");
-                }
-                else if (confirm === "Switch environment") {
-                    const envName = await envInfoLoader_1.askTargetEnvironment(ctx, ctx.answers);
-                    if (envName) {
-                        ctx.projectSettings.activeEnvironment = envName;
-                        (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", `[${envName}] is activated.`, false);
-                    }
-                }
-                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.CancelProvision), "Solution", tools_1.getStrings().solution.CancelProvision));
+            const consentResult = await provision_1.askForProvisionConsent(ctx);
+            if (consentResult.isErr()) {
+                return consentResult;
             }
         }
         const pluginsWithCtx = this.getPluginAndContextArray(ctx, selectedPlugins);
@@ -446,21 +378,23 @@ let TeamsAppSolution = class TeamsAppSolution {
         });
         return executor_1.executeLifecycles(preProvisionWithCtx, provisionWithCtx, postProvisionWithCtx, async () => {
             var _a;
-            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.ProvisionStartNotice, constants_2.PluginDisplayName.Solution));
+            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.ProvisionStartNotice, constants_1.PluginDisplayName.Solution));
             return teamsfx_api_1.ok(undefined);
         }, async (provisionResults) => {
             var _a;
-            if (provisionWithCtx.length === (provisionResults === null || provisionResults === void 0 ? void 0 : provisionResults.length)) {
-                provisionWithCtx.map(function (plugin, index) {
-                    var _a;
-                    if (plugin[2] === constants_1.PluginNames.APPST) {
-                        const teamsAppResult = provisionResults[index];
-                        if (teamsAppResult.isOk()) {
-                            (_a = ctx.envInfo.profile
-                                .get(constants_1.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.set(constants_1.REMOTE_TEAMS_APP_ID, teamsAppResult.value);
+            if (!tools_1.isMultiEnvEnabled()) {
+                if (provisionWithCtx.length === (provisionResults === null || provisionResults === void 0 ? void 0 : provisionResults.length)) {
+                    provisionWithCtx.map(function (plugin, index) {
+                        var _a;
+                        if (plugin[2] === constants_2.PluginNames.APPST) {
+                            const teamsAppResult = provisionResults[index];
+                            if (teamsAppResult.isOk()) {
+                                (_a = ctx.envInfo.profile
+                                    .get(constants_2.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.set(constants_2.REMOTE_TEAMS_APP_ID, teamsAppResult.value);
+                            }
                         }
-                    }
-                });
+                    });
+                }
             }
             if (provisionResults) {
                 for (const result of provisionResults) {
@@ -469,7 +403,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                     }
                 }
             }
-            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.ProvisionFinishNotice, constants_2.PluginDisplayName.Solution));
+            (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.ProvisionFinishNotice, constants_1.PluginDisplayName.Solution));
             if (tools_1.isArmSupportEnabled() && this.isAzureProject(ctx)) {
                 const armDeploymentResult = await arm_1.deployArmTemplates(ctx);
                 if (armDeploymentResult.isErr()) {
@@ -479,7 +413,7 @@ let TeamsAppSolution = class TeamsAppSolution {
             const aadPlugin = this.AadPlugin;
             if (selectedPlugins.some((plugin) => plugin.name === aadPlugin.name)) {
                 return await aadPlugin.executeUserTask({
-                    namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
+                    namespace: `${constants_2.PluginNames.SOLUTION}/${constants_2.PluginNames.AAD}`,
                     method: "setApplicationInContext",
                     params: { isLocal: false },
                 }, util_1.getPluginContext(ctx, aadPlugin.name));
@@ -487,21 +421,21 @@ let TeamsAppSolution = class TeamsAppSolution {
             return teamsfx_api_1.ok(undefined);
         }, async () => {
             var _a, _b;
-            (_a = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.delete(constants_1.ARM_TEMPLATE_OUTPUT);
-            (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(util.format(tools_1.getStrings().solution.ConfigurationFinishNotice, constants_2.PluginDisplayName.Solution));
+            (_a = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _a === void 0 ? void 0 : _a.delete(constants_2.ARM_TEMPLATE_OUTPUT);
+            (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(util.format(tools_1.getStrings().solution.ConfigurationFinishNotice, constants_1.PluginDisplayName.Solution));
             return teamsfx_api_1.ok(undefined);
         });
     }
     async deploy(ctx) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
-        const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+        const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
         if (v1Blocked.isErr()) {
             return v1Blocked;
         }
         const isAzureProject = this.isAzureProject(ctx);
         const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.profile);
         if (isAzureProject && !provisioned) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, (_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.appName)), "Solution", constants_1.SolutionError.CannotDeployBeforeProvision));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, (_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.appName)), "Solution", constants_2.SolutionError.CannotDeployBeforeProvision));
         }
         try {
             if (this.isAzureProject(ctx)) {
@@ -540,7 +474,7 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         const optionsToDeploy = ctx.answers[question_1.AzureSolutionQuestionNames.PluginSelectionDeploy];
         if (optionsToDeploy === undefined || optionsToDeploy.length === 0) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`No plugin selected`), "Solution", constants_1.SolutionError.NoResourcePluginSelected));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`No plugin selected`), "Solution", constants_2.SolutionError.NoResourcePluginSelected));
         }
         const pluginMap = ResourcePluginContainer_1.getAllResourcePluginMap();
         const pluginsToDeploy = [];
@@ -550,7 +484,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                 pluginsToDeploy.push(filtered);
             }
         }
-        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.SelectedPluginsToDeployNotice, constants_2.PluginDisplayName.Solution, JSON.stringify(pluginsToDeploy.map((p) => p.name))));
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.SelectedPluginsToDeployNotice, constants_1.PluginDisplayName.Solution, JSON.stringify(pluginsToDeploy.map((p) => p.name))));
         if (this.isAzureProject(ctx)) {
             //make sure sub is selected
             await ((_b = ctx.azureAccountProvider) === null || _b === void 0 ? void 0 : _b.getSelectedSubscription(true));
@@ -568,12 +502,12 @@ let TeamsAppSolution = class TeamsAppSolution {
             var _a;
             return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.postDeploy) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
         });
-        (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(util.format(tools_1.getStrings().solution.DeployStartNotice, constants_2.PluginDisplayName.Solution));
+        (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(util.format(tools_1.getStrings().solution.DeployStartNotice, constants_1.PluginDisplayName.Solution));
         return executor_1.executeLifecycles(preDeployWithCtx, deployWithCtx, postDeployWithCtx);
     }
     async publish(ctx) {
         var _a, _b, _c, _d, _e;
-        const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+        const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
         if (v1Blocked.isErr()) {
             return v1Blocked;
         }
@@ -583,7 +517,7 @@ let TeamsAppSolution = class TeamsAppSolution {
         const isAzureProject = this.isAzureProject(ctx);
         const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.profile);
         if (!provisioned) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, (_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.appName)), "Solution", constants_1.SolutionError.CannotPublishBeforeProvision));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, (_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.appName)), "Solution", constants_2.SolutionError.CannotPublishBeforeProvision));
         }
         try {
             this.runningState = SolutionRunningState.PublishInProgress;
@@ -594,7 +528,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                 var _a;
                 return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.publish) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
             });
-            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(util.format(tools_1.getStrings().solution.PublishStartNotice, constants_2.PluginDisplayName.Solution));
+            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(util.format(tools_1.getStrings().solution.PublishStartNotice, constants_1.PluginDisplayName.Solution));
             const results = await executor_1.executeConcurrently("", publishWithCtx);
             for (const result of results) {
                 if (result.isErr()) {
@@ -728,9 +662,9 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         else if (stage === teamsfx_api_1.Stage.provision) {
             if (isDynamicQuestion) {
-                const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+                const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
                 if (v1Blocked.isErr()) {
-                    return v1Blocked;
+                    return teamsfx_api_1.err(v1Blocked.error);
                 }
                 const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.profile);
                 if (provisioned)
@@ -765,21 +699,21 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         else if (stage === teamsfx_api_1.Stage.deploy) {
             if (isDynamicQuestion) {
-                const v1Blocked = this.blockV1Project((_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.solutionSettings);
+                const v1Blocked = utils_1.blockV1Project((_b = ctx.projectSettings) === null || _b === void 0 ? void 0 : _b.solutionSettings);
                 if (v1Blocked.isErr()) {
-                    return v1Blocked;
+                    return teamsfx_api_1.err(v1Blocked.error);
                 }
                 const isAzureProject = this.isAzureProject(ctx);
                 const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.profile);
                 if (isAzureProject && !provisioned) {
-                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.FailedToDeployBeforeProvision), "Solution", constants_1.SolutionError.CannotDeployBeforeProvision));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.FailedToDeployBeforeProvision), "Solution", constants_2.SolutionError.CannotDeployBeforeProvision));
                 }
             }
             let pluginsToDeploy;
             if (isDynamicQuestion) {
                 const res = this.getSelectedPlugins(ctx);
                 if (res.isErr()) {
-                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("No resource to deploy"), "Solution", constants_1.SolutionError.NoResourceToDeploy));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("No resource to deploy"), "Solution", constants_2.SolutionError.NoResourceToDeploy));
                 }
                 pluginsToDeploy = res.value.filter((plugin) => !!plugin.deploy);
             }
@@ -788,7 +722,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                 pluginsToDeploy = allPlugins.filter((plugin) => !!plugin.deploy);
             }
             if (pluginsToDeploy.length === 0) {
-                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("No resource to deploy"), "Solution", constants_1.SolutionError.NoResourceToDeploy));
+                return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("No resource to deploy"), "Solution", constants_2.SolutionError.NoResourceToDeploy));
             }
             const pluginPrefix = "fx-resource-";
             const options = pluginsToDeploy.map((plugin) => {
@@ -821,22 +755,22 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         else if (stage === teamsfx_api_1.Stage.publish) {
             if (isDynamicQuestion) {
-                const v1Blocked = this.blockV1Project((_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.solutionSettings);
+                const v1Blocked = utils_1.blockV1Project((_c = ctx.projectSettings) === null || _c === void 0 ? void 0 : _c.solutionSettings);
                 if (v1Blocked.isErr()) {
-                    return v1Blocked;
+                    return teamsfx_api_1.err(v1Blocked.error);
                 }
                 const isAzureProject = this.isAzureProject(ctx);
                 const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.profile);
                 if (isAzureProject && !provisioned) {
-                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.FailedToPublishBeforeProvision), "Solution", constants_1.SolutionError.CannotPublishBeforeProvision));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.FailedToPublishBeforeProvision), "Solution", constants_2.SolutionError.CannotPublishBeforeProvision));
                 }
                 if (!provisioned && this.spfxSelected(ctx)) {
                     if (((_d = ctx.answers) === null || _d === void 0 ? void 0 : _d.platform) === teamsfx_api_1.Platform.VSCode) {
                         (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("error", tools_1.getStrings().solution.SPFxAskProvisionBeforePublish, false);
-                        throw constants_1.CancelError;
+                        throw constants_2.CancelError;
                     }
                     else {
-                        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.SPFxAskProvisionBeforePublish), "Solution", constants_1.SolutionError.CannotPublishBeforeProvision));
+                        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.SPFxAskProvisionBeforePublish), "Solution", constants_2.SolutionError.CannotPublishBeforeProvision));
                     }
                 }
             }
@@ -854,95 +788,143 @@ let TeamsAppSolution = class TeamsAppSolution {
                 }
             }
         }
+        else if (stage === teamsfx_api_1.Stage.grantPermission) {
+            node.addChild(new teamsfx_api_1.QTreeNode(question_1.GetUserEmailQuestion));
+        }
         return teamsfx_api_1.ok(node);
     }
     async localDebug(ctx) {
-        const result = await this.ensurePermissionRequest(ctx);
-        if (result.isErr()) {
-            return result;
+        var _a;
+        try {
+            if (!this.spfxSelected(ctx)) {
+                if (ctx.permissionRequestProvider === undefined) {
+                    ctx.permissionRequestProvider = new permissionRequest_1.PermissionRequestFileProvider(ctx.root);
+                }
+                const result = await utils_1.ensurePermissionRequest((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings, ctx.permissionRequestProvider);
+                if (result.isErr()) {
+                    return result;
+                }
+            }
+        }
+        catch (e) {
+            if (e instanceof teamsfx_api_1.UserError || e instanceof teamsfx_api_1.SystemError) {
+                return teamsfx_api_1.err(e);
+            }
+            return teamsfx_api_1.err(new teamsfx_api_1.SystemError("UnknownError", "check point 1 - " + JSON.stringify(e), "Solution"));
         }
         return await this.doLocalDebug(ctx);
     }
     async doLocalDebug(ctx) {
         var _a, _b;
-        const maybeSelectedPlugins = this.getSelectedPlugins(ctx);
-        if (maybeSelectedPlugins.isErr()) {
-            return maybeSelectedPlugins;
-        }
-        const selectedPlugins = maybeSelectedPlugins.value;
-        // Just to trigger M365 login before the concurrent execution of localDebug.
-        // Because concurrent exectution of localDebug may getAccessToken() concurrently, which
-        // causes 2 M365 logins before the token caching in common lib takes effect.
-        await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
-        const pluginsWithCtx = this.getPluginAndContextArray(ctx, selectedPlugins);
-        const localDebugWithCtx = pluginsWithCtx.map(([plugin, context]) => {
-            var _a;
-            return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.localDebug) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
-        });
-        const postLocalDebugWithCtx = pluginsWithCtx.map(([plugin, context]) => {
-            var _a;
-            return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.postLocalDebug) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
-        });
-        const localDebugResults = await executor_1.executeConcurrently("", localDebugWithCtx);
-        for (const localDebugResult of localDebugResults) {
-            if (localDebugResult.isErr()) {
-                return localDebugResult;
+        let checkPoint = 1;
+        try {
+            //check point 2
+            const maybeSelectedPlugins = this.getSelectedPlugins(ctx);
+            if (maybeSelectedPlugins.isErr()) {
+                return maybeSelectedPlugins;
+            }
+            const selectedPlugins = maybeSelectedPlugins.value;
+            checkPoint = 2;
+            //check point 3
+            // Just to trigger M365 login before the concurrent execution of localDebug.
+            // Because concurrent exectution of localDebug may getAccessToken() concurrently, which
+            // causes 2 M365 logins before the token caching in common lib takes effect.
+            await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+            checkPoint = 3;
+            //check point 4
+            const pluginsWithCtx = this.getPluginAndContextArray(ctx, selectedPlugins);
+            const localDebugWithCtx = pluginsWithCtx.map(([plugin, context]) => {
+                var _a;
+                return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.localDebug) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
+            });
+            const postLocalDebugWithCtx = pluginsWithCtx.map(([plugin, context]) => {
+                var _a;
+                return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.postLocalDebug) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
+            });
+            const localDebugResults = await executor_1.executeConcurrently("", localDebugWithCtx);
+            for (const localDebugResult of localDebugResults) {
+                if (localDebugResult.isErr()) {
+                    return localDebugResult;
+                }
             }
-        }
-        const aadPlugin = this.AadPlugin;
-        if (selectedPlugins.some((plugin) => plugin.name === aadPlugin.name)) {
-            const result = await aadPlugin.executeUserTask({
-                namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
-                method: "setApplicationInContext",
-                params: { isLocal: true },
-            }, util_1.getPluginContext(ctx, aadPlugin.name));
+            checkPoint = 4;
+            //check point 5
+            if (!this.spfxSelected(ctx)) {
+                const aadPlugin = this.AadPlugin;
+                if (selectedPlugins.some((plugin) => plugin.name === aadPlugin.name)) {
+                    const result = await aadPlugin.executeUserTask({
+                        namespace: `${constants_2.PluginNames.SOLUTION}/${constants_2.PluginNames.AAD}`,
+                        method: "setApplicationInContext",
+                        params: { isLocal: true },
+                    }, util_1.getPluginContext(ctx, aadPlugin.name));
+                    if (result.isErr()) {
+                        return result;
+                    }
+                }
+            }
+            checkPoint = 5;
+            // check point 6
+            // set local debug Teams app tenant id in context.
+            const result = this.loadTeamsAppTenantId(ctx, true, await ((_b = ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getJsonObject()));
             if (result.isErr()) {
                 return result;
             }
-        }
-        // set local debug Teams app tenant id in context.
-        const result = this.loadTeamsAppTenantId(ctx, true, await ((_b = ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getJsonObject()));
-        if (result.isErr()) {
-            return result;
-        }
-        const postLocalDebugResults = await executor_1.executeConcurrently("post", postLocalDebugWithCtx);
-        const combinedPostLocalDebugResults = teamsfx_api_1.combine(postLocalDebugResults);
-        if (combinedPostLocalDebugResults.isErr()) {
-            return combinedPostLocalDebugResults;
-        }
-        // set local debug Teams app id in context.
-        if (postLocalDebugWithCtx.length === combinedPostLocalDebugResults.value.length) {
-            postLocalDebugWithCtx.map(function (plugin, index) {
-                var _a, _b;
-                if (plugin[2] === constants_1.PluginNames.APPST) {
-                    if (tools_1.isMultiEnvEnabled()) {
-                        (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.teamsApp.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TeamsAppId, combinedPostLocalDebugResults.value[index]);
-                    }
-                    else {
-                        (_b = ctx.envInfo.profile
-                            .get(constants_1.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set(constants_1.LOCAL_DEBUG_TEAMS_APP_ID, combinedPostLocalDebugResults.value[index]);
+            checkPoint = 6;
+            //check point 7
+            const postLocalDebugResults = await executor_1.executeConcurrently("post", postLocalDebugWithCtx);
+            const combinedPostLocalDebugResults = teamsfx_api_1.combine(postLocalDebugResults);
+            if (combinedPostLocalDebugResults.isErr()) {
+                return combinedPostLocalDebugResults;
+            }
+            checkPoint = 7;
+            //check point 8
+            // set local debug Teams app id in context.
+            if (postLocalDebugWithCtx.length === combinedPostLocalDebugResults.value.length) {
+                postLocalDebugWithCtx.map(function (plugin, index) {
+                    var _a, _b;
+                    if (plugin[2] === constants_2.PluginNames.APPST) {
+                        if (tools_1.isMultiEnvEnabled()) {
+                            (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.teamsApp.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TeamsAppId, combinedPostLocalDebugResults.value[index]);
+                        }
+                        else {
+                            (_b = ctx.envInfo.profile
+                                .get(constants_2.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set(constants_2.LOCAL_DEBUG_TEAMS_APP_ID, combinedPostLocalDebugResults.value[index]);
+                        }
                     }
-                }
-            });
+                });
+            }
+            checkPoint = 8;
+            return teamsfx_api_1.ok(constants_2.Void);
+        }
+        catch (e) {
+            if (e instanceof teamsfx_api_1.UserError || e instanceof teamsfx_api_1.SystemError) {
+                return teamsfx_api_1.err(e);
+            }
+            return teamsfx_api_1.err(new teamsfx_api_1.SystemError("UnknownError", `check point ${checkPoint} - ${JSON.stringify(e)}`, "Solution"));
         }
-        return teamsfx_api_1.ok(constants_1.Void);
     }
     async grantPermission(ctx) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GrantPermissionStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.GrantPermissionStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
+        const progressBar = (_b = ctx.ui) === null || _b === void 0 ? void 0 : _b.createProgressBar("Granting permission", 1);
         try {
             const result = await this.checkAndGetCurrentUserInfo(ctx);
             if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, result.error, ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, result.error, ctx.telemetryReporter));
             }
             const email = ctx.answers["email"];
+            if (!email || email === result.value.userPrincipalName) {
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error("Collaborator's email cannot be null or same as current user"), "Solution", constants_2.SolutionError.EmailCannotBeEmptyOrSame), ctx.telemetryReporter));
+            }
             const userInfo = await this.getUserInfo(ctx, email);
             if (!userInfo) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error("Cannot find user in current tenant, please check whether your email address is correct"), "Solution", constants_1.SolutionError.CannotFindUserInCurrentTenant), ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error("Cannot find user in current tenant, please check whether your email address is correct"), "Solution", constants_2.SolutionError.CannotFindUserInCurrentTenant), ctx.telemetryReporter));
             }
-            (_b = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set(constants_1.USER_INFO, JSON.stringify(userInfo));
+            progressBar === null || progressBar === void 0 ? void 0 : progressBar.start();
+            progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(`Grant permission for user ${email}`);
+            (_c = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _c === void 0 ? void 0 : _c.set(constants_2.USER_INFO, JSON.stringify(userInfo));
             const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
                 this.AadPlugin,
                 this.AppStudioPlugin,
@@ -951,11 +933,21 @@ let TeamsAppSolution = class TeamsAppSolution {
                 var _a;
                 return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.grantPermission) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
             });
-            if (((_c = ctx.answers) === null || _c === void 0 ? void 0 : _c.platform) === teamsfx_api_1.Platform.CLI) {
-                const aadAppTenantId = (_e = (_d = ctx.envInfo.profile) === null || _d === void 0 ? void 0 : _d.get(constants_1.PluginNames.AAD)) === null || _e === void 0 ? void 0 : _e.get(constants_1.REMOTE_TENANT_ID);
-                // Todo, when multi-environment is ready, we will update to current environment
-                (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", `Starting permission grant for environment: default`, false);
-                (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", `Tenant ID: ${aadAppTenantId}`, false);
+            if (((_d = ctx.answers) === null || _d === void 0 ? void 0 : _d.platform) === teamsfx_api_1.Platform.CLI) {
+                const aadAppTenantId = (_f = (_e = ctx.envInfo.profile) === null || _e === void 0 ? void 0 : _e.get(constants_2.PluginNames.AAD)) === null || _f === void 0 ? void 0 : _f.get(constants_2.REMOTE_TENANT_ID);
+                const message = [
+                    { content: `Account to grant permission: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                    { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    {
+                        content: `Starting grant permission for environment: `,
+                        color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+                    },
+                    // Todo, when multi-environment is ready, we will update to current environment
+                    { content: "default\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    { content: `Tenant ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                    { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                ];
+                (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", message, false);
             }
             const results = await executor_1.executeConcurrently("", grantPermissionWithCtx);
             const permissions = [];
@@ -980,9 +972,16 @@ let TeamsAppSolution = class TeamsAppSolution {
             }
             if (((_h = ctx.answers) === null || _h === void 0 ? void 0 : _h.platform) === teamsfx_api_1.Platform.CLI) {
                 for (const permission of permissions) {
-                    (_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("info", `${(_k = permission.roles) === null || _k === void 0 ? void 0 : _k.join(" ")} permission has been granted to ${permission.name}, ID: ${permission.resourceId}`, false);
+                    const message = [
+                        { content: `${(_j = permission.roles) === null || _j === void 0 ? void 0 : _j.join(",")} `, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: "permission has been granted to ", color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: ", Resource ID: ", color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: `${permission.resourceId}`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    ];
+                    (_k = ctx.ui) === null || _k === void 0 ? void 0 : _k.showMessage("info", message, false);
                 }
-                (_l = ctx.ui) === null || _l === void 0 ? void 0 : _l.showMessage("info", `Skip grant permission for Azure resources. You may want to handle that via Azure portal. `, false);
+                (_l = ctx.ui) === null || _l === void 0 ? void 0 : _l.showMessage("info", `\nSkip grant permission for Azure resources. You may want to handle that via Azure portal. `, false);
                 if (errorMsg) {
                     for (const fxError of errors) {
                         (_m = ctx.ui) === null || _m === void 0 ? void 0 : _m.showMessage("error", errorMsg, false);
@@ -990,31 +989,32 @@ let TeamsAppSolution = class TeamsAppSolution {
                 }
             }
             if (errorMsg) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), "Solution", constants_1.SolutionError.FailedToGrantPermission), ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), "Solution", constants_2.SolutionError.FailedToGrantPermission), ctx.telemetryReporter));
             }
-            (_o = ctx.telemetryReporter) === null || _o === void 0 ? void 0 : _o.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.GrantPermission, {
-                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+            (_o = ctx.telemetryReporter) === null || _o === void 0 ? void 0 : _o.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.GrantPermission, {
+                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
             });
             return teamsfx_api_1.ok(permissions);
         }
         finally {
-            (_p = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _p === void 0 ? void 0 : _p.delete(constants_1.USER_INFO);
+            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true));
+            (_p = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _p === void 0 ? void 0 : _p.delete(constants_2.USER_INFO);
             this.runningState = SolutionRunningState.Idle;
         }
     }
     async checkPermission(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.CheckPermissionStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.CheckPermissionStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
         try {
             const result = await this.checkAndGetCurrentUserInfo(ctx);
             if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, result.error, ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.CheckPermission, result.error, ctx.telemetryReporter));
             }
             const userInfo = result.value;
-            (_b = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set(constants_1.USER_INFO, JSON.stringify(userInfo));
+            (_b = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set(constants_2.USER_INFO, JSON.stringify(userInfo));
             const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
                 this.AadPlugin,
                 this.AppStudioPlugin,
@@ -1024,11 +1024,20 @@ let TeamsAppSolution = class TeamsAppSolution {
                 return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.checkPermission) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
             });
             if (((_c = ctx.answers) === null || _c === void 0 ? void 0 : _c.platform) === teamsfx_api_1.Platform.CLI) {
-                const aadAppTenantId = (_e = (_d = ctx.envInfo.profile) === null || _d === void 0 ? void 0 : _d.get(constants_1.PluginNames.AAD)) === null || _e === void 0 ? void 0 : _e.get(constants_1.REMOTE_TENANT_ID);
-                (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", `Account used to check: ${userInfo.userPrincipalName}`, false);
-                // Todo, when multi-environment is ready, we will update to current environment
-                (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", `Starting permission check for environment: default`, false);
-                (_h = ctx.ui) === null || _h === void 0 ? void 0 : _h.showMessage("info", `Tenant ID: ${aadAppTenantId}`, false);
+                const aadAppTenantId = (_e = (_d = ctx.envInfo.profile) === null || _d === void 0 ? void 0 : _d.get(constants_2.PluginNames.AAD)) === null || _e === void 0 ? void 0 : _e.get(constants_2.REMOTE_TENANT_ID);
+                const message = [
+                    { content: `Account used to check: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                    { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    {
+                        content: `Starting check permission for environment: `,
+                        color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+                    },
+                    // Todo, when multi-environment is ready, we will update to current environment
+                    { content: "default\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    { content: `Tenant ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                    { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                ];
+                (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", message, false);
             }
             const results = await executor_1.executeConcurrently("", checkPermissionWithCtx);
             const permissions = [];
@@ -1051,42 +1060,53 @@ let TeamsAppSolution = class TeamsAppSolution {
                     errorMsg += fxError.error.message + "\n";
                 }
             }
-            if (((_j = ctx.answers) === null || _j === void 0 ? void 0 : _j.platform) === teamsfx_api_1.Platform.CLI) {
+            if (((_g = ctx.answers) === null || _g === void 0 ? void 0 : _g.platform) === teamsfx_api_1.Platform.CLI) {
                 for (const permission of permissions) {
-                    (_k = ctx.ui) === null || _k === void 0 ? void 0 : _k.showMessage("info", `Resource ID: ${permission.resourceId}, Resource Name: ${permission.name}, Permission: ${permission.roles}`, false);
+                    const message = [
+                        { content: `Resource ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: (_h = permission.resourceId) !== null && _h !== void 0 ? _h : "undefined", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: `, Resource Name: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: permission.name, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: `, Permission: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        {
+                            content: permission.roles ? permission.roles.toString() : "undefined" + "\n",
+                            color: teamsfx_api_1.Colors.BRIGHT_MAGENTA,
+                        },
+                    ];
+                    (_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("info", message, false);
                 }
             }
             if (errorMsg) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), "Solution", constants_1.SolutionError.FailedToCheckPermission), ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), "Solution", constants_2.SolutionError.FailedToCheckPermission), ctx.telemetryReporter));
             }
             const aadPermission = permissions.find((permission) => permission.name === "Azure AD App");
             const teamsAppPermission = permissions.find((permission) => permission.name === "Teams App");
-            (_l = ctx.telemetryReporter) === null || _l === void 0 ? void 0 : _l.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.CheckPermission, {
-                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-                [constants_1.SolutionTelemetryProperty.AadPermission]: (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
+            (_k = ctx.telemetryReporter) === null || _k === void 0 ? void 0 : _k.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.CheckPermission, {
+                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+                [constants_2.SolutionTelemetryProperty.AadPermission]: (aadPermission === null || aadPermission === void 0 ? void 0 : aadPermission.roles)
                     ? aadPermission.roles.join(";")
                     : "undefined",
-                [constants_1.SolutionTelemetryProperty.TeamsAppPermission]: (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
+                [constants_2.SolutionTelemetryProperty.TeamsAppPermission]: (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
                     ? teamsAppPermission.roles.join(";")
                     : "undefined",
             });
             return teamsfx_api_1.ok(permissions);
         }
         finally {
-            (_m = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _m === void 0 ? void 0 : _m.delete(constants_1.USER_INFO);
+            (_l = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _l === void 0 ? void 0 : _l.delete(constants_2.USER_INFO);
             this.runningState = SolutionRunningState.Idle;
         }
     }
     async listCollaborator(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ListCollaboratorStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.ListCollaboratorStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
         try {
             const result = await this.checkAndGetCurrentUserInfo(ctx);
             if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, result.error, ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListCollaborator, result.error, ctx.telemetryReporter));
             }
             const userInfo = result.value;
             const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
@@ -1098,11 +1118,20 @@ let TeamsAppSolution = class TeamsAppSolution {
                 return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.listCollaborator) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
             });
             if (((_b = ctx.answers) === null || _b === void 0 ? void 0 : _b.platform) === teamsfx_api_1.Platform.CLI) {
-                const aadAppTenantId = (_d = (_c = ctx.envInfo.profile) === null || _c === void 0 ? void 0 : _c.get(constants_1.PluginNames.AAD)) === null || _d === void 0 ? void 0 : _d.get(constants_1.REMOTE_TENANT_ID);
-                (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("info", `Account used to check: ${userInfo.userPrincipalName}`, false);
-                // Todo, when multi-environment is ready, we will update to current environment
-                (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", `Starting list all collaborators for environment: default`, false);
-                (_g = ctx.ui) === null || _g === void 0 ? void 0 : _g.showMessage("info", `Tenant ID: ${aadAppTenantId}`, false);
+                const aadAppTenantId = (_d = (_c = ctx.envInfo.profile) === null || _c === void 0 ? void 0 : _c.get(constants_2.PluginNames.AAD)) === null || _d === void 0 ? void 0 : _d.get(constants_2.REMOTE_TENANT_ID);
+                const message = [
+                    { content: `Account used to check: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                    { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    {
+                        content: `Starting list all collaborators for environment: `,
+                        color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+                    },
+                    // Todo, when multi-environment is ready, we will update to current environment
+                    { content: "default\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    { content: `Tenant ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                    { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                ];
+                (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("info", message, false);
             }
             const results = await executor_1.executeConcurrently("", listCollaboratorWithCtx);
             const errors = [];
@@ -1119,7 +1148,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                 }
             }
             if (errorMsg) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnUserError(new Error(errorMsg), "Solution", constants_1.SolutionError.FailedToListCollaborator), ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnUserError(new Error(errorMsg), "Solution", constants_2.SolutionError.FailedToListCollaborator), ctx.telemetryReporter));
             }
             const teamsAppOwners = results[0].isErr() ? [] : results[0].value;
             const aadOwners = results[1].isErr() ? [] : results[1].value;
@@ -1128,28 +1157,38 @@ let TeamsAppSolution = class TeamsAppSolution {
                 const aadOwner = aadOwners.find((owner) => owner.userObjectId === teamsAppOwner.userObjectId);
                 collaborators.push({
                     // Sometimes app studio will return null as userPrincipalName, thus using aad's instead.
-                    userPrincipalName: (_j = (_h = teamsAppOwner.userPrincipalName) !== null && _h !== void 0 ? _h : aadOwner === null || aadOwner === void 0 ? void 0 : aadOwner.userPrincipalName) !== null && _j !== void 0 ? _j : teamsAppOwner.userObjectId,
+                    userPrincipalName: (_g = (_f = teamsAppOwner.userPrincipalName) !== null && _f !== void 0 ? _f : aadOwner === null || aadOwner === void 0 ? void 0 : aadOwner.userPrincipalName) !== null && _g !== void 0 ? _g : teamsAppOwner.userObjectId,
                     userObjectId: teamsAppOwner.userObjectId,
                     isAadOwner: aadOwner ? true : false,
                     aadResourceId: aadOwner ? aadOwner.resourceId : undefined,
                     teamsAppResourceId: teamsAppOwner.resourceId,
                 });
             }
-            if (((_k = ctx.answers) === null || _k === void 0 ? void 0 : _k.platform) === teamsfx_api_1.Platform.CLI) {
+            if (((_h = ctx.answers) === null || _h === void 0 ? void 0 : _h.platform) === teamsfx_api_1.Platform.CLI) {
                 for (const collaborator of collaborators) {
-                    (_l = ctx.ui) === null || _l === void 0 ? void 0 : _l.showMessage("info", `Account: ${collaborator.userPrincipalName}`, false);
-                    (_m = ctx.ui) === null || _m === void 0 ? void 0 : _m.showMessage("info", `Resource ID: ${collaborator.teamsAppResourceId}, Resource Name: Teams App, Permission: Administrator`, false);
+                    const message = [
+                        { content: `Account: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: collaborator.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: `Resource ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: collaborator.teamsAppResourceId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: `, Resource Name: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: `Teams App`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                        { content: `, Permission: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+                        { content: `Administrator`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+                    ];
                     if (collaborator.aadResourceId) {
-                        (_o = ctx.ui) === null || _o === void 0 ? void 0 : _o.showMessage("info", `Resource ID: ${collaborator.aadResourceId}, Resource Name: AAD App, Permission: Owner`, false);
+                        message.push({ content: `\nResource ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE }, { content: collaborator.aadResourceId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `, Resource Name: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE }, { content: `AAD App`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `, Permission: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE }, { content: `Owner`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA });
                     }
+                    message.push({ content: "\n", color: teamsfx_api_1.Colors.BRIGHT_WHITE });
+                    (_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("info", message, false);
                 }
             }
             const aadOwnerCount = collaborators.filter((collaborator) => collaborator.aadResourceId && collaborator.isAadOwner).length;
-            (_p = ctx.telemetryReporter) === null || _p === void 0 ? void 0 : _p.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ListCollaborator, {
-                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-                [constants_1.SolutionTelemetryProperty.CollaboratorCount]: collaborators.length.toString(),
-                [constants_1.SolutionTelemetryProperty.AadOwnerCount]: aadOwnerCount.toString(),
+            (_k = ctx.telemetryReporter) === null || _k === void 0 ? void 0 : _k.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.ListCollaborator, {
+                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+                [constants_2.SolutionTelemetryProperty.CollaboratorCount]: collaborators.length.toString(),
+                [constants_2.SolutionTelemetryProperty.AadOwnerCount]: aadOwnerCount.toString(),
             });
             return teamsfx_api_1.ok(collaborators);
         }
@@ -1165,38 +1204,26 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.profile);
         if (!provisioned) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Failed to process because the resources have not been provisioned yet. Make sure you do the provision first."), "Solution", constants_1.SolutionError.CannotProcessBeforeProvision));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Failed to process because the resources have not been provisioned yet. Make sure you do the provision first."), "Solution", constants_2.SolutionError.CannotProcessBeforeProvision));
         }
         const user = await this.getUserInfo(ctx);
         if (!user) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to retrieve current user info from graph token"), "Solution", constants_1.SolutionError.FailedToRetrieveUserInfo));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Failed to retrieve current user info from graph token"), "Solution", constants_2.SolutionError.FailedToRetrieveUserInfo));
         }
-        const aadAppTenantId = (_b = (_a = ctx.envInfo.profile) === null || _a === void 0 ? void 0 : _a.get(constants_1.PluginNames.AAD)) === null || _b === void 0 ? void 0 : _b.get(constants_1.REMOTE_TENANT_ID);
+        const aadAppTenantId = (_b = (_a = ctx.envInfo.profile) === null || _a === void 0 ? void 0 : _a.get(constants_2.PluginNames.AAD)) === null || _b === void 0 ? void 0 : _b.get(constants_2.REMOTE_TENANT_ID);
         if (!aadAppTenantId || user.tenantId != aadAppTenantId) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Tenant id of your account and the provisioned Azure AD app does not match. Please check whether you logined with wrong account."), "Solution", constants_1.SolutionError.M365AccountNotMatch));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Tenant id of your account and the provisioned Azure AD app does not match. Please check whether you logined with wrong account."), "Solution", constants_2.SolutionError.M365AccountNotMatch));
         }
         return teamsfx_api_1.ok(user);
     }
-    parseTeamsAppTenantId(appStudioToken) {
-        if (appStudioToken === undefined) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Graph token json is undefined"), "Solution", constants_1.SolutionError.NoAppStudioToken));
-        }
-        const teamsAppTenantId = appStudioToken.tid;
-        if (teamsAppTenantId === undefined ||
-            !(typeof teamsAppTenantId === "string") ||
-            teamsAppTenantId.length === 0) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("Cannot find teams app tenant id"), "Solution", constants_1.SolutionError.NoTeamsAppTenantId));
-        }
-        return teamsfx_api_1.ok(teamsAppTenantId);
-    }
     loadTeamsAppTenantId(ctx, isLocalDebug, appStudioToken) {
-        return this.parseTeamsAppTenantId(appStudioToken).andThen((teamsAppTenantId) => {
+        return utils_1.parseTeamsAppTenantId(appStudioToken).andThen((teamsAppTenantId) => {
             var _a, _b;
             if (isLocalDebug && tools_1.isMultiEnvEnabled()) {
                 (_a = ctx.localSettings) === null || _a === void 0 ? void 0 : _a.teamsApp.set(localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId, teamsAppTenantId);
             }
             else {
-                (_b = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set("teamsAppTenantId", teamsAppTenantId);
+                (_b = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.set("teamsAppTenantId", teamsAppTenantId);
             }
             return teamsfx_api_1.ok(ctx);
         });
@@ -1207,9 +1234,9 @@ let TeamsAppSolution = class TeamsAppSolution {
     }
     async getQuestionsForAddResource(func, ctx) {
         var _a;
-        const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+        const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
         if (v1Blocked.isErr()) {
-            return v1Blocked;
+            return teamsfx_api_1.err(v1Blocked.error);
         }
         const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(ctx.answers.platform);
         const settings = this.getAzureSolutionSettings(ctx);
@@ -1217,11 +1244,11 @@ let TeamsAppSolution = class TeamsAppSolution {
             !(settings.hostType === question_1.HostTypeOptionAzure.id &&
                 settings.capabilities &&
                 settings.capabilities.includes(question_1.TabOptionItem.id))) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Add resource is only supported for Tab app hosted in Azure."), "Solution", constants_1.SolutionError.AddResourceNotSupport));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Add resource is only supported for Tab app hosted in Azure."), "Solution", constants_2.SolutionError.AddResourceNotSupport));
         }
         const selectedPlugins = settings.activeResourcePlugins || [];
         if (!selectedPlugins) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("selectedPlugins is empty"), "Solution", constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("selectedPlugins is empty"), "Solution", constants_2.SolutionError.InternelError));
         }
         const functionPlugin = this.FunctionPlugin;
         const sqlPlugin = this.SqlPlugin;
@@ -1295,14 +1322,14 @@ let TeamsAppSolution = class TeamsAppSolution {
     }
     async getQuestionsForAddCapability(ctx) {
         var _a, _b;
-        const v1Blocked = this.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
+        const v1Blocked = utils_1.blockV1Project((_a = ctx.projectSettings) === null || _a === void 0 ? void 0 : _a.solutionSettings);
         if (v1Blocked.isErr()) {
-            return v1Blocked;
+            return teamsfx_api_1.err(v1Blocked.error);
         }
         const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(ctx.answers.platform);
         const settings = this.getAzureSolutionSettings(ctx);
         if (!(settings.hostType === question_1.HostTypeOptionAzure.id) && isDynamicQuestion) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Add capability is not supported for SPFx project"), "Solution", constants_1.SolutionError.AddResourceNotSupport));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error("Add capability is not supported for SPFx project"), "Solution", constants_2.SolutionError.AddResourceNotSupport));
         }
         const capabilities = settings.capabilities || [];
         const alreadyHaveTab = capabilities.includes(question_1.TabOptionItem.id);
@@ -1372,11 +1399,11 @@ let TeamsAppSolution = class TeamsAppSolution {
     }
     async executeAddResource(ctx) {
         var _a, _b, _c, _d, _e, _f, _g;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResourceStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.AddResourceStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
         if (!ctx.answers) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer is empty!`), "Solution", constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer is empty!`), "Solution", constants_2.SolutionError.InternelError));
         }
         const settings = this.getAzureSolutionSettings(ctx);
         const originalSettings = tools_1.deepCopy(settings);
@@ -1393,14 +1420,14 @@ let TeamsAppSolution = class TeamsAppSolution {
         const alreadyHaveApim = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(apimPlugin.name);
         const addResourcesAnswer = ctx.answers[question_1.AzureSolutionQuestionNames.AddResources];
         if (!addResourcesAnswer) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer of ${question_1.AzureSolutionQuestionNames.AddResources} is empty!`), "Solution", constants_1.SolutionError.InvalidInput));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer of ${question_1.AzureSolutionQuestionNames.AddResources} is empty!`), "Solution", constants_2.SolutionError.InvalidInput));
         }
         const addSQL = addResourcesAnswer.includes(question_1.AzureResourceSQL.id);
         const addFunc = addResourcesAnswer.includes(question_1.AzureResourceFunction.id);
         const addApim = addResourcesAnswer.includes(question_1.AzureResourceApim.id);
         if ((alreadyHaveSql && addSQL) || (alreadyHaveApim && addApim)) {
-            const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM is already added."), "Solution", constants_1.SolutionError.AddResourceNotSupport);
-            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
+            const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM is already added."), "Solution", constants_2.SolutionError.AddResourceNotSupport);
+            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
         }
         let addNewResoruceToProvision = false;
         const notifications = [];
@@ -1430,7 +1457,7 @@ let TeamsAppSolution = class TeamsAppSolution {
             if (tools_1.isArmSupportEnabled() && addNewResoruceToProvision) {
                 const confirmed = await executeUserTask_1.confirmRegenerateArmTemplate(ctx.ui);
                 if (!confirmed) {
-                    return teamsfx_api_1.ok(constants_1.Void);
+                    return teamsfx_api_1.ok(constants_2.Void);
                 }
             }
             settings.azureResources = azureResource;
@@ -1440,29 +1467,29 @@ let TeamsAppSolution = class TeamsAppSolution {
             if (scaffoldRes.isErr()) {
                 (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(`failed to scaffold ${notifications.join(",")}!`);
                 ctx.projectSettings.solutionSettings = originalSettings;
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddResource, scaffoldRes.error, ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.AddResource, scaffoldRes.error, ctx.telemetryReporter));
             }
             (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`finish scaffolding ${notifications.join(",")}!`);
             if (addNewResoruceToProvision)
-                (_e = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _e === void 0 ? void 0 : _e.set(constants_1.SOLUTION_PROVISION_SUCCEEDED, false); //if selected plugin changed, we need to re-do provision
+                (_e = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _e === void 0 ? void 0 : _e.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, false); //if selected plugin changed, we need to re-do provision
             (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", util.format(ctx.answers.platform === teamsfx_api_1.Platform.CLI
                 ? tools_1.getStrings().solution.AddResourceNoticeForCli
                 : tools_1.getStrings().solution.AddResourceNotice, notifications.join(",")), false);
         }
-        (_g = ctx.telemetryReporter) === null || _g === void 0 ? void 0 : _g.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddResource, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-            [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-            [constants_1.SolutionTelemetryProperty.Resources]: addResourcesAnswer.join(";"),
+        (_g = ctx.telemetryReporter) === null || _g === void 0 ? void 0 : _g.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.AddResource, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+            [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+            [constants_2.SolutionTelemetryProperty.Resources]: addResourcesAnswer.join(";"),
         });
-        return teamsfx_api_1.ok(constants_1.Void);
+        return teamsfx_api_1.ok(constants_2.Void);
     }
     async executeAddCapability(ctx) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapabilityStart, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.AddCapabilityStart, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
         });
         if (!ctx.answers) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer is empty!`), "Solution", constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer is empty!`), "Solution", constants_2.SolutionError.InternelError));
         }
         const settings = this.getAzureSolutionSettings(ctx);
         const originalSettings = tools_1.deepCopy(settings);
@@ -1472,19 +1499,19 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         const capabilitiesAnswer = ctx.answers[question_1.AzureSolutionQuestionNames.Capabilities];
         if (!capabilitiesAnswer || capabilitiesAnswer.length === 0) {
-            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
-                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-                [constants_1.SolutionTelemetryProperty.Capabilities]: [].join(";"),
+            (_b = ctx.telemetryReporter) === null || _b === void 0 ? void 0 : _b.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.AddCapability, {
+                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+                [constants_2.SolutionTelemetryProperty.Capabilities]: [].join(";"),
             });
-            return teamsfx_api_1.ok(constants_1.Void);
+            return teamsfx_api_1.ok(constants_2.Void);
         }
         if ((((_c = settings.capabilities) === null || _c === void 0 ? void 0 : _c.includes(question_1.BotOptionItem.id)) ||
             ((_d = settings.capabilities) === null || _d === void 0 ? void 0 : _d.includes(question_1.MessageExtensionItem.id))) &&
             (capabilitiesAnswer.includes(question_1.BotOptionItem.id) ||
                 capabilitiesAnswer.includes(question_1.MessageExtensionItem.id))) {
-            const e = teamsfx_api_1.returnUserError(new Error("Application already contains a Bot and/or Messaging Extension"), "Solution", constants_1.SolutionError.FailedToAddCapability);
-            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, e, ctx.telemetryReporter));
+            const e = teamsfx_api_1.returnUserError(new Error("Application already contains a Bot and/or Messaging Extension"), "Solution", constants_2.SolutionError.FailedToAddCapability);
+            return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.AddCapability, e, ctx.telemetryReporter));
         }
         let change = false;
         const notifications = [];
@@ -1509,7 +1536,7 @@ let TeamsAppSolution = class TeamsAppSolution {
             if (tools_1.isArmSupportEnabled()) {
                 const confirmed = await executeUserTask_1.confirmRegenerateArmTemplate(ctx.ui);
                 if (!confirmed) {
-                    return teamsfx_api_1.ok(constants_1.Void);
+                    return teamsfx_api_1.ok(constants_2.Void);
                 }
             }
             settings.capabilities = capabilities;
@@ -1519,27 +1546,27 @@ let TeamsAppSolution = class TeamsAppSolution {
             if (scaffoldRes.isErr()) {
                 (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.info(`failed to scaffold ${notifications.join(",")}!`);
                 ctx.projectSettings.solutionSettings = originalSettings;
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.AddCapability, scaffoldRes.error, ctx.telemetryReporter));
+                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.AddCapability, scaffoldRes.error, ctx.telemetryReporter));
             }
             (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`finish scaffolding ${notifications.join(",")}!`);
-            (_h = ctx.envInfo.profile.get(constants_1.GLOBAL_CONFIG)) === null || _h === void 0 ? void 0 : _h.set(constants_1.SOLUTION_PROVISION_SUCCEEDED, false);
+            (_h = ctx.envInfo.profile.get(constants_2.GLOBAL_CONFIG)) === null || _h === void 0 ? void 0 : _h.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, false);
             const msg = util.format(ctx.answers.platform === teamsfx_api_1.Platform.CLI
                 ? tools_1.getStrings().solution.AddCapabilityNoticeForCli
                 : tools_1.getStrings().solution.AddCapabilityNotice, notifications.join(","));
             (_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("info", msg, false);
-            (_k = ctx.telemetryReporter) === null || _k === void 0 ? void 0 : _k.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
-                [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-                [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-                [constants_1.SolutionTelemetryProperty.Capabilities]: capabilitiesAnswer.join(";"),
+            (_k = ctx.telemetryReporter) === null || _k === void 0 ? void 0 : _k.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.AddCapability, {
+                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+                [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+                [constants_2.SolutionTelemetryProperty.Capabilities]: capabilitiesAnswer.join(";"),
             });
             return teamsfx_api_1.ok({});
         }
         const cannotAddCapWarnMsg = "Add nothing";
         (_l = ctx.ui) === null || _l === void 0 ? void 0 : _l.showMessage("warn", cannotAddCapWarnMsg, false);
-        (_m = ctx.telemetryReporter) === null || _m === void 0 ? void 0 : _m.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.AddCapability, {
-            [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-            [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
-            [constants_1.SolutionTelemetryProperty.Capabilities]: [].join(";"),
+        (_m = ctx.telemetryReporter) === null || _m === void 0 ? void 0 : _m.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.AddCapability, {
+            [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
+            [constants_2.SolutionTelemetryProperty.Success]: constants_2.SolutionTelemetrySuccess.Yes,
+            [constants_2.SolutionTelemetryProperty.Capabilities]: [].join(";"),
         });
         return teamsfx_api_1.ok({});
     }
@@ -1549,7 +1576,7 @@ let TeamsAppSolution = class TeamsAppSolution {
     async executeUserTask(func, ctx) {
         var _a, _b;
         if (!ctx.answers)
-            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer is empty!`), "Solution", constants_1.SolutionError.InternelError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(`answer is empty!`), "Solution", constants_2.SolutionError.InternelError));
         const namespace = func.namespace;
         const method = func.method;
         const array = namespace.split("/");
@@ -1572,7 +1599,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                 // It's teamsfx init followed by teamsfx  publish without running provision.
                 // Using executeUserTask here could bypass the fx project check.
                 if (((_a = ctx.answers) === null || _a === void 0 ? void 0 : _a.platform) !== "vs") {
-                    return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`VS publish is not supposed to run on platform ${(_b = ctx.answers) === null || _b === void 0 ? void 0 : _b.platform}`), "Solution", constants_1.SolutionError.UnsupportedPlatform));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`VS publish is not supposed to run on platform ${(_b = ctx.answers) === null || _b === void 0 ? void 0 : _b.platform}`), "Solution", constants_2.SolutionError.UnsupportedPlatform));
                 }
                 const appStudioPlugin = this.AppStudioPlugin;
                 const pluginCtx = util_1.getPluginContext(ctx, appStudioPlugin.name);
@@ -1603,8 +1630,8 @@ let TeamsAppSolution = class TeamsAppSolution {
     prepareConfigForRegisterTeamsAppAndAad(config, params) {
         const endpoint = params.endpoint;
         const domain = new URL(endpoint).hostname;
-        if (config.get(constants_1.GLOBAL_CONFIG) == undefined) {
-            config.set(constants_1.GLOBAL_CONFIG, new teamsfx_api_1.ConfigMap());
+        if (config.get(constants_2.GLOBAL_CONFIG) == undefined) {
+            config.set(constants_2.GLOBAL_CONFIG, new teamsfx_api_1.ConfigMap());
         }
         const aadPlugin = this.AadPlugin;
         if (config.get(aadPlugin.name) == undefined) {
@@ -1617,19 +1644,19 @@ let TeamsAppSolution = class TeamsAppSolution {
     extractConfigForRegisterTeamsAppAndAad(config, isLocal) {
         var _a, _b, _c;
         const aadPlugin = this.AadPlugin;
-        const aadId = (_a = config.get(aadPlugin.name)) === null || _a === void 0 ? void 0 : _a.get(isLocal ? constants_1.LOCAL_DEBUG_AAD_ID : constants_1.REMOTE_AAD_ID);
+        const aadId = (_a = config.get(aadPlugin.name)) === null || _a === void 0 ? void 0 : _a.get(isLocal ? constants_2.LOCAL_DEBUG_AAD_ID : constants_2.REMOTE_AAD_ID);
         if (aadId === undefined || typeof aadId !== "string") {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`config ${constants_1.LOCAL_DEBUG_AAD_ID} is missing`), "Solution", constants_1.SolutionError.RegisterTeamsAppAndAadError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`config ${constants_2.LOCAL_DEBUG_AAD_ID} is missing`), "Solution", constants_2.SolutionError.RegisterTeamsAppAndAadError));
         }
         const applicationIdUri = (_b = config
-            .get(aadPlugin.name)) === null || _b === void 0 ? void 0 : _b.get(isLocal ? constants_1.LOCAL_APPLICATION_ID_URIS : constants_1.REMOTE_APPLICATION_ID_URIS);
+            .get(aadPlugin.name)) === null || _b === void 0 ? void 0 : _b.get(isLocal ? constants_2.LOCAL_APPLICATION_ID_URIS : constants_2.REMOTE_APPLICATION_ID_URIS);
         if (applicationIdUri === undefined || typeof applicationIdUri !== "string") {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`config ${constants_1.LOCAL_APPLICATION_ID_URIS} is missing`), "Solution", constants_1.SolutionError.RegisterTeamsAppAndAadError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`config ${constants_2.LOCAL_APPLICATION_ID_URIS} is missing`), "Solution", constants_2.SolutionError.RegisterTeamsAppAndAadError));
         }
         const clientSecret = (_c = config
-            .get(aadPlugin.name)) === null || _c === void 0 ? void 0 : _c.get(isLocal ? constants_1.LOCAL_CLIENT_SECRET : constants_1.REMOTE_CLIENT_SECRET);
+            .get(aadPlugin.name)) === null || _c === void 0 ? void 0 : _c.get(isLocal ? constants_2.LOCAL_CLIENT_SECRET : constants_2.REMOTE_CLIENT_SECRET);
         if (clientSecret === undefined || typeof clientSecret !== "string") {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`config ${constants_1.LOCAL_CLIENT_SECRET} is missing`), "Solution", constants_1.SolutionError.RegisterTeamsAppAndAadError));
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`config ${constants_2.LOCAL_CLIENT_SECRET} is missing`), "Solution", constants_2.SolutionError.RegisterTeamsAppAndAadError));
         }
         return teamsfx_api_1.ok({
             aadId,
@@ -1657,7 +1684,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                     return teamsfx_api_1.ok(undefined);
                 },
                 async getPermissionRequest() {
-                    return teamsfx_api_1.ok(JSON.stringify(constants_1.DEFAULT_PERMISSION_REQUEST));
+                    return teamsfx_api_1.ok(JSON.stringify(constants_2.DEFAULT_PERMISSION_REQUEST));
                 },
             };
         }
@@ -1668,7 +1695,7 @@ let TeamsAppSolution = class TeamsAppSolution {
             return provisionResult;
         }
         await aadPlugin.executeUserTask({
-            namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
+            namespace: `${constants_2.PluginNames.SOLUTION}/${constants_2.PluginNames.AAD}`,
             method: "setApplicationInContext",
             params: { isLocal: isLocal },
         }, aadPluginCtx);
@@ -1696,7 +1723,7 @@ let TeamsAppSolution = class TeamsAppSolution {
         await fs.writeFile(manifestPath, manifestStr);
         const appStudioPlugin = this.AppStudioPlugin;
         const func = {
-            namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.APPST}`,
+            namespace: `${constants_2.PluginNames.SOLUTION}/${constants_2.PluginNames.APPST}`,
             method: "getAppDefinitionAndUpdate",
             params: {
                 type: "remote",
@@ -1709,7 +1736,7 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         const teamsAppId = maybeTeamsAppId.value;
         const appSettingsJSONTpl = (await fs.readFile(appSettingsJSONPath)).toString();
-        const maybeTenantId = this.parseTeamsAppTenantId(await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getJsonObject()));
+        const maybeTenantId = utils_1.parseTeamsAppTenantId(await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getJsonObject()));
         if (maybeTenantId.isErr()) {
             return teamsfx_api_1.err(maybeTenantId.error);
         }
@@ -1824,7 +1851,7 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], TeamsAppSolution.prototype, "executeUserTask", null);
 TeamsAppSolution = tslib_1.__decorate([
-    typedi_1.Service(),
+    typedi_1.Service(SolutionPluginContainer_1.SolutionPlugins.AzureTeamsSolution),
     tslib_1.__metadata("design:paramtypes", [])
 ], TeamsAppSolution);
 exports.TeamsAppSolution = TeamsAppSolution;