@microsoft/teamsfx-core 1.3.0 → 1.3.1-alpha.59b5e7c6.0

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.askForProvisionConsent = exports.provisionResource = void 0;
+exports.provisionResource = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const tools_1 = require("../../../../common/tools");
@@ -11,66 +11,78 @@ const util = tslib_1.__importStar(require("util"));
 const lodash_1 = tslib_1.__importStar(require("lodash"));
 const constants_2 = require("../../../../common/constants");
 const adaptor_1 = require("./adaptor");
-const commonQuestions_1 = require("../commonQuestions");
 const arm_1 = require("../arm");
 const typedi_1 = tslib_1.__importDefault(require("typedi"));
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
 const permissionRequest_1 = require("../../../../core/permissionRequest");
-const core_1 = require("../../../../core");
 const constants_3 = require("../../../resource/appstudio/constants");
+const utils_2 = require("../../../../core/utils");
+const constants_4 = require("../v3/constants");
+const provision_1 = require("../v3/provision");
+const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
+const solutionGlobalVars_1 = require("../v3/solutionGlobalVars");
 async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
     var _a, _b, _c, _d;
+    const azureSolutionSettings = utils_1.getAzureSolutionSettings(ctx);
+    // check projectPath
     if (inputs.projectPath === undefined) {
-        return new teamsfx_api_1.v2.FxFailure(teamsfx_api_1.returnSystemError(new Error("projectPath is undefined"), constants_1.SolutionSource, constants_1.SolutionError.InternelError));
+        return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error("projectPath is undefined"), constants_1.SolutionSource, constants_1.SolutionError.InternelError));
     }
+    const inputsNew = inputs;
     const projectPath = inputs.projectPath;
