@microsoft/teamsfx-core 1.0.0 → 1.0.1-alpha.389dbb3f.0

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

@@ -10,7 +10,6 @@ const tslib_1 = require("tslib");
 // Licensed under the MIT license.
 const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const axios_1 = tslib_1.__importDefault(require("axios"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const mustache_1 = tslib_1.__importDefault(require("mustache"));
 const path_1 = tslib_1.__importDefault(require("path"));
@@ -18,7 +17,6 @@ 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 permissionInterface_1 = require("../../../common/permissionInterface");
 const tools_1 = require("../../../common/tools");
 const core_1 = require("../../../core");
 const errorHandler_1 = require("../../../core/middleware/errorHandler");
@@ -35,11 +33,13 @@ const util_1 = require("./utils/util");
 const executeUserTask_1 = require("./v2/executeUserTask");
 const utils_1 = require("./v2/utils");
 const provision_1 = require("./v2/provision");
+const grantPermission_1 = require("./v2/grantPermission");
+const checkPermission_1 = require("./v2/checkPermission");
+const listAllCollaborators_1 = require("./v2/listAllCollaborators");
+const listCollaborator_1 = require("./v2/listCollaborator");
 const scaffolding_1 = require("./v2/scaffolding");
-const __1 = require("../../..");
 const telemetry_1 = require("../../../common/telemetry");
 const _1 = require(".");
-const constants_3 = require("../../../common/constants");
 // Maybe we need a state machine to track state transition.
 var SolutionRunningState;
 (function (SolutionRunningState) {
@@ -59,6 +59,7 @@ let TeamsAppSolution = class TeamsAppSolution {
         this.FunctionPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.FunctionPlugin);
         this.SqlPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.SqlPlugin);
         this.ApimPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.ApimPlugin);
+        this.KeyVaultPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.KeyVaultPlugin);
         this.LocalDebugPlugin = typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.LocalDebugPlugin);
         this.runningState = SolutionRunningState.Idle;
     }
@@ -224,9 +225,9 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
         return result;
     }
