@microsoft/teamsfx-core 1.2.0 → 1.2.2-alpha.29989668.0

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

@@ -2,9 +2,10 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = exports.AzureStoragePlugin = void 0;
+exports.addResource = exports.getQuestionsForAddResource = exports.SPFxResourcePlugin = exports.AzureWebAppPlugin = exports.AzureBotPlugin = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const lodash_1 = require("lodash");
 const typedi_1 = require("typedi");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
 const constants_1 = require("./constants");
@@ -12,51 +13,9 @@ const error_1 = require("./error");
 const questions_1 = require("../../utils/questions");
 const utils_1 = require("./utils");
 const error_2 = require("../../utils/error");
-let AzureStoragePlugin = class AzureStoragePlugin {
-    constructor() {
-        this.resourceType = "Azure Storage";
-        this.description = "Azure Storage";
-        this.name = constants_1.BuiltInResourcePluginNames.storage;
-    }
-    async generateResourceTemplate(ctx, inputs) {
-        return teamsfx_api_1.ok({
-            kind: "bicep",
-            template: {
-                Provision: {
-                    Orchestration: "Orchestration",
-                    Reference: {
-                        endpoint: "provisionOutputs.azureStorageOutput.value.endpoint",
-                        domain: "provisionOutputs.azureStorageOutput.value.domain",
-                    },
-                    Modules: {
-                        azureStorage: "",
-                    },
-                },
-                Parameters: {
-                    azureStorageK1: "v1",
-                },
-            },
-        });
-    }
-    async provisionResource(ctx, inputs, envInfo, tokenProvider) {
-        const config = {
-            domain: "huajie1214dev35e42dtab.z19.web.core.windows.net",
-            endpoint: "https://huajie1214dev35e42dtab.z19.web.core.windows.net",
-            storageResourceId: "/subscriptions/63f43cd3-ab63-429d-80ad-950ec8359724/resourceGroups/fullcap-dev-rg/providers/Microsoft.Storage/storageAccounts/huajie1214dev35e42dtab",
-        };
-        return teamsfx_api_1.ok(config);
-    }
-    async deploy(ctx, inputs, envInfo, tokenProvider) {
-        ctx.logProvider.info(`fx-resource-azure-storage deploy success!`);
-        return teamsfx_api_1.ok(teamsfx_api_1.Void);
-    }
-};
-AzureStoragePlugin = tslib_1.__decorate([
-    typedi_1.Service(constants_1.BuiltInResourcePluginNames.storage)
-], AzureStoragePlugin);
-exports.AzureStoragePlugin = AzureStoragePlugin;
 let AzureBotPlugin = class AzureBotPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Bot";
         this.description = "Azure Bot";
         this.name = constants_1.BuiltInResourcePluginNames.bot;