-    const azureSolutionSettings = utils_1.getAzureSolutionSettings(ctx);
-    // Just to trigger M365 login before the concurrent execution of provision.
-    // Because concurrent exectution of provision may getAccessToken() concurrently, which
-    // causes 2 M365 logins before the token caching in common lib takes effect.
-    await tokenProvider.appStudioToken.getAccessToken();
+    // check M365 tenant
+    if (!envInfo.state[constants_4.BuiltInFeaturePluginNames.appStudio])
+        envInfo.state[constants_4.BuiltInFeaturePluginNames.appStudio] = {};
+    const teamsAppResource = envInfo.state[constants_4.BuiltInFeaturePluginNames.appStudio];
+    if (!envInfo.state.solution)
+        envInfo.state.solution = {};
+    const solutionConfig = envInfo.state.solution;
+    const tenantIdInConfig = teamsAppResource.tenantId;
+    const tenantIdInTokenRes = await provision_1.getM365TenantId(tokenProvider.appStudioToken);
+    if (tenantIdInTokenRes.isErr()) {
+        return teamsfx_api_1.err(tenantIdInTokenRes.error);
+    }
+    const tenantIdInToken = tenantIdInTokenRes.value;
+    if (tenantIdInConfig && tenantIdInToken && tenantIdInToken !== tenantIdInConfig) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_1.SolutionError.TeamsAppTenantIdNotRight, `The signed in M365 account does not match the M365 tenant in config file for '${envInfo.envName}' environment. Please sign out and sign in with the correct M365 account.`, "Solution"));
+    }
+    if (!tenantIdInConfig) {
+        teamsAppResource.tenantId = tenantIdInToken;
+        solutionConfig.teamsAppTenantId = tenantIdInToken;
+    }
     if (utils_1.isAzureProject(azureSolutionSettings)) {
         if (ctx.permissionRequestProvider === undefined) {
             ctx.permissionRequestProvider = new permissionRequest_1.PermissionRequestFileProvider(inputs.projectPath);
         }
         const result = await utils_1.ensurePermissionRequest(azureSolutionSettings, ctx.permissionRequestProvider);
         if (result.isErr()) {
-            return new teamsfx_api_1.v2.FxFailure(result.error);
+            return teamsfx_api_1.err(result.error);
         }
-    }
-    const newEnvInfo = lodash_1.default.cloneDeep(envInfo);
-    if (!newEnvInfo.state[constants_1.GLOBAL_CONFIG]) {
-        newEnvInfo.state[constants_1.GLOBAL_CONFIG] = { output: {}, secrets: {} };
-    }
-    newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
-    if (utils_1.isAzureProject(azureSolutionSettings)) {
-        //fill in common questions for solution
-        const appName = ctx.projectSetting.appName;
-        const contextAdaptor = new adaptor_1.ProvisionContextAdapter([ctx, inputs, newEnvInfo, tokenProvider]);
-        const res = inputs.isForUT
-            ? teamsfx_api_1.ok({})
-            : await commonQuestions_1.fillInCommonQuestions(contextAdaptor, appName, contextAdaptor.envInfo.state, tokenProvider.azureAccountProvider, await tokenProvider.appStudioToken.getJsonObject());
-        if (res.isErr()) {
-            return new teamsfx_api_1.v2.FxFailure(res.error);
+        // ask common question and fill in solution config
+        const solutionConfigRes = await provision_1.fillInAzureConfigs(ctx, inputsNew, envInfo, tokenProvider);
+        if (solutionConfigRes.isErr()) {
+            return teamsfx_api_1.err(solutionConfigRes.error);
         }
-        // contextAdaptor deep-copies original JSON into a map. We need to convert it back.
-        const update = contextAdaptor.getEnvStateJson();
-        lodash_1.default.assign(newEnvInfo.state, update);
-        const consentResult = await askForProvisionConsent(contextAdaptor);
+        // ask for provision consent
+        const consentResult = await provision_1.askForProvisionConsent(ctx, tokenProvider.azureAccountProvider, envInfo);
         if (consentResult.isErr()) {
-            return new teamsfx_api_1.v2.FxFailure(consentResult.error);
+            return teamsfx_api_1.err(consentResult.error);
         }
         // create resource group if needed
-        const commonQuestionResult = res.value;
-        if (commonQuestionResult.needCreateResourceGroup) {
-            const maybeRgName = await commonQuestions_1.createNewResourceGroup(tokenProvider.azureAccountProvider, commonQuestionResult.subscriptionId, commonQuestionResult.subscriptionName, commonQuestionResult.resourceGroupName, commonQuestionResult.location, ctx.logProvider);
-            if (maybeRgName.isErr()) {
-                return new teamsfx_api_1.v2.FxFailure(maybeRgName.error);
+        if (solutionConfig.needCreateResourceGroup) {
+            const createRgRes = await ResourceGroupHelper_1.resourceGroupHelper.createNewResourceGroup(solutionConfig.resourceGroupName, tokenProvider.azureAccountProvider, solutionConfig.subscriptionId, solutionConfig.location);
+            if (createRgRes.isErr()) {
+                return teamsfx_api_1.err(createRgRes.error);
             }
         }
     }
-    const solutionInputs = utils_1.extractSolutionInputs(newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"]);
-    const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
+    const pureExistingApp = utils_2.isPureExistingApp(ctx.projectSetting);
+    envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
+    const solutionInputs = utils_1.extractSolutionInputs(envInfo.state[constants_1.GLOBAL_CONFIG]);
+    // for minimized teamsfx project, there is only one plugin (app studio)
+    const plugins = pureExistingApp
+        ? [typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin)]
+        : utils_1.getSelectedPlugins(ctx.projectSetting);
     const provisionThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
         .map((plugin) => {
@@ -78,67 +90,62 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
             pluginName: `${plugin.name}`,
             taskName: "provisionResource",
             thunk: () => {
-                if (!newEnvInfo.state[plugin.name]) {
-                    newEnvInfo.state[plugin.name] = {};
+                if (!envInfo.state[plugin.name]) {
+                    envInfo.state[plugin.name] = {};
                 }
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                return plugin.provisionResource(ctx, Object.assign(Object.assign(Object.assign({}, inputs), solutionInputs), { projectPath: projectPath }), Object.assign(Object.assign({}, newEnvInfo), { state: newEnvInfo.state }), tokenProvider);
+                return plugin.provisionResource(ctx, Object.assign(Object.assign(Object.assign({}, inputs), solutionInputs), { projectPath: projectPath }), envInfo, tokenProvider);
             },
         };
     });
     // call provisionResources
     (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.info(util.format(tools_1.getStrings().solution.ProvisionStartNotice, constants_2.PluginDisplayName.Solution));
     const provisionResult = await executor_1.executeConcurrently(provisionThunks, ctx.logProvider);
-    if (provisionResult.kind === "failure") {
-        return provisionResult;
-    }
-    else {
-        const update = utils_1.combineRecords(provisionResult.output);
-        lodash_1.default.assign(newEnvInfo.state, update);
-        if (provisionResult.kind === "partialSuccess") {
-            return new teamsfx_api_1.v2.FxPartialSuccess(newEnvInfo.state, provisionResult.error);
-        }
+    if (provisionResult.kind === "failure" || provisionResult.kind === "partialSuccess") {
+        return teamsfx_api_1.err(provisionResult.error);
     }
     (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(util.format(tools_1.getStrings().solution.ProvisionFinishNotice, constants_2.PluginDisplayName.Solution));
+    const teamsAppId = envInfo.state[constants_1.PluginNames.APPST][constants_3.Constants.TEAMS_APP_ID];
+    solutionGlobalVars_1.solutionGlobalVars.TeamsAppId = teamsAppId;
+    solutionInputs.remoteTeamsAppId = teamsAppId;
     // call deployArmTemplates
     if (utils_1.isAzureProject(azureSolutionSettings) && !inputs.isForUT) {
-        const contextAdaptor = new adaptor_1.ProvisionContextAdapter([ctx, inputs, newEnvInfo, tokenProvider]);
+        const contextAdaptor = new adaptor_1.ProvisionContextAdapter([ctx, inputs, envInfo, tokenProvider]);
         const armDeploymentResult = await arm_1.deployArmTemplates(contextAdaptor);
         if (armDeploymentResult.isErr()) {
-            return new teamsfx_api_1.v2.FxPartialSuccess(newEnvInfo.state, armDeploymentResult.error);
+            return teamsfx_api_1.err(armDeploymentResult.error);
         }
         // contextAdaptor deep-copies original JSON into a map. We need to convert it back.
         const update = contextAdaptor.getEnvStateJson();
-        lodash_1.default.assign(newEnvInfo.state, update);
+        lodash_1.default.assign(envInfo.state, update);
     }
-    // call aad.setApplicationInContext
-    const aadPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin);
-    if (plugins.some((plugin) => plugin.name === aadPlugin.name) && aadPlugin.executeUserTask) {
-        const result = await aadPlugin.executeUserTask(ctx, inputs, {
-            namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
-            method: "setApplicationInContext",
-            params: { isLocal: false },
-        }, {}, newEnvInfo, tokenProvider);
-        if (result.isErr()) {
-            return new teamsfx_api_1.v2.FxPartialSuccess(newEnvInfo.state, result.error);
+    // there is no aad for minimized teamsfx project
+    if (!pureExistingApp) {
+        // call aad.setApplicationInContext
+        const aadPlugin = typedi_1.default.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin);
+        if (plugins.some((plugin) => plugin.name === aadPlugin.name) && aadPlugin.executeUserTask) {
+            const result = await aadPlugin.executeUserTask(ctx, inputs, {
+                namespace: `${constants_1.PluginNames.SOLUTION}/${constants_1.PluginNames.AAD}`,
+                method: "setApplicationInContext",
+                params: { isLocal: false },
+            }, {}, envInfo, tokenProvider);
+            if (result.isErr()) {
+                return teamsfx_api_1.err(result.error);
+            }
         }
     }
-    if (utils_1.isAzureProject(azureSolutionSettings)) {
-        solutionInputs.remoteTeamsAppId =
-            newEnvInfo.state[constants_1.PluginNames.APPST]["output"][constants_3.Constants.TEAMS_APP_ID];
-    }
     const configureResourceThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.configureResource))
         .map((plugin) => {
-        if (!newEnvInfo.state[plugin.name]) {
-            newEnvInfo.state[plugin.name] = {};
+        if (!envInfo.state[plugin.name]) {
+            envInfo.state[plugin.name] = {};
         }
         return {
             pluginName: `${plugin.name}`,
             taskName: "configureResource",
             thunk: () => 
             // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-            plugin.configureResource(ctx, Object.assign(Object.assign(Object.assign({}, inputs), solutionInputs), { projectPath: projectPath }), Object.assign(Object.assign({}, newEnvInfo), { state: newEnvInfo.state }), tokenProvider),
+            plugin.configureResource(ctx, Object.assign(Object.assign(Object.assign({}, inputs), solutionInputs), { projectPath: projectPath }), envInfo, tokenProvider),
         };
     });
     //call configResource
@@ -149,71 +156,32 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
         const msg = util.format(tools_1.getStrings().solution.ProvisionFailNotice, ctx.projectSetting.appName);
         ctx.logProvider.error(msg);
         solutionInputs[constants_1.SOLUTION_PROVISION_SUCCEEDED] = false;
-        if (configureResourceResult.kind === "failure") {
-            return configureResourceResult;
-        }
-        else {
-            return new teamsfx_api_1.v2.FxPartialSuccess(newEnvInfo.state, configureResourceResult.error);
-        }
+        return teamsfx_api_1.err(configureResourceResult.error);
     }
     else {
-        if (newEnvInfo.state[constants_1.GLOBAL_CONFIG] && newEnvInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT]) {
-            delete newEnvInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT];
-        }
-        const url = tools_1.getResourceGroupInPortal(solutionInputs.subscriptionId, solutionInputs.tenantId, solutionInputs.resourceGroupName);
-        const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
-        (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
-        if (url) {
-            const title = "View Provisioned Resources";
-            ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
-                const userSelected = result.isOk() ? result.value : undefined;
-                if (userSelected === title) {
-                    ctx.userInteraction.openUrl(url);
-                }
-            });
-        }
-        else {
-            ctx.userInteraction.showMessage("info", msg, false);
-        }
-        const update = utils_1.combineRecords(configureResourceResult.output);
-        lodash_1.default.assign(newEnvInfo.state, update);
-        newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.SOLUTION_PROVISION_SUCCEEDED] = true;
-        if (!utils_1.isAzureProject(azureSolutionSettings)) {
-            const appStudioTokenJson = await tokenProvider.appStudioToken.getJsonObject();
-            newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"][constants_1.REMOTE_TEAMS_APP_TENANT_ID] = appStudioTokenJson.tid;
+        if (envInfo.state[constants_1.GLOBAL_CONFIG] && envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT]) {
+            delete envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT];
+        }
+        if (!pureExistingApp) {
+            const url = tools_1.getResourceGroupInPortal(solutionInputs.subscriptionId, solutionInputs.tenantId, solutionInputs.resourceGroupName);
+            const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
+            (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
+            if (url) {
+                const title = "View Provisioned Resources";
+                ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
+                    const userSelected = result.isOk() ? result.value : undefined;
+                    if (userSelected === title) {
+                        ctx.userInteraction.openUrl(url);
+                    }
+                });
+            }
+            else {
+                ctx.userInteraction.showMessage("info", msg, false);
+            }
         }