-    async doScaffold(ctx, selectedPlugins, generateResourceTemplate) {
+    async doScaffold(ctx, pluginsToScaffold, generateResourceTemplate, pluginsToDoArm) {
         var _a, _b;
-        const pluginsWithCtx = this.getPluginAndContextArray(ctx, selectedPlugins);
+        const pluginsWithCtx = this.getPluginAndContextArray(ctx, pluginsToScaffold);
         const preScaffoldWithCtx = pluginsWithCtx.map(([plugin, context]) => {
             var _a;
             return [(_a = plugin === null || plugin === void 0 ? void 0 : plugin.preScaffold) === null || _a === void 0 ? void 0 : _a.bind(plugin), context, plugin.name];
@@ -248,7 +249,7 @@ let TeamsAppSolution = class TeamsAppSolution {
             await scaffolding_1.scaffoldReadme(capabilities, azureResources, ctx.root);
         }
         if (tools_1.isArmSupportEnabled() && generateResourceTemplate && this.isAzureProject(ctx)) {
-            return await arm_1.generateArmTemplate(ctx, selectedPlugins);
+            return await arm_1.generateArmTemplate(ctx, pluginsToDoArm ? pluginsToDoArm : pluginsToScaffold);
         }
         else {
             return res;
@@ -298,7 +299,7 @@ let TeamsAppSolution = class TeamsAppSolution {
      *
      */
     async provision(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
         const canProvision = this.checkWhetherSolutionIsIdle();
         if (canProvision.isErr()) {
             return canProvision;
@@ -320,12 +321,12 @@ let TeamsAppSolution = class TeamsAppSolution {
             }
             const provisionResult = await this.doProvision(ctx);
             if (provisionResult.isOk()) {
-                const url = tools_1.getResourceGroupInPortal(ctx);
-                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);
+                const url = tools_1.getResourceGroupInPortal((_c = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _c === void 0 ? void 0 : _c.getString(constants_2.SUBSCRIPTION_ID), (_d = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _d === void 0 ? void 0 : _d.getString("tenantId"), (_e = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _e === void 0 ? void 0 : _e.getString(constants_2.RESOURCE_GROUP_NAME));
+                const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, (_f = ctx.projectSettings) === null || _f === void 0 ? void 0 : _f.appName);
+                (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(msg);
                 if (url) {
                     const title = "View Provisioned Resources";
-                    (_e = ctx.ui) === null || _e === void 0 ? void 0 : _e.showMessage("info", msg, false, title).then((result) => {
+                    (_h = ctx.ui) === null || _h === void 0 ? void 0 : _h.showMessage("info", msg, false, title).then((result) => {
                         const userSelected = result.isOk() ? result.value : undefined;
                         if (userSelected === title) {
                             ctx.ui.openUrl(url);
@@ -333,16 +334,21 @@ let TeamsAppSolution = class TeamsAppSolution {
                     });
                 }
                 else {
-                    (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", msg, false);
+                    (_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("info", msg, false);
+                }
+                (_k = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _k === void 0 ? void 0 : _k.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, true);
+                if (!this.isAzureProject(ctx) && tools_1.isMultiEnvEnabled()) {
+                    const appStudioTokenJson = await ((_l = ctx.appStudioToken) === null || _l === void 0 ? void 0 : _l.getJsonObject());
+                    (_m = ctx.envInfo.state
+                        .get(constants_2.GLOBAL_CONFIG)) === null || _m === void 0 ? void 0 : _m.set(_1.REMOTE_TEAMS_APP_TENANT_ID, appStudioTokenJson.tid);
                 }
-                (_g = ctx.envInfo.state.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) &&
                     !tools_1.isCheckAccountError(provisionResult.error)) {
-                    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.state.get(constants_2.GLOBAL_CONFIG)) === null || _k === void 0 ? void 0 : _k.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, false);
+                    const msg = util.format(tools_1.getStrings().solution.ProvisionFailNotice, (_o = ctx.projectSettings) === null || _o === void 0 ? void 0 : _o.appName);
+                    (_p = ctx.logProvider) === null || _p === void 0 ? void 0 : _p.error(msg);
+                    (_q = ctx.envInfo.state.get(constants_2.GLOBAL_CONFIG)) === null || _q === void 0 ? void 0 : _q.set(constants_2.SOLUTION_PROVISION_SUCCEEDED, false);
                 }
             }
             return provisionResult;
@@ -719,7 +725,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                 const isAzureProject = this.isAzureProject(ctx);
                 const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.state);
                 if (isAzureProject && !provisioned) {
-                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.FailedToDeployBeforeProvision), constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision, constants_3.HelpLinks.WhyNeedProvision));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.FailedToDeployBeforeProvision), constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision, constants_1.HelpLinks.WhyNeedProvision));
                 }
             }
             let pluginsToDeploy;
@@ -774,7 +780,7 @@ let TeamsAppSolution = class TeamsAppSolution {
                     const errorMsg = isAzureProject
                         ? tools_1.getStrings().solution.FailedToPublishBeforeProvision
                         : tools_1.getStrings().solution.SPFxAskProvisionBeforePublish;
-                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(errorMsg), constants_2.SolutionSource, constants_2.SolutionError.CannotPublishBeforeProvision, constants_3.HelpLinks.WhyNeedProvision));
+                    return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(errorMsg), constants_2.SolutionSource, constants_2.SolutionError.CannotPublishBeforeProvision, constants_1.HelpLinks.WhyNeedProvision));
                 }
             }
             const pluginsToPublish = [this.AppStudioPlugin];