@@ -107,6 +66,7 @@ AzureBotPlugin = tslib_1.__decorate([
 exports.AzureBotPlugin = AzureBotPlugin;
 let AzureWebAppPlugin = class AzureWebAppPlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "Azure Web App";
         this.description = "Azure Web App";
         this.name = constants_1.BuiltInResourcePluginNames.webApp;
@@ -149,6 +109,7 @@ AzureWebAppPlugin = tslib_1.__decorate([
 exports.AzureWebAppPlugin = AzureWebAppPlugin;
 let SPFxResourcePlugin = class SPFxResourcePlugin {
     constructor() {
+        this.type = "resource";
         this.resourceType = "SPFx resource";
         this.description = "SPFx resource";
         this.name = constants_1.BuiltInResourcePluginNames.spfx;
@@ -164,9 +125,8 @@ SPFxResourcePlugin = tslib_1.__decorate([
 exports.SPFxResourcePlugin = SPFxResourcePlugin;
 function getAllResourcePlugins() {
     return [
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.bot),
-        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.webApp),
+        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.storage),
+        typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.aad),
     ];
 }
 async function getQuestionsForAddResource(ctx, inputs) {
@@ -194,6 +154,8 @@ async function addResource(ctx, inputs) {
         return teamsfx_api_1.err(new error_2.InvalidInputError(inputs, "inputs.resource undefined"));
     }
     const solutionSettings = ctx.projectSetting.solutionSettings;
+    const originalSettings = lodash_1.cloneDeep(solutionSettings);
+    const inputsNew = Object.assign(Object.assign({}, inputs), { existingResources: originalSettings.activeResourcePlugins });
     if (inputs.module !== undefined) {
         const module = utils_1.getModule(solutionSettings, inputs.module);
         if (module) {
@@ -215,10 +177,18 @@ async function addResource(ctx, inputs) {
     addedResourceNames.forEach((s) => allResourceNames.add(s));
     existingResourceNames.forEach((s) => allResourceNames.add(s));
     solutionSettings.activeResourcePlugins = Array.from(allResourceNames);
+    // read manifest
+    const appStudio = typedi_1.Container.get(constants_1.BuiltInResourcePluginNames.appStudio);
+    const manifestRes = await appStudio.loadManifest(ctx, inputs);
+    if (manifestRes.isErr()) {
+        return teamsfx_api_1.err(manifestRes.error);
+    }
+    const manifest = manifestRes.value;
+    const contextWithManifest = Object.assign(Object.assign({}, ctx), { appManifest: manifest });
     //call arm module to generate arm templates
     const activatedPlugins = solutionSettings.activeResourcePlugins.map((n) => typedi_1.Container.get(n));
     const addedPlugins = Array.from(addedResourceNames).map((n) => typedi_1.Container.get(n));
-    const armRes = await arm_1.default.generateArmTemplate(ctx, inputs, activatedPlugins, addedPlugins);
+    const armRes = await arm_1.default.generateArmTemplate(contextWithManifest, inputsNew, activatedPlugins, addedPlugins);
     if (armRes.isErr()) {
         return teamsfx_api_1.err(armRes.error);
     }
@@ -227,13 +197,18 @@ async function addResource(ctx, inputs) {
         const plugin = typedi_1.Container.get(pluginName);
         if (addedResourceNames.has(pluginName) && !existingResourceNames.has(pluginName)) {
             if (plugin.addResource) {
-                const res = await plugin.addResource(ctx, inputs);
+                const res = await plugin.addResource(contextWithManifest, inputsNew);
                 if (res.isErr()) {
                     return teamsfx_api_1.err(res.error);
                 }
             }
         }
     }
+    // write manifest
+    const writeRes = await appStudio.saveManifest(ctx, inputs, manifest);
+    if (writeRes.isErr()) {
+        return teamsfx_api_1.err(writeRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.addResource = addResource;

package/build/plugins/solution/fx-solution/v3/addResource.js.map

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

package/build/plugins/solution/fx-solution/v3/constants.d.ts

@@ -7,9 +7,11 @@ export declare const BuiltInResourcePluginNames: {
     appStudio: string;
     aad: string;
     bot: string;
+    function: string;
     webApp: string;
     storage: string;
     spfx: string;
+    simpleAuth: string;
 };
 export declare const BuiltInScaffoldPluginNames: {
     blazor: string;

package/build/plugins/solution/fx-solution/v3/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,eAAO,MAAM,oBAAoB;;;CAGhC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;;;CAOtC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;CAKtC,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,0BAA0B,yBAAyB,CAAC;AACjE,eAAO,MAAM,oBAAoB;;;CAGhC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;;;;;CAStC,CAAC;AACF,eAAO,MAAM,0BAA0B;;;;;CAKtC,CAAC"}

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

@@ -10,11 +10,13 @@ exports.BuiltInSolutionNames = {
 };
 exports.BuiltInResourcePluginNames = {
     appStudio: "fx-resource-appstudio",
-    aad: "fx-resource-aad",
+    aad: "fx-resource-aad-app-for-teams",
     bot: "fx-resource-bot",
+    function: "fx-resource-function",
     webApp: "fx-resource-azure-web-app",
     storage: "fx-resource-azure-storage",
     spfx: "fx-resource-spfx",
+    simpleAuth: "fx-resource-simple-auth",
 };
 exports.BuiltInScaffoldPluginNames = {
     blazor: "fx-scaffold-blazor",

package/build/plugins/solution/fx-solution/v3/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAE,kCAA0B;IACjC,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,iBAAiB;IACtB,GAAG,EAAE,iBAAiB;IACtB,MAAM,EAAE,2BAA2B;IACnC,OAAO,EAAE,2BAA2B;IACpC,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,MAAM,EAAE,oBAAoB;IAC5B,GAAG,EAAE,uBAAuB;IAC5B,IAAI,EAAE,kBAAkB;IACxB,GAAG,EAAE,iBAAiB;CACvB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,0BAA0B,GAAG,sBAAsB,CAAC;AACpD,QAAA,oBAAoB,GAAG;IAClC,KAAK,EAAE,kCAA0B;IACjC,IAAI,EAAE,kBAAkB;CACzB,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,SAAS,EAAE,uBAAuB;IAClC,GAAG,EAAE,+BAA+B;IACpC,GAAG,EAAE,iBAAiB;IACtB,QAAQ,EAAE,sBAAsB;IAChC,MAAM,EAAE,2BAA2B;IACnC,OAAO,EAAE,2BAA2B;IACpC,IAAI,EAAE,kBAAkB;IACxB,UAAU,EAAE,yBAAyB;CACtC,CAAC;AACW,QAAA,0BAA0B,GAAG;IACxC,MAAM,EAAE,oBAAoB;IAC5B,GAAG,EAAE,uBAAuB;IAC5B,IAAI,EAAE,kBAAkB;IACxB,GAAG,EAAE,iBAAiB;CACvB,CAAC"}

package/build/plugins/solution/fx-solution/v3/deploy.d.ts

@@ -1,6 +1,4 @@
 import { FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForDeploy(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<QTreeNode | undefined, FxError>>;
-export declare function deploy(ctx: v2.Context, inputs: v2.InputsWithProjectPath & {
-    modules: string[];
-}, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
+export declare function deploy(ctx: v2.Context, inputs: v3.SolutionDeployInputs, envInfo: v2.DeepReadonly<v3.EnvInfoV3>, tokenProvider: TokenProvider): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=deploy.d.ts.map

package/build/plugins/solution/fx-solution/v3/deploy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAEP,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAyBjD;AACD,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAAG;IAAE,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,EACxD,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6ChC"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/deploy.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,OAAO,EAEP,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAShC,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAyBjD;AACD,wBAAsB,MAAM,CAC1B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,oBAAoB,EAC/B,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6ChC"}

package/build/plugins/solution/fx-solution/v3/deploy.js.map

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

package/build/plugins/solution/fx-solution/v3/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAS9F,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAUjD;AAED,wBAAsB,IAAI,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAYhC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,MAAM,EAAM,SAAS,EAAE,MAAM,EAAE,EAAE,EAAM,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAWnG,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAUjD;AAED,wBAAsB,IAAI,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,GAC/B,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAmBhC"}

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

@@ -3,9 +3,11 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = exports.getQuestionsForInit = void 0;
+const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("./constants");
 const question_1 = require("../question");
+const typedi_1 = tslib_1.__importDefault(require("typedi"));
 async function getQuestionsForInit(ctx, inputs) {
     const node = new teamsfx_api_1.QTreeNode({
         name: "set-azure-solution",
@@ -19,6 +21,7 @@ async function getQuestionsForInit(ctx, inputs) {
 }
 exports.getQuestionsForInit = getQuestionsForInit;
 async function init(ctx, inputs) {
+    // 1. init solution settings
     const solutionSettings = {
         version: "3.0.0",
         name: ctx.projectSetting.solutionSettings.name,
@@ -29,6 +32,12 @@ async function init(ctx, inputs) {
         activeResourcePlugins: [],
     };
     ctx.projectSetting.solutionSettings = solutionSettings;
+    // 2. call appStudio.init() to generate manifest templates
+    const appStudio = typedi_1.default.get(constants_1.BuiltInResourcePluginNames.appStudio);
+    const initManifestRes = await appStudio.init(ctx, inputs);
+    if (initManifestRes.isErr()) {
+        return teamsfx_api_1.err(initManifestRes.error);
+    }
     return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.init = init;

package/build/plugins/solution/fx-solution/v3/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAA8F;AAC9F,2CAAmD;AACnD,0CAKqB;AAEd,KAAK,UAAU,mBAAmB,CACvC,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,qCAA0B,CAAC,QAAQ,CAAC,GAAG,gCAAoB,CAAC,KAAK,CAAC;QAC3E,CAAC;KACF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,GAAG,EAAE,WAAW,EAAE,CAAC,wBAAa,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC;IAChG,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAbD,kDAaC;AAEM,KAAK,UAAU,IAAI,CACxB,GAAe,EACf,MAAgC;IAEhC,MAAM,gBAAgB,GAA+B;QACnD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI;QAC9C,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IACF,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACvD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAfD,oBAeC"}
+{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/init.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,wDAAmG;AACnG,2CAA+E;AAC/E,0CAKqB;AACrB,4DAA+B;AAGxB,KAAK,UAAU,mBAAmB,CACvC,GAAe,EACf,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC;QACzB,IAAI,EAAE,oBAAoB;QAC1B,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,CAAC,MAAc,EAAE,EAAE;YACvB,MAAM,CAAC,qCAA0B,CAAC,QAAQ,CAAC,GAAG,gCAAoB,CAAC,KAAK,CAAC;QAC3E,CAAC;KACF,CAAC,CAAC;IACH,IAAI,CAAC,SAAS,GAAG,EAAE,WAAW,EAAE,CAAC,wBAAa,CAAC,EAAE,EAAE,wBAAa,CAAC,EAAE,EAAE,+BAAoB,CAAC,EAAE,CAAC,EAAE,CAAC;IAChG,OAAO,gBAAE,CAAC,IAAI,CAAC,CAAC;AAClB,CAAC;AAbD,kDAaC;AAEM,KAAK,UAAU,IAAI,CACxB,GAAe,EACf,MAAgC;IAEhC,4BAA4B;IAC5B,MAAM,gBAAgB,GAA+B;QACnD,OAAO,EAAE,OAAO;QAChB,IAAI,EAAE,GAAG,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI;QAC9C,YAAY,EAAE,EAAE;QAChB,QAAQ,EAAE,OAAO;QACjB,cAAc,EAAE,EAAE;QAClB,OAAO,EAAE,EAAE;QACX,qBAAqB,EAAE,EAAE;KAC1B,CAAC;IACF,GAAG,CAAC,cAAc,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;IACvD,0DAA0D;IAC1D,MAAM,SAAS,GAAG,gBAAS,CAAC,GAAG,CAAoB,sCAA0B,CAAC,SAAS,CAAC,CAAC;IACzF,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1D,IAAI,eAAe,CAAC,KAAK,EAAE,EAAE;QAC3B,OAAO,iBAAG,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;KACnC;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AAtBD,oBAsBC"}

package/build/plugins/solution/fx-solution/v3/provision.d.ts

@@ -1,4 +1,11 @@
-import { FxError, QTreeNode, Result, TokenProvider, v2, v3 } from "@microsoft/teamsfx-api";
+import { AppStudioTokenProvider, AzureAccountProvider, FxError, QTreeNode, Result, TokenProvider, v2, v3, Void } from "@microsoft/teamsfx-api";
 export declare function getQuestionsForProvision(ctx: v2.Context, inputs: v2.InputsWithProjectPath, tokenProvider: TokenProvider, envInfo?: v2.DeepReadonly<v3.EnvInfoV3>): Promise<Result<QTreeNode | undefined, FxError>>;
 export declare function provisionResources(ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: v3.EnvInfoV3, tokenProvider: TokenProvider): Promise<Result<v3.EnvInfoV3, FxError>>;
+/**
+ * make sure subscription is correct
+ *
+ */
+export declare function checkAzureSubscription(ctx: v2.Context, envInfo: v3.EnvInfoV3, azureAccountProvider: AzureAccountProvider): Promise<Result<Void, FxError>>;
+export declare function askForProvisionConsent(ctx: v2.Context, azureAccountProvider: AzureAccountProvider, envInfo: v3.EnvInfoV3): Promise<Result<Void, FxError>>;
+export declare function getM365TenantId(appStudioTokenProvider: AppStudioTokenProvider): Promise<Result<string, FxError>>;
 //# sourceMappingURL=provision.d.ts.map

package/build/plugins/solution/fx-solution/v3/provision.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,SAAS,EAAE,MAAM,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAUpG,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CA2HxC"}
+{"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v3/provision.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EAIpB,OAAO,EAEP,SAAS,EACT,MAAM,EAEN,aAAa,EAEb,EAAE,EACF,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAoBhC,wBAAsB,wBAAwB,CAC5C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,aAAa,EAAE,aAAa,EAC5B,OAAO,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,GACtC,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAmBjD;AACD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,EAAE,CAAC,qBAAqB,EAChC,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAuKxC;AAED;;;GAGG;AACH,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,oBAAoB,EAAE,oBAAoB,GACzC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA4ChC;AA6JD,wBAAsB,sBAAsB,CAC1C,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,oBAAoB,EAAE,oBAAoB,EAC1C,OAAO,EAAE,EAAE,CAAC,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA6BhC;AAED,wBAAsB,eAAe,CACnC,sBAAsB,EAAE,sBAAsB,GAC7C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CA0BlC"}

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

@@ -2,17 +2,23 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.provisionResources = exports.getQuestionsForProvision = void 0;
+exports.getM365TenantId = exports.askForProvisionConsent = exports.checkAzureSubscription = exports.provisionResources = exports.getQuestionsForProvision = void 0;
 const tslib_1 = require("tslib");
+const arm_resources_1 = require("@azure/arm-resources");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const lodash_1 = require("lodash");
 const typedi_1 = require("typedi");
 const util = tslib_1.__importStar(require("util"));
+const uuid_1 = require("uuid");
 const constants_1 = require("../../../../common/constants");
+const telemetry_1 = require("../../../../common/telemetry");
 const tools_1 = require("../../../../common/tools");
 const arm_1 = tslib_1.__importDefault(require("../arm"));
+const constants_2 = require("../constants");
+const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
 const executor_1 = require("../v2/executor");
-const utils_1 = require("../v2/utils");
+const constants_3 = require("./constants");
+const solutionGlobalVars_1 = require("./solutionGlobalVars");
 async function getQuestionsForProvision(ctx, inputs, tokenProvider, envInfo) {
     const solutionSetting = ctx.projectSetting.solutionSettings;
     const root = new teamsfx_api_1.QTreeNode({ type: "group" });
@@ -35,13 +41,44 @@ async function getQuestionsForProvision(ctx, inputs, tokenProvider, envInfo) {
 }
 exports.getQuestionsForProvision = getQuestionsForProvision;
 async function provisionResources(ctx, inputs, envInfo, tokenProvider) {
-    // Just to trigger M365 login before the concurrent execution of provision.
-    // await tokenProvider.appStudioToken.getAccessToken();
-    // 1. check AAD permission request
-    // 2. ask common question and fill in solution config
-    // 3. ask for provision consent
-    // 4. collect plugins
     const solutionSetting = ctx.projectSetting.solutionSettings;
+    // check M365 tenant match
+    const appResource = envInfo.state[constants_3.BuiltInResourcePluginNames.appStudio];
+    const tenantIdInConfig = appResource.tenantId;
+    const tenantIdInTokenRes = await 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_2.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) {
+        appResource.tenantId = tenantIdInToken;
+    }
+    //TODO teams app provision, return app id
+    // call appStudio.provision()
+    appResource.teamsAppId = "fake-remote-teams-app-id";
+    solutionGlobalVars_1.solutionGlobalVars.TeamsAppId = "fake-remote-teams-app-id";
+    // ask common question and fill in solution config
+    const solutionConfigRes = await fillInAzureSolutionConfigs(ctx, inputs, envInfo, tokenProvider);
+    if (solutionConfigRes.isErr()) {
+        return teamsfx_api_1.err(solutionConfigRes.error);
+    }
+    // ask for provision consent
+    const consentResult = await askForProvisionConsent(ctx, tokenProvider.azureAccountProvider, envInfo);
+    if (consentResult.isErr()) {
+        return teamsfx_api_1.err(consentResult.error);
+    }
+    // create resource group if needed
+    const solutionConfig = envInfo.state.solution;
+    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);
+        }
+    }
+    // collect plugins and provisionResources
     const plugins = solutionSetting.activeResourcePlugins.map((p) => typedi_1.Container.get(p));
     const provisionThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
@@ -58,26 +95,21 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider) {
             },
         };
     });
-    // call provisionResources and collect outputs
     ctx.logProvider.info(util.format(tools_1.getStrings().solution.ProvisionStartNotice, constants_1.PluginDisplayName.Solution));
     const provisionResult = await executor_1.executeConcurrently(provisionThunks, ctx.logProvider);
     if (provisionResult.kind === "failure" || provisionResult.kind === "partialSuccess") {
         return teamsfx_api_1.err(provisionResult.error);
     }
-    else {
-        const update = utils_1.combineRecords(provisionResult.output);
-        lodash_1.assign(envInfo.state, update);
-    }
     ctx.logProvider.info(util.format(tools_1.getStrings().solution.ProvisionFinishNotice, constants_1.PluginDisplayName.Solution));
     ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployArmTemplates.StartNotice, constants_1.PluginDisplayName.Solution));
-    //uncomment the following lines when resource plugin is ready.
     const armRes = await arm_1.default.deployArmTemplates(ctx, inputs, envInfo, tokenProvider.azureAccountProvider);
     if (armRes.isErr()) {
         return teamsfx_api_1.err(armRes.error);
     }
     ctx.logProvider.info(util.format(tools_1.getStrings().solution.DeployArmTemplates.SuccessNotice, constants_1.PluginDisplayName.Solution));
-    // call aad.setApplicationInContext
+    // TODO call aad.setApplicationInContext
     ctx.logProvider.info(util.format("AAD.setApplicationInContext", constants_1.PluginDisplayName.Solution));
+    // collect plugins and call configureResource
     const configureResourceThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.configureResource))
         .map((plugin) => {
@@ -92,7 +124,6 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider) {
             plugin.configureResource(ctx, inputs, envInfo, tokenProvider),
         };
     });
-    //call configResource
     const configureResourceResult = await executor_1.executeConcurrently(configureResourceThunks, ctx.logProvider);
     ctx.logProvider.info(util.format(tools_1.getStrings().solution.ConfigurationFinishNotice, constants_1.PluginDisplayName.Solution));
     const envStates = envInfo.state;
@@ -121,4 +152,181 @@ async function provisionResources(ctx, inputs, envInfo, tokenProvider) {
     return teamsfx_api_1.ok(envInfo);
 }
 exports.provisionResources = provisionResources;
+/**
+ * make sure subscription is correct
+ *
+ */
+async function checkAzureSubscription(ctx, envInfo, azureAccountProvider) {
+    var _a;
+    const state = envInfo.state;
+    const subscriptionId = ((_a = envInfo.config.azure) === null || _a === void 0 ? void 0 : _a.subscriptionId) || state.solution.subscriptionId;
+    if (!subscriptionId) {
+        const askSubRes = await azureAccountProvider.getSelectedSubscription(true);
+        if (askSubRes)
+            return teamsfx_api_1.ok(askSubRes);
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.SubscriptionNotFound, "Failed to select subscription", constants_2.SolutionSource));
+    }
+    let subscriptionName = state.solution.subscriptionName;
+    if (subscriptionName.length > 0) {
+        subscriptionName = `(${subscriptionName})`;
+    }
+    // make sure the user is logged in
+    await azureAccountProvider.getAccountCredentialAsync(true);
+    // verify valid subscription (permission)
+    const subscriptions = await azureAccountProvider.listSubscriptions();
+    const targetSubInfo = subscriptions.find((item) => item.subscriptionId === subscriptionId);
+    if (!targetSubInfo) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.SubscriptionNotFound, `The subscription '${subscriptionId}'${subscriptionName} for '${envInfo.envName}' environment is not found in the current account, please use the right Azure account or check the '${teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, envInfo.envName)}' file.`, constants_2.SolutionSource));
+    }
+    state.solution.subscriptionId = targetSubInfo.subscriptionId;
+    state.solution.subscriptionName = targetSubInfo.subscriptionName;
+    state.solution.tenantId = targetSubInfo.tenantId;
+    ctx.logProvider.info(`[${constants_1.PluginDisplayName.Solution}] check subscriptionId pass!`);
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.checkAzureSubscription = checkAzureSubscription;
+/**
+ * Asks common questions and puts the answers in the global namespace of SolutionConfig
+ *
+ */
+async function fillInAzureSolutionConfigs(ctx, inputs, envInfo, tokenProvider) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    //1. check subscriptionId
+    const subscriptionResult = await checkAzureSubscription(ctx, envInfo, tokenProvider.azureAccountProvider);
+    if (subscriptionResult.isErr()) {
+        return teamsfx_api_1.err(subscriptionResult.error);
+    }
+    // Note setSubscription here will change the token returned by getAccountCredentialAsync according to the subscription selected.
+    // So getting azureToken needs to precede setSubscription.
+    const azureToken = await tokenProvider.azureAccountProvider.getAccountCredentialAsync();
+    if (azureToken === undefined) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.NotLoginToAzure, "Login to Azure using the Azure Account extension", constants_2.SolutionSource));
+    }
+    //2. check resource group
+    (_a = ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckResourceGroupStart, inputs.env ? { [telemetry_1.TelemetryProperty.Env]: tools_1.getHashedEnv(inputs.env) } : {});
+    const rmClient = new arm_resources_1.ResourceManagementClient(azureToken, envInfo.state.solution.subscriptionId);
+    // Resource group info precedence are:
+    //   1. ctx.answers, for CLI --resource-group argument, only support existing resource group
+    //   2. env config (config.{envName}.json), for user customization, only support existing resource group
+    //   3. states (state.{envName}.json), for re-provision
+    //   4. asking user with a popup
+    const resourceGroupNameFromEnvConfig = (_b = envInfo.config.azure) === null || _b === void 0 ? void 0 : _b.resourceGroupName;
+    const resourceGroupNameFromState = envInfo.state.solution.resourceGroupName;
+    const resourceGroupLocationFromState = envInfo.state.solution.location;
+    const appName = ctx.projectSetting.appName;
+    const defaultResourceGroupName = `${appName.replace(" ", "_")}${"-" + envInfo.envName}-rg`;
+    let resourceGroupInfo;
+    const telemetryProperties = {};
+    if (inputs.env) {
+        telemetryProperties[telemetry_1.TelemetryProperty.Env] = tools_1.getHashedEnv(inputs.env);
+    }
+    if (inputs.targetResourceGroupName) {
+        const getRes = await ResourceGroupHelper_1.resourceGroupHelper.getResourceGroupInfo(inputs.targetResourceGroupName, rmClient);
+        if (getRes.isErr())
+            return teamsfx_api_1.err(getRes.error);
+        if (!getRes.value) {
+            // Currently we do not support creating resource group from command line arguments
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.ResourceGroupNotFound, `Resource group '${inputs.targetResourceGroupName}' does not exist, please specify an existing resource group.`, constants_2.SolutionSource));
+        }
+        telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
+            telemetry_1.CustomizeResourceGroupType.CommandLine;
+        resourceGroupInfo = getRes.value;
+    }
+    else if (resourceGroupNameFromEnvConfig) {
+        const resourceGroupName = resourceGroupNameFromEnvConfig;
+        const getRes = await ResourceGroupHelper_1.resourceGroupHelper.getResourceGroupInfo(resourceGroupName, rmClient);
+        if (getRes.isErr())
+            return teamsfx_api_1.err(getRes.error);
+        if (!getRes.value) {
+            // Currently we do not support creating resource group by input config, so just throw an error.
+            const envFile = teamsfx_api_1.EnvConfigFileNameTemplate.replace(teamsfx_api_1.EnvNamePlaceholder, inputs.envName);
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError(constants_2.SolutionError.ResourceGroupNotFound, `Resource group '${resourceGroupName}' does not exist, please check your '${envFile}' file.`, constants_2.SolutionSource));
+        }
+        telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
+            telemetry_1.CustomizeResourceGroupType.EnvConfig;
+        resourceGroupInfo = getRes.value;
+    }
+    else if (resourceGroupNameFromState && resourceGroupLocationFromState) {
+        const checkRes = await ResourceGroupHelper_1.resourceGroupHelper.checkResourceGroupExistence(resourceGroupNameFromState, rmClient);
+        if (checkRes.isErr()) {
+            return teamsfx_api_1.err(checkRes.error);
+        }
+        const exist = checkRes.value;
+        resourceGroupInfo = {
+            createNewResourceGroup: !exist,
+            name: resourceGroupNameFromState,
+            location: resourceGroupLocationFromState,
+        };
+        telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
+            telemetry_1.CustomizeResourceGroupType.EnvState;
+    }
+    else {
+        const resourceGroupInfoResult = await ResourceGroupHelper_1.resourceGroupHelper.askResourceGroupInfo(ctx, inputs, tokenProvider.azureAccountProvider, rmClient, defaultResourceGroupName);
+        if (resourceGroupInfoResult.isErr()) {
+            return teamsfx_api_1.err(resourceGroupInfoResult.error);
+        }
+        resourceGroupInfo = resourceGroupInfoResult.value;
+        if (resourceGroupInfo.createNewResourceGroup) {
+            if (resourceGroupInfo.name === defaultResourceGroupName) {
+                telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
+                    telemetry_1.CustomizeResourceGroupType.InteractiveCreateDefault;
+            }
+            else {
+                telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
+                    telemetry_1.CustomizeResourceGroupType.InteractiveCreateCustomized;
+            }
+        }
+        else {
+            telemetryProperties[telemetry_1.TelemetryProperty.CustomizeResourceGroupType] =
+                telemetry_1.CustomizeResourceGroupType.InteractiveUseExisting;
+        }
+    }
+    (_c = ctx.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(telemetry_1.TelemetryEvent.CheckResourceGroup, telemetryProperties);
+    envInfo.state.solution.needCreateResourceGroup = resourceGroupInfo.createNewResourceGroup;
+    envInfo.state.solution.resourceGroupName = resourceGroupInfo.name;
+    envInfo.state.solution.location = resourceGroupInfo.location;
+    (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(`[${constants_1.PluginDisplayName.Solution}] check resource group pass!`);
+    (_e = ctx.logProvider) === null || _e === void 0 ? void 0 : _e.info(`[${constants_1.PluginDisplayName.Solution}] check teamsAppTenantId pass!`);
+    //resourceNameSuffix
+    const resourceNameSuffix = ((_f = envInfo.config.azure) === null || _f === void 0 ? void 0 : _f.resourceNameSuffix) ||
+        envInfo.state.solution.resourceNameSuffix ||
+        uuid_1.v4().substr(0, 6);
+    envInfo.state.solution.resourceNameSuffix = resourceNameSuffix;
+    (_g = ctx.logProvider) === null || _g === void 0 ? void 0 : _g.info(`[${constants_1.PluginDisplayName.Solution}] check resourceNameSuffix pass!`);
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+async function askForProvisionConsent(ctx, azureAccountProvider, envInfo) {
+    const azureToken = await azureAccountProvider.getAccountCredentialAsync();
+    // Only Azure project requires this confirm dialog
+    const username = azureToken.username || "";
+    const subscriptionId = envInfo.state.solution.subscriptionId;
+    const subscriptionName = envInfo.state.solution.subscriptionName;
+    const msgNew = util.format(tools_1.getStrings().solution.ProvisionConfirmEnvNotice, envInfo.envName, username, subscriptionName ? subscriptionName : subscriptionId);
+    const confirmRes = await ctx.userInteraction.showMessage("warn", msgNew, true, "Provision");
+    const confirm = (confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) ? confirmRes.value : undefined;
+    if (confirm !== "Provision") {
+        if (confirm === "Pricing calculator") {
+            ctx.userInteraction.openUrl("https://azure.microsoft.com/en-us/pricing/calculator/");
+        }
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError(tools_1.getStrings().solution.CancelProvision, tools_1.getStrings().solution.CancelProvision, constants_2.SolutionSource));
+    }
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+}
+exports.askForProvisionConsent = askForProvisionConsent;
+async function getM365TenantId(appStudioTokenProvider) {
+    // Just to trigger M365 login before the concurrent execution of localDebug.
+    // Because concurrent execution of localDebug may getAccessToken() concurrently, which
+    // causes 2 M365 logins before the token caching in common lib takes effect.
+    await appStudioTokenProvider.getAccessToken();
+    const appstudioTokenJson = await appStudioTokenProvider.getJsonObject();
+    if (appstudioTokenJson === undefined) {
+        return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionError.NoAppStudioToken, "Graph token json is undefined", constants_2.SolutionSource));
+    }
+    const tenantIdInToken = appstudioTokenJson.tid;
+    if (!tenantIdInToken) {
+        return teamsfx_api_1.err(new teamsfx_api_1.SystemError(constants_2.SolutionError.NoTeamsAppTenantId, "Cannot find Teams app tenant id", constants_2.SolutionSource));
+    }
+    return teamsfx_api_1.ok(tenantIdInToken);
+}
+exports.getM365TenantId = getM365TenantId;
 //# sourceMappingURL=provision.js.map