-        return new teamsfx_api_1.v2.FxSuccess(newEnvInfo.state);
-    }
-}
-exports.provisionResource = provisionResource;
-async function askForProvisionConsent(ctx) {
-    var _a, _b, _c, _d, _e, _f;
-    if (core_1.isVsCallingCli()) {
-        // Skip asking users for input on VS calling CLI to simplify user interaction.
+        envInfo.state[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED] = true;
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     }
-    const azureToken = await ((_a = ctx.azureAccountProvider) === null || _a === void 0 ? void 0 : _a.getAccountCredentialAsync());
-    // Only Azure project requires this confirm dialog
-    const username = azureToken.username ? azureToken.username : "";
-    const subscriptionId = (_b = ctx.envInfo.state.get(constants_1.GLOBAL_CONFIG)) === null || _b === void 0 ? void 0 : _b.get(constants_1.SUBSCRIPTION_ID);
-    const subscriptionName = (_c = ctx.envInfo.state.get(constants_1.GLOBAL_CONFIG)) === null || _c === void 0 ? void 0 : _c.get(constants_1.SUBSCRIPTION_NAME);
-    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.envInfo.envName, username, subscriptionName ? subscriptionName : subscriptionId);
-        confirmRes = await ((_d = ctx.ui) === null || _d === void 0 ? void 0 : _d.showMessage("warn", msgNew, true, "Provision"));
-    }
-    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/");
-        }
-        return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(tools_1.getStrings().solution.CancelProvision), constants_1.SolutionSource, tools_1.getStrings().solution.CancelProvision));
-    }
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
-exports.askForProvisionConsent = askForProvisionConsent;
+exports.provisionResource = provisionResource;
 //# sourceMappingURL=provision.js.map