@@ -925,509 +931,16 @@ let TeamsAppSolution = class TeamsAppSolution {
         }
     }
     async grantPermission(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-        (_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.getCurrentUserInfo(ctx);
-            if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, result.error, ctx.telemetryReporter));
-            }
-            const stateResult = await this.getCurrentCollaborationState(ctx, result.value);
-            if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-                if (((_c = ctx.answers) === null || _c === void 0 ? void 0 : _c.platform) === teamsfx_api_1.Platform.CLI) {
-                    (_d = ctx.ui) === null || _d === void 0 ? void 0 : _d.showMessage("warn", stateResult.message, false);
-                }
-                else if (((_e = ctx.answers) === null || _e === void 0 ? void 0 : _e.platform) === teamsfx_api_1.Platform.VSCode) {
-                    (_f = ctx.logProvider) === null || _f === void 0 ? void 0 : _f.warning(stateResult.message);
-                }
-                return teamsfx_api_1.ok({
-                    state: stateResult.state,
-                    message: stateResult.message,
-                });
-            }
-            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"), constants_2.SolutionSource, constants_2.SolutionError.EmailCannotBeEmptyOrSame), ctx.telemetryReporter));
-            }
-            const userInfo = await this.getUserInfo(ctx, email);
-            if (!userInfo) {
-                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"), constants_2.SolutionSource, constants_2.SolutionError.CannotFindUserInCurrentTenant), ctx.telemetryReporter));
-            }
-            progressBar === null || progressBar === void 0 ? void 0 : progressBar.start();
-            progressBar === null || progressBar === void 0 ? void 0 : progressBar.next(`Grant permission for user ${email}`);
-            const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
-                this.AadPlugin,
-                this.AppStudioPlugin,
-            ]);
-            const grantPermissionWithCtx = pluginsWithCtx.map(([plugin, context]) => {
-                return [
-                    (plugin === null || plugin === void 0 ? void 0 : plugin.grantPermission)
-                        ? (ctx) => plugin.grantPermission.bind(plugin)(ctx, userInfo)
-                        : undefined,
-                    context,
-                    plugin.name,
-                ];
-            });
-            if (((_g = ctx.answers) === null || _g === void 0 ? void 0 : _g.platform) === teamsfx_api_1.Platform.CLI) {
-                const aadAppTenantId = (_j = (_h = ctx.envInfo.state) === null || _h === void 0 ? void 0 : _h.get(constants_2.PluginNames.AAD)) === null || _j === void 0 ? void 0 : _j.get(constants_2.REMOTE_TENANT_ID);
-                const envName = ctx.envInfo.envName;
-                if (!envName) {
-                    return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnSystemError(new Error("Failed to get env name."), constants_2.SolutionSource, constants_2.SolutionError.FailedToGetEnvName), ctx.telemetryReporter));
-                }
-                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,
-                    },
-                    { content: `${envName}\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 },
-                ];
-                (_k = ctx.ui) === null || _k === void 0 ? void 0 : _k.showMessage("info", message, false);
-            }
-            const results = await executor_1.executeConcurrently("", grantPermissionWithCtx);
-            const permissions = [];
-            const errors = [];
-            for (const result of results) {
-                if (result.isErr()) {
-                    errors.push(result);
-                    continue;
-                }
-                if (result && result.value) {
-                    for (const res of result.value) {
-                        permissions.push(res);
-                    }
-                }
-            }
-            let errorMsg = "";
-            if (errors.length > 0) {
-                errorMsg += `Failed to grant permission for the below resources to user: ${email}.\n Resource details: \n`;
-                for (const fxError of errors) {
-                    errorMsg += fxError.error.message + "\n";
-                }
-            }
-            if (((_l = ctx.answers) === null || _l === void 0 ? void 0 : _l.platform) === teamsfx_api_1.Platform.CLI) {
-                for (const permission of permissions) {
-                    const message = [
-                        { content: `${(_m = permission.roles) === null || _m === void 0 ? void 0 : _m.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 },
-                    ];
-                    (_o = ctx.ui) === null || _o === void 0 ? void 0 : _o.showMessage("info", message, false);
-                }
-                (_p = ctx.ui) === null || _p === void 0 ? void 0 : _p.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) {
-                        (_q = ctx.ui) === null || _q === void 0 ? void 0 : _q.showMessage("error", errorMsg, false);
-                    }
-                }
-            }
-            if (errorMsg) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.GrantPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_2.SolutionSource, constants_2.SolutionError.FailedToGrantPermission), ctx.telemetryReporter));
-            }
-            (_r = ctx.telemetryReporter) === null || _r === void 0 ? void 0 : _r.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({
-                state: permissionInterface_1.CollaborationState.OK,
-                userInfo: userInfo,
-                permissions,
-            });
-        }
-        finally {
-            await (progressBar === null || progressBar === void 0 ? void 0 : progressBar.end(true));
-            this.runningState = SolutionRunningState.Idle;
-        }
+        return grantPermission_1.grantPermission({ apiVersion: 1, ctx });
     }
     async checkPermission(ctx) {
-        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.getCurrentUserInfo(ctx);
-            if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.CheckPermission, result.error, ctx.telemetryReporter));
-            }
-            const stateResult = await this.getCurrentCollaborationState(ctx, result.value);
-            if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-                if (((_b = ctx.answers) === null || _b === void 0 ? void 0 : _b.platform) === teamsfx_api_1.Platform.CLI) {
-                    (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.showMessage("warn", stateResult.message, false);
-                }
-                return teamsfx_api_1.ok({
-                    state: stateResult.state,
-                    message: stateResult.message,
-                });
-            }
-            const userInfo = result.value;
-            const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
-                this.AadPlugin,
-                this.AppStudioPlugin,
-            ]);
-            const checkPermissionWithCtx = pluginsWithCtx.map(([plugin, context]) => {
-                return [
-                    (plugin === null || plugin === void 0 ? void 0 : plugin.checkPermission)
-                        ? (ctx) => plugin.checkPermission.bind(plugin)(ctx, userInfo)
-                        : undefined,
-                    context,
-                    plugin.name,
-                ];
-            });
-            if (((_d = ctx.answers) === null || _d === void 0 ? void 0 : _d.platform) === teamsfx_api_1.Platform.CLI) {
-                const aadAppTenantId = (_f = (_e = ctx.envInfo.state) === 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 envName = ctx.envInfo.envName;
-                if (!envName) {
-                    return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnSystemError(new Error("Failed to get env name."), constants_2.SolutionSource, constants_2.SolutionError.FailedToGetEnvName), ctx.telemetryReporter));
-                }
-                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,
-                    },
-                    { content: `${envName}\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("", checkPermissionWithCtx);
-            const permissions = [];
-            const errors = [];
-            for (const result of results) {
-                if (result.isErr()) {
-                    errors.push(result);
-                    continue;
-                }
-                if (result && result.value) {
-                    for (const res of result.value) {
-                        permissions.push(res);
-                    }
-                }
-            }
-            let errorMsg = "";
-            if (errors.length > 0) {
-                errorMsg += `Failed to check permission for the below resources.\n Resource details: \n`;
-                for (const fxError of errors) {
-                    errorMsg += fxError.error.message + "\n";
-                }
-            }
-            if (((_h = ctx.answers) === null || _h === void 0 ? void 0 : _h.platform) === teamsfx_api_1.Platform.CLI) {
-                for (const permission of permissions) {
-                    const message = [
-                        { content: `Resource ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                        { content: (_j = permission.resourceId) !== null && _j !== void 0 ? _j : "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,
-                        },
-                    ];
-                    (_k = ctx.ui) === null || _k === void 0 ? void 0 : _k.showMessage("info", message, false);
-                }
-            }
-            if (errorMsg) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.CheckPermission, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_2.SolutionSource, 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_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_2.SolutionTelemetryProperty.TeamsAppPermission]: (teamsAppPermission === null || teamsAppPermission === void 0 ? void 0 : teamsAppPermission.roles)
-                    ? teamsAppPermission.roles.join(";")
-                    : "undefined",
-            });
-            return teamsfx_api_1.ok({
-                state: permissionInterface_1.CollaborationState.OK,
-                permissions,
-            });
-        }
-        finally {
-            this.runningState = SolutionRunningState.Idle;
-        }
+        return checkPermission_1.checkPermission({ apiVersion: 1, ctx });
     }
     async listAllCollaborators(ctx) {
-        var _a, _b, _c, _d, _e, _f;
-        try {
-            (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.ListAllCollaboratorsStart, {
-                [constants_2.SolutionTelemetryProperty.Component]: constants_2.SolutionTelemetryComponentName,
-            });
-            const collaboratorsResult = {};
-            const envs = await __1.environmentManager.listEnvConfigs(ctx.root);
-            if (envs.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListAllCollaborators, envs.error, ctx.telemetryReporter));
-            }
-            const result = await this.getCurrentUserInfo(ctx);
-            if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListAllCollaborators, result.error, ctx.telemetryReporter));
-            }
-            const userInfo = result.value;
-            for (const env of envs.value) {
-                try {
-                    const envInfo = await __1.environmentManager.loadEnvInfo(ctx.root, ctx.cryptoProvider, env);
-                    if (envInfo.isErr()) {
-                        throw envInfo.error;
-                    }
-                    ctx.envInfo = envInfo.value;
-                    const stateResult = await this.getCurrentCollaborationState(ctx, result.value);
-                    if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-                        if (((_b = ctx.answers) === null || _b === void 0 ? void 0 : _b.platform) === teamsfx_api_1.Platform.CLI) {
-                            (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.showMessage("warn", stateResult.message, false);
-                        }
-                        collaboratorsResult[env] = {
-                            state: stateResult.state,
-                            message: stateResult.message,
-                        };
-                        continue;
-                    }
-                    const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
-                        this.AppStudioPlugin,
-                        this.AadPlugin,
-                    ]);
-                    const listCollaboratorWithCtx = pluginsWithCtx.map(([plugin, context]) => {
-                        return [
-                            (plugin === null || plugin === void 0 ? void 0 : plugin.listCollaborator)
-                                ? (ctx) => plugin.listCollaborator.bind(plugin)(ctx, userInfo)
-                                : undefined,
-                            context,
-                            plugin.name,
-                        ];
-                    });
-                    const results = await executor_1.executeConcurrently("", listCollaboratorWithCtx);
-                    const errors = [];
-                    for (const result of results) {
-                        if (result.isErr()) {
-                            errors.push(result);
-                        }
-                    }
-                    let errorMsg = "";
-                    if (errors.length > 0) {
-                        errorMsg += `Failed to list collaborator for the project.\n Error details: \n`;
-                        for (const fxError of errors) {
-                            errorMsg += fxError.error.message + "\n";
-                        }
-                    }
-                    if (errorMsg) {
-                        collaboratorsResult[env] = {
-                            state: permissionInterface_1.CollaborationState.ERROR,
-                            error: teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListAllCollaborators, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_2.SolutionSource, constants_2.SolutionError.FailedToListCollaborator), ctx.telemetryReporter)),
-                        };
-                        continue;
-                    }
-                    const teamsAppOwners = results[0].isErr() ? [] : results[0].value;
-                    const aadOwners = results[1].isErr() ? [] : results[1].value;
-                    const collaborators = [];
-                    for (const teamsAppOwner of teamsAppOwners) {
-                        const aadOwner = aadOwners.find((owner) => owner.userObjectId === teamsAppOwner.userObjectId);
-                        collaborators.push({
-                            // For guest account, aadOwner.userPrincipalName will be user's email, and is easy to read.
-                            userPrincipalName: (_e = (_d = aadOwner === null || aadOwner === void 0 ? void 0 : aadOwner.userPrincipalName) !== null && _d !== void 0 ? _d : teamsAppOwner.userPrincipalName) !== null && _e !== void 0 ? _e : teamsAppOwner.userObjectId,
-                            userObjectId: teamsAppOwner.userObjectId,
-                            isAadOwner: aadOwner ? true : false,
-                            aadResourceId: aadOwner ? aadOwner.resourceId : undefined,
-                            teamsAppResourceId: teamsAppOwner.resourceId,
-                        });
-                    }
-                    const aadOwnerCount = collaborators.filter((collaborator) => collaborator.aadResourceId && collaborator.isAadOwner).length;
-                    (_f = ctx.telemetryReporter) === null || _f === void 0 ? void 0 : _f.sendTelemetryEvent(constants_2.SolutionTelemetryEvent.ListAllCollaborators, {
-                        [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(),
-                        [constants_2.SolutionTelemetryProperty.Env]: tools_1.getHashedEnv(env),
-                    });
-                    collaboratorsResult[env] = {
-                        collaborators: collaborators,
-                        state: permissionInterface_1.CollaborationState.OK,
-                    };
-                }
-                catch (error) {
-                    collaboratorsResult[env] = {
-                        state: permissionInterface_1.CollaborationState.ERROR,
-                        error: teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListAllCollaborators, teamsfx_api_1.returnUserError(error, constants_2.SolutionSource, constants_2.SolutionError.FailedToListCollaborator), ctx.telemetryReporter)),
-                    };
-                }
-            }
-            return teamsfx_api_1.ok(collaboratorsResult);
-        }
-        finally {
-            this.runningState = SolutionRunningState.Idle;
-        }
+        return listAllCollaborators_1.listAllCollaborators({ apiVersion: 1, ctx });
     }
     async listCollaborator(ctx) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-        (_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.getCurrentUserInfo(ctx);
-            if (result.isErr()) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListCollaborator, result.error, ctx.telemetryReporter));
-            }
-            const stateResult = await this.getCurrentCollaborationState(ctx, result.value);
-            if (stateResult.state != permissionInterface_1.CollaborationState.OK) {
-                if (((_b = ctx.answers) === null || _b === void 0 ? void 0 : _b.platform) === teamsfx_api_1.Platform.CLI) {
-                    (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.showMessage("warn", stateResult.message, false);
-                }
-                else if (((_d = ctx.answers) === null || _d === void 0 ? void 0 : _d.platform) === teamsfx_api_1.Platform.VSCode) {
-                    (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.warning(stateResult.message);
-                }
-                return teamsfx_api_1.ok({
-                    state: stateResult.state,
-                    message: stateResult.message,
-                });
-            }
-            const userInfo = result.value;
-            const pluginsWithCtx = this.getPluginAndContextArray(ctx, [
-                this.AppStudioPlugin,
-                this.AadPlugin,
-            ]);
-            const listCollaboratorWithCtx = pluginsWithCtx.map(([plugin, context]) => {
-                return [
-                    (plugin === null || plugin === void 0 ? void 0 : plugin.listCollaborator)
-                        ? (ctx) => plugin.listCollaborator.bind(plugin)(ctx, userInfo)
-                        : undefined,
-                    context,
-                    plugin.name,
-                ];
-            });
-            const envName = ctx.envInfo.envName;
-            if (!envName) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnSystemError(new Error("Failed to get env name."), constants_2.SolutionSource, constants_2.SolutionError.FailedToGetEnvName), ctx.telemetryReporter));
-            }
-            const results = await executor_1.executeConcurrently("", listCollaboratorWithCtx);
-            const errors = [];
-            for (const result of results) {
-                if (result.isErr()) {
-                    errors.push(result);
-                }
-            }
-            let errorMsg = "";
-            if (errors.length > 0) {
-                errorMsg += `Failed to list collaborator for the project.\n Error details: \n`;
-                for (const fxError of errors) {
-                    errorMsg += fxError.error.message + "\n";
-                }
-            }
-            if (errorMsg) {
-                return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_2.SolutionSource, constants_2.SolutionError.FailedToListCollaborator), ctx.telemetryReporter));
-            }
-            const teamsAppOwners = results[0].isErr() ? [] : results[0].value;
-            const aadOwners = results[1].isErr() ? [] : results[1].value;
-            const collaborators = [];
-            const teamsAppId = (_g = (_f = teamsAppOwners[0]) === null || _f === void 0 ? void 0 : _f.resourceId) !== null && _g !== void 0 ? _g : "";
-            const aadAppId = (_j = (_h = aadOwners[0]) === null || _h === void 0 ? void 0 : _h.resourceId) !== null && _j !== void 0 ? _j : "";
-            const aadAppTenantId = (_l = (_k = ctx.envInfo.state) === null || _k === void 0 ? void 0 : _k.get(constants_2.PluginNames.AAD)) === null || _l === void 0 ? void 0 : _l.get(constants_2.REMOTE_TENANT_ID);
-            for (const teamsAppOwner of teamsAppOwners) {
-                const aadOwner = aadOwners.find((owner) => owner.userObjectId === teamsAppOwner.userObjectId);
-                collaborators.push({
-                    // For guest account, aadOwner.userPrincipalName will be user's email, and is easy to read.
-                    userPrincipalName: (_o = (_m = aadOwner === null || aadOwner === void 0 ? void 0 : aadOwner.userPrincipalName) !== null && _m !== void 0 ? _m : teamsAppOwner.userPrincipalName) !== null && _o !== void 0 ? _o : teamsAppOwner.userObjectId,
-                    userObjectId: teamsAppOwner.userObjectId,
-                    isAadOwner: aadOwner ? true : false,
-                    aadResourceId: aadOwner ? aadOwner.resourceId : undefined,
-                    teamsAppResourceId: teamsAppOwner.resourceId,
-                });
-            }
-            if (((_p = ctx.answers) === null || _p === void 0 ? void 0 : _p.platform) === teamsfx_api_1.Platform.CLI || ((_q = ctx.answers) === null || _q === void 0 ? void 0 : _q.platform) === teamsfx_api_1.Platform.VSCode) {
-                const message = [
-                    { content: `Listing M365 permissions\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                    { 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 teams app owners for environment: `,
-                        color: teamsfx_api_1.Colors.BRIGHT_WHITE,
-                    },
-                    { content: `${envName}\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 },
-                    { content: `M365 Teams App (ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                    { content: teamsAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-                    { content: `), SSO AAD App (ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                    { content: aadAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
-                    { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
-                ];
-                for (const collaborator of collaborators) {
-                    message.push({ content: `Teams App Owner: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE }, { content: collaborator.userPrincipalName, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `. `, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
-                    if (!collaborator.isAadOwner) {
-                        message.push({ content: `(Not owner of SSO AAD app)`, color: teamsfx_api_1.Colors.BRIGHT_YELLOW });
-                    }
-                    message.push({ content: "\n", color: teamsfx_api_1.Colors.BRIGHT_WHITE });
-                }
-                if (((_r = ctx.answers) === null || _r === void 0 ? void 0 : _r.platform) === teamsfx_api_1.Platform.CLI) {
-                    (_s = ctx.ui) === null || _s === void 0 ? void 0 : _s.showMessage("info", message, false);
-                }
-                else if (((_t = ctx.answers) === null || _t === void 0 ? void 0 : _t.platform) === teamsfx_api_1.Platform.VSCode) {
-                    (_u = ctx.logProvider) === null || _u === void 0 ? void 0 : _u.info(message);
-                }
-            }
-            const aadOwnerCount = collaborators.filter((collaborator) => collaborator.aadResourceId && collaborator.isAadOwner).length;
-            (_v = ctx.telemetryReporter) === null || _v === void 0 ? void 0 : _v.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(),
-                [constants_2.SolutionTelemetryProperty.Env]: tools_1.getHashedEnv(envName),
-            });
-            return teamsfx_api_1.ok({
-                collaborators: collaborators,
-                state: permissionInterface_1.CollaborationState.OK,
-            });
-        }
-        finally {
-            this.runningState = SolutionRunningState.Idle;
-        }
-    }
-    async getCurrentUserInfo(ctx) {
-        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"), constants_2.SolutionSource, constants_2.SolutionError.FailedToRetrieveUserInfo));
-        }
-        return teamsfx_api_1.ok(user);
-    }
-    getCurrentCollaborationState(ctx, user) {
-        var _a, _b;
-        const canProcess = this.checkWhetherSolutionIsIdle();
-        if (canProcess.isErr()) {
-            return {
-                state: permissionInterface_1.CollaborationState.SolutionIsNotIdle,
-                message: canProcess.error.message,
-            };
-        }
-        const provisioned = this.checkWetherProvisionSucceeded(ctx.envInfo.state);
-        if (!provisioned) {
-            const warningMsg = "The resources have not been provisioned yet. Please provision the resources first.";
-            return {
-                state: permissionInterface_1.CollaborationState.NotProvisioned,
-                message: warningMsg,
-            };
-        }
-        const aadAppTenantId = (_b = (_a = ctx.envInfo.state) === 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) {
-            const warningMsg = "Tenant id of your account and the provisioned Azure AD app does not match. Please check whether you logined with wrong account.";
-            return {
-                state: permissionInterface_1.CollaborationState.M365TenantNotMatch,
-                message: warningMsg,
-            };
-        }
-        return {
-            state: permissionInterface_1.CollaborationState.OK,
-        };
+        return listCollaborator_1.listCollaborator({ apiVersion: 1, ctx });
     }
     loadTeamsAppTenantId(ctx, isLocalDebug, appStudioToken) {
         return utils_1.parseTeamsAppTenantId(appStudioToken).andThen((teamsAppTenantId) => {
@@ -1461,10 +974,12 @@ let TeamsAppSolution = class TeamsAppSolution {
         const functionPlugin = this.FunctionPlugin;
         const sqlPlugin = this.SqlPlugin;
         const apimPlugin = this.ApimPlugin;
+        const keyVaultPlugin = this.KeyVaultPlugin;
         const alreadyHaveFunction = selectedPlugins.includes(functionPlugin.name);
         const alreadyHaveSQL = selectedPlugins.includes(sqlPlugin.name);
         const alreadyHaveAPIM = selectedPlugins.includes(apimPlugin.name);
-        const addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM);
+        const alreadyHavekeyVault = selectedPlugins.includes(keyVaultPlugin.name);
+        const addQuestion = question_1.createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHavekeyVault);
         const addAzureResourceNode = new teamsfx_api_1.QTreeNode(addQuestion);
         // there two cases to add function re-scaffold: 1. select add function   2. select add sql and function is not selected when creating
         if (functionPlugin.getQuestionsForUserTask) {
@@ -1480,7 +995,9 @@ let TeamsAppSolution = class TeamsAppSolution {
                 }
                 else {
                     // if not function activated, select any option will trigger function question
-                    azure_function.condition = { minItems: 1 };
+                    azure_function.condition = {
+                        containsAny: [question_1.AzureResourceApim.id, question_1.AzureResourceFunction.id, question_1.AzureResourceSQL.id],
+                    };
                 }
                 if (azure_function.data)
                     addAzureResourceNode.addChild(azure_function);
@@ -1622,9 +1139,11 @@ let TeamsAppSolution = class TeamsAppSolution {
         const functionPlugin = this.FunctionPlugin;
         const sqlPlugin = this.SqlPlugin;
         const apimPlugin = this.ApimPlugin;
+        const keyVaultPlugin = this.KeyVaultPlugin;
         const alreadyHaveFunction = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(functionPlugin.name);
         const alreadyHaveSql = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(sqlPlugin.name);
         const alreadyHaveApim = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(apimPlugin.name);
+        const alreadyHaveKeyVault = selectedPlugins === null || selectedPlugins === void 0 ? void 0 : selectedPlugins.includes(keyVaultPlugin.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!`), constants_2.SolutionSource, constants_2.SolutionError.InvalidInput));
@@ -1632,49 +1151,63 @@ let TeamsAppSolution = class TeamsAppSolution {
         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."), constants_2.SolutionSource, constants_2.SolutionError.AddResourceNotSupport);
+        const addKeyVault = addResourcesAnswer.includes(question_1.AzureResourceKeyVault.id);
+        if ((alreadyHaveSql && addSQL) ||
+            (alreadyHaveApim && addApim) ||
+            (alreadyHaveKeyVault && addKeyVault)) {
+            const e = teamsfx_api_1.returnUserError(new Error("SQL/APIM/KeyVault is already added."), constants_2.SolutionSource, constants_2.SolutionError.AddResourceNotSupport);
             return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_2.SolutionTelemetryEvent.AddResource, e, ctx.telemetryReporter));
         }
-        let addNewResoruceToProvision = false;
+        let addNewResourceToProvision = false;
         const notifications = [];
         const pluginsToScaffold = [this.LocalDebugPlugin];
+        const pluginsToDoArm = [];
         const azureResource = Array.from(settings.azureResources || []);
         if (addFunc || ((addSQL || addApim) && !alreadyHaveFunction)) {
             pluginsToScaffold.push(functionPlugin);
             if (!azureResource.includes(question_1.AzureResourceFunction.id)) {
                 azureResource.push(question_1.AzureResourceFunction.id);
-                addNewResoruceToProvision = true;
+                addNewResourceToProvision = true;
+                pluginsToDoArm.push(functionPlugin);
             }
             notifications.push(question_1.AzureResourceFunction.label);
         }
         if (addSQL && !alreadyHaveSql) {
             pluginsToScaffold.push(sqlPlugin);
+            pluginsToDoArm.push(sqlPlugin);
             azureResource.push(question_1.AzureResourceSQL.id);
             notifications.push(question_1.AzureResourceSQL.label);
-            addNewResoruceToProvision = true;
+            addNewResourceToProvision = true;
         }
         if (addApim && !alreadyHaveApim) {
             pluginsToScaffold.push(apimPlugin);
+            pluginsToDoArm.push(apimPlugin);
             azureResource.push(question_1.AzureResourceApim.id);
             notifications.push(question_1.AzureResourceApim.label);
-            addNewResoruceToProvision = true;
+            addNewResourceToProvision = true;
+        }
+        if (addKeyVault && !alreadyHaveKeyVault) {
+            pluginsToScaffold.push(keyVaultPlugin);
+            pluginsToDoArm.push(keyVaultPlugin);
+            azureResource.push(question_1.AzureResourceKeyVault.id);
+            notifications.push(question_1.AzureResourceKeyVault.label);
+            addNewResourceToProvision = true;
         }
         if (notifications.length > 0) {
-            if (tools_1.isArmSupportEnabled() && addNewResoruceToProvision) {
+            if (tools_1.isArmSupportEnabled() && addNewResourceToProvision) {
                 executeUserTask_1.showUpdateArmTemplateNotice(ctx.ui);
             }
             settings.azureResources = azureResource;
             await this.reloadPlugins(settings);
             (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(`start scaffolding ${notifications.join(",")}.....`);
-            const scaffoldRes = await this.doScaffold(ctx, pluginsToScaffold, addNewResoruceToProvision);
+            const scaffoldRes = await this.doScaffold(ctx, pluginsToScaffold, addNewResourceToProvision, pluginsToDoArm);
             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_2.SolutionTelemetryEvent.AddResource, scaffoldRes.error, ctx.telemetryReporter));
             }
             (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`finish scaffolding ${notifications.join(",")}!`);
-            if (addNewResoruceToProvision)
+            if (addNewResourceToProvision)
                 (_e = ctx.envInfo.state.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
@@ -1974,44 +1507,6 @@ let TeamsAppSolution = class TeamsAppSolution {
             applicationIdUri: configResult.value.applicationIdUri,
         });
     }
-    async getUserInfo(ctx, email) {
-        var _a, _b;
-        const currentUser = await ((_a = ctx.graphTokenProvider) === null || _a === void 0 ? void 0 : _a.getJsonObject());
-        if (!currentUser) {
-            return undefined;
-        }
-        const tenantId = currentUser["tid"];
-        let aadId = currentUser["oid"];
-        let userPrincipalName = currentUser["unique_name"];
-        let displayName = currentUser["name"];
-        const isAdministrator = true;
-        if (email) {
-            const graphToken = await ((_b = ctx.graphTokenProvider) === null || _b === void 0 ? void 0 : _b.getAccessToken());
-            const instance = axios_1.default.create({
-                baseURL: "https://graph.microsoft.com/v1.0",
-            });
-            instance.defaults.headers.common["Authorization"] = `Bearer ${graphToken}`;
-            const res = await instance.get(`/users?$filter=startsWith(mail,'${email}') or startsWith(userPrincipalName, '${email}')`);
-            if (!res || !res.data || !res.data.value) {
-                return undefined;
-            }
-            const collaborator = res.data.value.find((user) => user.mail.toLowerCase() === email.toLowerCase() ||
-                user.userPrincipalName.toLowerCase() === email.toLowerCase());
-            if (!collaborator) {
-                return undefined;
-            }
-            aadId = collaborator.id;
-            userPrincipalName = collaborator.userPrincipalName;
-            displayName = collaborator.displayName;
-        }
-        return {
-            tenantId,
-            aadId,
-            userPrincipalName,
-            displayName,
-            isAdministrator,
-        };
-    }
 };
 tslib_1.__decorate([
     lib_1.hooks([errorHandler_1.ErrorHandlerMW]),