package/build/plugins/solution/fx-solution/v2/provision.js.map

@@ -1 +1 @@
-{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts

@@ -1,3 +1,4 @@
 import { v2, Inputs, FxError, TokenProvider, Json } from "@microsoft/teamsfx-api";
-export declare function provisionLocalResource(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider): Promise<v2.FxResult<Json, FxError>>;
+import { EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
+export declare function provisionLocalResource(ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider, envInfo?: EnvInfoV2): Promise<v2.FxResult<Json, FxError>>;
 //# sourceMappingURL=provisionLocal.d.ts.map

package/build/plugins/solution/fx-solution/v2/provisionLocal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAmBhC,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAoIrC"}
+{"version":3,"file":"provisionLocal.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,aAAa,EAEb,IAAI,EACL,MAAM,wBAAwB,CAAC;AAmBhC,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAE5D,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,SAAS,GAClB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgIrC"}

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

@@ -13,7 +13,8 @@ const environment_1 = require("../../../../core/environment");
 const permissionRequest_1 = require("../../../../core/permissionRequest");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
 const provisionLocal_1 = require("../debug/provisionLocal");
-async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider) {
+const tools_1 = require("../../../../common/tools");
+async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider, envInfo) {
     if (inputs.projectPath === undefined) {
         return new teamsfx_api_1.v2.FxFailure(teamsfx_api_1.returnSystemError(new Error("projectPath is undefined"), "Solution", constants_1.SolutionError.InternelError));
     }
@@ -32,7 +33,13 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
     // causes 2 M365 logins before the token caching in common lib takes effect.
     await tokenProvider.appStudioToken.getAccessToken();
     // Pop-up window to confirm if local debug in another tenant
-    const localDebugTenantId = localSettings.teamsApp[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId];
+    let localDebugTenantId = "";
+    if (tools_1.isConfigUnifyEnabled()) {
+        localDebugTenantId = envInfo === null || envInfo === void 0 ? void 0 : envInfo.state.solution.teamsAppTenantId;
+    }
+    else {
+        localDebugTenantId = localSettings.teamsApp[localSettingsConstants_1.LocalSettingsTeamsAppKeys.TenantId];
+    }
     const m365TenantMatches = await utils_1.checkWhetherLocalDebugM365TenantMatches(localDebugTenantId, tokenProvider.appStudioToken);
     if (m365TenantMatches.isErr()) {
         return new teamsfx_api_1.v2.FxFailure(m365TenantMatches.error);
@@ -68,13 +75,8 @@ async function provisionLocalResource(ctx, inputs, localSettings, tokenProvider)
                 return new teamsfx_api_1.v2.FxPartialSuccess(localSettings, result.error);
             }
         }
-        else {
-            if (!ctx.projectSetting.solutionSettings.migrateFromV1) {
-                return new teamsfx_api_1.v2.FxFailure(teamsfx_api_1.returnSystemError(new Error("AAD plugin not selected or executeUserTask is undefined"), constants_1.SolutionSource, constants_1.SolutionError.InternelError));
-            }
-        }
     }
-    const parseTenantIdresult = utils_1.loadTeamsAppTenantIdForLocal(localSettings, await tokenProvider.appStudioToken.getJsonObject());
+    const parseTenantIdresult = utils_1.loadTeamsAppTenantIdForLocal(localSettings, await tokenProvider.appStudioToken.getJsonObject(), envInfo);
     if (parseTenantIdresult.isErr()) {
         return new teamsfx_api_1.v2.FxFailure(parseTenantIdresult.error);
     }

package/build/plugins/solution/fx-solution/v2/provisionLocal.js.map

@@ -1 +1 @@
-{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"provisionLocal.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provisionLocal.ts"],"names":[],"mappings":";;;;AAAA,wDAOgC;AAChC,yCAAiD;AACjD,mCAOiB;AACjB,4CAA0E;AAC1E,mCAAqC;AACrC,4DAA+B;AAC/B,wEAA+D;AAC/D,8DAAkE;AAClE,0EAAmF;AACnF,sFAAsF;AACtF,4DAA4F;AAC5F,oDAAgE;AAGzD,KAAK,UAAU,sBAAsB,CAC1C,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,aAA4B,EAC5B,OAAmB;IAEnB,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,IAAI,gBAAE,CAAC,SAAS,CACrB,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,UAAU,EACV,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC5D,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,GAAG,CAAC,yBAAyB,KAAK,SAAS,EAAE;YAC/C,GAAG,CAAC,yBAAyB,GAAG,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACvF;QACD,MAAM,MAAM,GAAG,MAAM,+BAAuB,CAC1C,qBAAsB,EACtB,GAAG,CAAC,yBAAyB,CAC9B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACvC;KACF;IAED,4EAA4E;IAC5E,sFAAsF;IACtF,4EAA4E;IAC5E,MAAM,aAAa,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAEpD,4DAA4D;IAC5D,IAAI,kBAAkB,GAAG,EAAE,CAAC;IAC5B,IAAI,4BAAoB,EAAE,EAAE;QAC1B,kBAAkB,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC;KAC/D;SAAM;QACL,kBAAkB,GAAG,aAAa,CAAC,QAAQ,CAAC,kDAAyB,CAAC,QAAQ,CAAC,CAAC;KACjF;IAED,MAAM,iBAAiB,GAAG,MAAM,+CAAuC,CACrE,kBAAkB,EAClB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACF,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KAClD;IAED,MAAM,OAAO,GAAwB,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAC5E,MAAM,4BAA4B,GAAG,OAAO;SACzC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;SAC/D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,wBAAwB;YAClC,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC;SACvF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,eAAe,GAAG,MAAM,8BAAmB,CAAC,4BAA4B,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IACjG,IAAI,eAAe,CAAC,IAAI,KAAK,SAAS,EAAE;QACtC,OAAO,eAAe,CAAC;KACxB;IAED,MAAM,oBAAoB,GAAG,MAAM,wCAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAEvF,IAAI,oBAAoB,CAAC,KAAK,EAAE,EAAE;QAChC,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,oBAAoB,CAAC,KAAK,CAAC,CAAC;KAC3E;IAED,MAAM,SAAS,GAAG,gBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,SAAS,CAAC,CAAC;IAChF,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,eAAe,EAAE;YACzF,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,eAAe,CAC5C,GAAG,EACH,MAAM,EACN;gBACE,SAAS,EAAE,GAAG,uBAAW,CAAC,QAAQ,IAAI,uBAAW,CAAC,GAAG,EAAE;gBACvD,MAAM,EAAE,yBAAyB;gBACjC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;aAC1B,EACD,aAAa,EACb,EAAE,OAAO,EAAE,gCAAkB,CAAC,iBAAiB,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAC1E,aAAa,CACd,CAAC;YACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;gBAClB,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;aAC7D;SACF;KACF;IAED,MAAM,mBAAmB,GAAG,oCAA4B,CACtD,aAAiC,EACjC,MAAM,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,EAClD,OAAO,CACR,CAAC;IACF,IAAI,mBAAmB,CAAC,KAAK,EAAE,EAAE;QAC/B,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;KACpD;IAED,MAAM,4BAA4B,GAAG,OAAO;SACzC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;SAC/D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,wBAAwB;YAClC,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,sBAAuB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,EAAE,aAAa,CAAC;SACvF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,uBAAuB,GAAG,MAAM,8BAAmB,CACvD,4BAA4B,EAC5B,GAAG,CAAC,WAAW,CAChB,CAAC;IAEF,IAAI,uBAAuB,CAAC,IAAI,KAAK,SAAS,EAAE;QAC9C,IAAI,uBAAuB,CAAC,IAAI,KAAK,gBAAgB,EAAE;YACrD,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC;SAC9E;QACD,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;KACxD;IAED,MAAM,iBAAiB,GAAG,MAAM,yCAAwB,CAAC,GAAG,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;IAErF,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,aAAa,EAAE,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACxE;IAED,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;AACzC,CAAC;AAtID,wDAsIC"}

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

@@ -13,7 +13,7 @@ const utils_1 = require("./utils");
 async function publishApplication(ctx, inputs, envInfo, tokenProvider) {
     var _a;
     const inAzureProject = utils_1.isAzureProject(utils_1.getAzureSolutionSettings(ctx));
-    const provisioned = envInfo.state[constants_2.GLOBAL_CONFIG]["output"][constants_2.SOLUTION_PROVISION_SUCCEEDED];
+    const provisioned = envInfo.state[constants_2.GLOBAL_CONFIG][constants_2.SOLUTION_PROVISION_SUCCEEDED];
     if (inAzureProject && !provisioned) {
         return teamsfx_api_1.err(teamsfx_api_1.returnUserError(new Error(util.format(tools_1.getStrings().solution.NotProvisionedNotice, ctx.projectSetting.appName)), constants_2.SolutionSource, constants_2.SolutionError.CannotDeployBeforeProvision));
     }

package/build/plugins/solution/fx-solution/v2/publish.js.map

@@ -1 +1 @@
-{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mDAA6B;AAC7B,4DAAiE;AACjE,oDAAsD;AACtD,4CAKsB;AACtB,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,QAAQ,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAEzF,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,0BAAc,EACd,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAClF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}
+{"version":3,"file":"publish.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/publish.ts"],"names":[],"mappings":";;;;AAAA,wDAUgC;AAChC,mCAAqC;AACrC,mDAA6B;AAC7B,4DAAiE;AACjE,oDAAsD;AACtD,4CAKsB;AACtB,yCAAiD;AACjD,mCAAuF;AAEhF,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc,EACd,OAAqB,EACrB,aAAqC;;IAErC,MAAM,cAAc,GAAG,sBAAc,CAAC,gCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;IACrE,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,wCAA4B,CAAC,CAAC;IAE/E,IAAI,cAAc,IAAI,CAAC,WAAW,EAAE;QAClC,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CACP,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CACpF,EACD,0BAAc,EACd,yBAAa,CAAC,2BAA2B,CAC1C,CACF,CAAC;KACH;IAED,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACvD,MAAM,MAAM,GAAG,OAAO;SACnB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;SAC3D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC;SAC7E,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,GAAG,CAAC,WAAW,CAAC,IAAI,CAClB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,kBAAkB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CAClF,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAElE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC7F,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA7CD,gDA6CC"}

package/build/plugins/solution/fx-solution/v2/scaffolding.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqFhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}
+{"version":3,"file":"scaffolding.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,IAAI,EAIJ,IAAI,EACL,MAAM,wBAAwB,CAAC;AA8BhC,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAwFhC;AAED,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,EAAE,CAAC,cAAc,EAAE,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAkChC;AAED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,EAAE,EACtB,cAAc,EAAE,MAAM,EAAE,EACxB,WAAW,EAAE,MAAM,EACnB,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,IAAI,CAAC,CAmBf"}

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

@@ -23,7 +23,7 @@ async function scaffoldSourceCode(ctx, inputs) {
         ctx.projectSetting.programmingLanguage = lang;
     }
     const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
-    const fillinRes = utils_1.fillInSolutionSettings(solutionSettings, inputs);
+    const fillinRes = utils_1.fillInSolutionSettings(ctx.projectSetting, inputs);
     if (fillinRes.isErr())
         return teamsfx_api_1.err(fillinRes.error);
     const plugins = utils_1.getSelectedPlugins(ctx.projectSetting);
@@ -44,8 +44,9 @@ async function scaffoldSourceCode(ctx, inputs) {
     }
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
     if (result.kind === "success") {
-        const capabilities = solutionSettings.capabilities;
-        const azureResources = solutionSettings.azureResources;
+        const capabilities = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || [];
+        const azureResources = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || [];
+        // TODO: move this to if/else part when unify config job is completed
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         const scaffoldLocalDebugSettingsResult = await scaffolding_1.scaffoldLocalDebugSettings(ctx, inputs);
         if (scaffoldLocalDebugSettingsResult.isErr()) {
@@ -59,8 +60,8 @@ async function scaffoldSourceCode(ctx, inputs) {
             (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(__1.SolutionTelemetryEvent.Create, {
                 [__1.SolutionTelemetryProperty.Component]: __1.SolutionTelemetryComponentName,
                 [__1.SolutionTelemetryProperty.Success]: __1.SolutionTelemetrySuccess.Yes,
-                [__1.SolutionTelemetryProperty.Resources]: solutionSettings.azureResources.join(";"),
-                [__1.SolutionTelemetryProperty.Capabilities]: solutionSettings.capabilities.join(";"),
+                [__1.SolutionTelemetryProperty.Resources]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || []).join(";"),
+                [__1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
                 [__1.SolutionTelemetryProperty.ProgrammingLanguage]: (_c = (_b = ctx.projectSetting) === null || _b === void 0 ? void 0 : _b.programmingLanguage) !== null && _c !== void 0 ? _c : "",
                 "host-type": "azure",
             });
@@ -75,7 +76,7 @@ async function scaffoldSourceCode(ctx, inputs) {
                 (_d = ctx.telemetryReporter) === null || _d === void 0 ? void 0 : _d.sendTelemetryEvent(__1.SolutionTelemetryEvent.Create, {
                     [__1.SolutionTelemetryProperty.Component]: __1.SolutionTelemetryComponentName,
                     [__1.SolutionTelemetryProperty.Success]: __1.SolutionTelemetrySuccess.Yes,
-                    [__1.SolutionTelemetryProperty.Capabilities]: solutionSettings.capabilities.join(";"),
+                    [__1.SolutionTelemetryProperty.Capabilities]: ((solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || []).join(";"),
                     [__1.SolutionTelemetryProperty.ProgrammingLanguage]: (_f = (_e = ctx.projectSetting) === null || _e === void 0 ? void 0 : _e.programmingLanguage) !== null && _f !== void 0 ? _f : "",
                     "host-type": "spfx",
                 });
@@ -107,8 +108,8 @@ async function scaffoldByPlugins(ctx, inputs, localSettings, plugins) {
     const result = await executor_1.executeConcurrently(thunks, ctx.logProvider);
     const solutionSettings = utils_1.getAzureSolutionSettings(ctx);
     if (result.kind === "success") {
-        const capabilities = solutionSettings.capabilities;
-        const azureResources = solutionSettings.azureResources;
+        const capabilities = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.capabilities) || [];
+        const azureResources = (solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.azureResources) || [];
         // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         await scaffoldReadme(capabilities, azureResources, inputs.projectPath);
         ctx.userInteraction.showMessage("info", `Success: ${tools_1.getStrings().solution.ScaffoldSuccessNotice}`, false);

package/build/plugins/solution/fx-solution/v2/scaffolding.js.map

@@ -1 +1 @@
-{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"scaffolding.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/scaffolding.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,oDAAsD;AACtD,0CAKqB;AACrB,yCAA6D;AAC7D,mCAKiB;AACjB,wDAAwB;AACxB,gEAA0B;AAC1B,mCAQqB;AACrB,wEAA+D;AAC/D,mCAAmC;AACnC,sDAAkE;AAE3D,KAAK,UAAU,kBAAkB,CACtC,GAAe,EACf,MAAc;;IAEd,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,iBAAG,CACR,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,UAAU,EACV,iBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,qCAA0B,CAAC,mBAAmB,CAAW,CAAC;IAC9E,IAAI,IAAI,EAAE;QACR,GAAG,CAAC,cAAc,CAAC,mBAAmB,GAAG,IAAI,CAAC;KAC/C;IACD,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,8BAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IACrE,IAAI,SAAS,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,0BAAkB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAEvD,IAAI,MAAM,GAAuB,OAAO;SACrC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,mEAAmE;IACnE,MAAM,UAAU,GAAG,kBAAS,CAAC,GAAG,CAAoB,2CAAiB,CAAC,UAAU,CAAC,CAAC;IAClF,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;QAClE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,IAAI,CAAC,CAAC;KACjE;IACD,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC;QAE9D,qEAAqE;QACrE,oEAAoE;QACpE,MAAM,gCAAgC,GAAG,MAAM,wCAA0B,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACvF,IAAI,gCAAgC,CAAC,KAAK,EAAE,EAAE;YAC5C,OAAO,gCAAgC,CAAC;SACzC;QACD,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QACxE,IAAI,sBAAc,CAAC,gBAAgB,CAAC,EAAE;YACpC,MAAM,kBAAE,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,WAAW,mBAAmB,EAAE,8BAA0B,EAAE;gBACvF,MAAM,EAAE,CAAC;aACV,CAAC,CAAC;YACH,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,0BAAsB,CAAC,MAAM,EAAE;gBACvE,CAAC,6BAAyB,CAAC,SAAS,CAAC,EAAE,kCAA8B;gBACrE,CAAC,6BAAyB,CAAC,OAAO,CAAC,EAAE,4BAAwB,CAAC,GAAG;gBACjE,CAAC,6BAAyB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBACzF,CAAC,6BAAyB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC1F,CAAC,6BAAyB,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;gBAC/C,WAAW,EAAE,OAAO;aACrB,CAAC,CAAC;SACJ;aAAM;YACL,0CAA0C;YAC1C,IAAI,UAAU,CAAC,kBAAkB,EAAE;gBACjC,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;gBACjE,IAAI,OAAO,CAAC,KAAK,EAAE,EAAE;oBACnB,OAAO,iBAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBAC3B;gBACD,MAAA,GAAG,CAAC,iBAAiB,0CAAE,kBAAkB,CAAC,0BAAsB,CAAC,MAAM,EAAE;oBACvE,CAAC,6BAAyB,CAAC,SAAS,CAAC,EAAE,kCAA8B;oBACrE,CAAC,6BAAyB,CAAC,OAAO,CAAC,EAAE,4BAAwB,CAAC,GAAG;oBACjE,CAAC,6BAAyB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC,CAAC,IAAI,CACnF,GAAG,CACJ;oBACD,CAAC,6BAAyB,CAAC,mBAAmB,CAAC,EAC7C,MAAA,MAAA,GAAG,CAAC,cAAc,0CAAE,mBAAmB,mCAAI,EAAE;oBAC/C,WAAW,EAAE,MAAM;iBACpB,CAAC,CAAC;aACJ;SACF;QACD,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kBAAU,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EACzD,KAAK,CACN,CAAC;QACF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AA3FD,gDA2FC;AAEM,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,aAAmB,EACnB,OAA4B;;IAE5B,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;IAC1C,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,qBAAqB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxF,MAAM,MAAM,GAAuB,OAAO;SACvC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,kBAAkB,CAAC;SAC/C,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,oBAAoB;YAC9B,oEAAoE;YACpE,KAAK,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,kBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC;SACrD,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,MAAM,GAAG,MAAM,8BAAmB,CAAC,MAAM,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,gBAAgB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IACvD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;QAC7B,MAAM,YAAY,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,YAAY,KAAI,EAAE,CAAC;QAC1D,MAAM,cAAc,GAAG,CAAA,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,KAAI,EAAE,CAAC;QAE9D,oEAAoE;QACpE,MAAM,cAAc,CAAC,YAAY,EAAE,cAAc,EAAE,MAAM,CAAC,WAAY,CAAC,CAAC;QAExE,GAAG,CAAC,eAAe,CAAC,WAAW,CAC7B,MAAM,EACN,YAAY,kBAAU,EAAE,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EACzD,KAAK,CACN,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;SAAM;QACL,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,sBAAsB,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACrF,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;AACH,CAAC;AAvCD,8CAuCC;AAEM,KAAK,UAAU,cAAc,CAClC,YAAsB,EACtB,cAAwB,EACxB,WAAmB,EACnB,aAAuB;IAEvB,YAAY,GAAG,YAAY,IAAI,EAAE,CAAC;IAClC,cAAc,GAAG,cAAc,IAAI,EAAE,CAAC;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,YAAY,CAAC,QAAQ,CAAC,+BAAoB,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,wBAAa,CAAC,EAAE,CAAC,CAAC;IACvD,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE;QACnC,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QACnF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;IAED,IAAI,aAAa,EAAE;QACjB,MAAM,MAAM,GAAG,cAAI,CAAC,IAAI,CAAC,sBAAkB,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;QACzF,IAAI,MAAM,kBAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;YAC/B,MAAM,kBAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,WAAW,IAAI,iCAAmB,EAAE,CAAC,CAAC;SAChE;KACF;AACH,CAAC;AAxBD,wCAwBC"}

package/build/plugins/solution/fx-solution/v2/solution.d.ts

@@ -1,14 +1,15 @@
 import { AppStudioTokenProvider, Func, FxError, Inputs, Json, QTreeNode, Result, TokenProvider, v2, Void } from "@microsoft/teamsfx-api";
 import { DeepReadonly, EnvInfoV2 } from "@microsoft/teamsfx-api/build/v2";
+import { provisionResource } from "./provision";
 export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
     name: string;
     displayName: string;
     scaffoldSourceCode: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
     generateResourceTemplate: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Json, FxError>>;
-    provisionResources: (ctx: v2.Context, inputs: Inputs, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<v2.FxResult<v2.SolutionProvisionOutput, FxError>>;
+    provisionResources: typeof provisionResource;
     deploy?: (ctx: v2.Context, inputs: Inputs, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<Result<Void, FxError>>;
     publishApplication: (ctx: v2.Context, inputs: Inputs, envInfo: v2.EnvInfoV2, tokenProvider: AppStudioTokenProvider) => Promise<Result<Void, FxError>>;
-    provisionLocalResource?: (ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider) => Promise<v2.FxResult<Json, FxError>>;
+    provisionLocalResource?: (ctx: v2.Context, inputs: Inputs, localSettings: Json, tokenProvider: TokenProvider, envInfo?: EnvInfoV2) => Promise<v2.FxResult<Json, FxError>>;
     getQuestionsForScaffolding?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<QTreeNode | undefined, FxError>>;
     executeUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, localSettings: Json, envInfo: EnvInfoV2, tokenProvider: TokenProvider) => Promise<Result<unknown, FxError>>;
     createEnv?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
@@ -17,6 +18,5 @@ export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
     grantPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
     checkPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
     listCollaborator?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
-    listAllCollaborators?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
 }
 //# sourceMappingURL=solution.d.ts.map