@microsoft/teamsfx-core 1.2.1 → 1.2.2-alpha.096c8289.0

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

@@ -11,6 +11,7 @@ const localSettingsProvider_1 = require("../../../../common/localSettingsProvide
 const projectSettingsHelper_1 = require("../../../../common/local/projectSettingsHelper");
 const Launch = tslib_1.__importStar(require("./util/launch"));
 const Tasks = tslib_1.__importStar(require("./util/tasks"));
+const TasksNext = tslib_1.__importStar(require("./util/tasksNext"));
 const Settings = tslib_1.__importStar(require("./util/settings"));
 const telemetry_1 = require("./util/telemetry");
 const error_1 = require("./error");
@@ -23,7 +24,8 @@ async function scaffoldLocalDebugSettingsV1(ctx) {
     if (!ctx.projectSettings || !ctx.answers || !ctx.telemetryReporter || !ctx.logProvider) {
         return teamsfx_api_1.err(error_1.ScaffoldLocalDebugSettingsV1Error());
     }
-    return await _scaffoldLocalDebugSettings(ctx.projectSettings, ctx.answers, ctx.telemetryReporter, ctx.logProvider, ctx.cryptoProvider);
+    await _scaffoldLocalDebugSettings(ctx.projectSettings, ctx.answers, ctx.telemetryReporter, ctx.logProvider, ctx.cryptoProvider);
+    return teamsfx_api_1.ok(teamsfx_api_1.Void);
 }
 exports.scaffoldLocalDebugSettingsV1 = scaffoldLocalDebugSettingsV1;
 async function _scaffoldLocalDebugSettings(projectSetting, inputs, telemetryReporter, logProvider, cryptoProvider, localSettings) {
@@ -82,7 +84,9 @@ async function _scaffoldLocalDebugSettings(projectSetting, inputs, telemetryRepo
             else {
                 const launchConfigurations = Launch.generateConfigurations(includeFrontend, includeBackend, includeBot, isMigrateFromV1);
                 const launchCompounds = Launch.generateCompounds(includeFrontend, includeBackend, includeBot);
-                const tasks = Tasks.generateTasks(includeFrontend, includeBackend, includeBot, includeSimpleAuth, isMigrateFromV1, programmingLanguage);
+                const tasks = !isMigrateFromV1 && (await useNewTasks(inputs.projectPath))
+                    ? TasksNext.generateTasks(includeFrontend, includeBackend, includeBot, programmingLanguage)
+                    : Tasks.generateTasks(includeFrontend, includeBackend, includeBot, includeSimpleAuth, isMigrateFromV1, programmingLanguage);
                 //TODO: save files via context api
                 await fs.ensureDir(`${inputs.projectPath}/.vscode/`);
                 await fs.writeJSON(`${inputs.projectPath}/.vscode/launch.json`, {
@@ -101,7 +105,7 @@ async function _scaffoldLocalDebugSettings(projectSetting, inputs, telemetryRepo
                     EOL: os.EOL,
                 });
                 // generate localSettings.json
-                await scaffoldLocalSettingsJson(projectSetting, inputs, cryptoProvider, localSettings);
+                localSettings = await scaffoldLocalSettingsJson(projectSetting, inputs, cryptoProvider, localSettings);
                 // add 'npm install' scripts into root package.json
                 const packageJsonPath = inputs.projectPath;
                 let packageJson = undefined;
@@ -143,7 +147,7 @@ async function _scaffoldLocalDebugSettings(projectSetting, inputs, telemetryRepo
         return teamsfx_api_1.err(systemError);
     }
     telemetry_1.TelemetryUtils.sendSuccessEvent(telemetry_1.TelemetryEventName.scaffoldLocalDebugSettings, telemetryProperties);
-    return teamsfx_api_1.ok(teamsfx_api_1.Void);
+    return teamsfx_api_1.ok(localSettings);
 }
 exports._scaffoldLocalDebugSettings = _scaffoldLocalDebugSettings;
 async function scaffoldLocalSettingsJson(projectSetting, inputs, cryptoProvider, localSettings) {
@@ -161,5 +165,20 @@ async function scaffoldLocalSettingsJson(projectSetting, inputs, cryptoProvider,
         localSettings = localSettingsProvider.initV2(includeFrontend, includeBackend, includeBot);
         await localSettingsProvider.saveJson(localSettings, cryptoProvider);
     }
+    return localSettings;
+}
+async function useNewTasks(projectPath) {
+    // for new project or project with "validate-local-prerequisites", use new tasks content
+    const tasksJsonPath = `${projectPath}/.vscode/tasks.json`;
+    if (await fs.pathExists(tasksJsonPath)) {
+        try {
+            const tasksContent = await fs.readFile(tasksJsonPath, "utf-8");
+            return tasksContent.includes("fx-extension.validate-local-prerequisites");
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    return true;
 }
 //# sourceMappingURL=scaffolding.js.map

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

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

package/build/plugins/solution/fx-solution/debug/util/tasks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasks.ts"],"names":[],"mappings":"AAOA,wBAAgB,aAAa,CAC3B,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,OAAO,EACpB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA0C3B;AAED,wBAAgB,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAU1D;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAuE7D"}
+{"version":3,"file":"tasks.d.ts","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasks.ts"],"names":[],"mappings":"AAQA,wBAAgB,aAAa,CAC3B,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,OAAO,EACnB,WAAW,EAAE,OAAO,EACpB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CA0C3B;AAED,wBAAgB,cAAc,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAU1D;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAuE7D"}

package/build/plugins/solution/fx-solution/debug/util/tasks.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSpfxTasks = exports.generateInputs = exports.generateTasks = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../../../../../common/local/constants");
+//TODO: retire this after fully moved to new tasks with "validate-local-prerequisites" and "npm run dev:teamsfx"
 function generateTasks(includeFrontend, includeBackend, includeBot, includeAuth, isMigrateFromV1, programmingLanguage) {
     /**
      * Referenced by launch.json
@@ -202,10 +203,7 @@ function startBot() {
 function startNgrok() {
     return {
         label: "start ngrok",
-        type: teamsfx_api_1.ProductName,
-        command: "ngrok start",
-        isBackground: true,
-        dependsOn: ["bot npm install"],
+        dependsOn: ["bot npm install", `${teamsfx_api_1.ProductName}: ngrok start`],
     };
 }
 function frontendNpmInstall() {

package/build/plugins/solution/fx-solution/debug/util/tasks.js.map

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

package/build/plugins/solution/fx-solution/debug/util/tasksNext.d.ts

@@ -0,0 +1,2 @@
+export declare function generateTasks(includeFrontend: boolean, includeBackend: boolean, includeBot: boolean, programmingLanguage: string): Record<string, unknown>[];
+//# sourceMappingURL=tasksNext.d.ts.map

package/build/plugins/solution/fx-solution/debug/util/tasksNext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tasksNext.d.ts","sourceRoot":"","sources":["../../../../../../src/plugins/solution/fx-solution/debug/util/tasksNext.ts"],"names":[],"mappings":"AAQA,wBAAgB,aAAa,CAC3B,eAAe,EAAE,OAAO,EACxB,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,OAAO,EACnB,mBAAmB,EAAE,MAAM,GAC1B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAuC3B"}

package/build/plugins/solution/fx-solution/debug/util/tasksNext.js

@@ -0,0 +1,145 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateTasks = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const constants_1 = require("../../../../../common/local/constants");
+// TODO: add spfx tasks with "validate-local-prerequisites"
+function generateTasks(includeFrontend, includeBackend, includeBot, programmingLanguage) {
+    /**
+     * Referenced by launch.json
+     *   - Pre Debug Check
+     *   - Start Frontend
+     *   - Start Backend
+     *   - Start Bot
+     *
+     * Referenced inside tasks.json
+     *   - validate local prerequisites
+     *   - start ngrok
+     *   - prepare local environment
+     */
+    const tasks = [
+        preDebugCheck(includeBot),
+        validateLocalPrerequisites(),
+    ];
+    if (includeBot) {
+        tasks.push(startNgrok());
+    }
+    tasks.push(prepareLocalEnvironment());
+    if (includeFrontend) {
+        tasks.push(startFrontend());
+        if (includeBackend) {
+            tasks.push(startBackend(programmingLanguage));
+            if (programmingLanguage === constants_1.ProgrammingLanguage.typescript) {
+                tasks.push(watchBackend());
+            }
+        }
+    }
+    if (includeBot) {
+        tasks.push(startBot(includeFrontend));
+    }
+    return tasks;
+}
+exports.generateTasks = generateTasks;
+function preDebugCheck(includeBot) {
+    return {
+        label: "Pre Debug Check",
+        dependsOn: includeBot
+            ? ["validate local prerequisites", "start ngrok", "prepare local environment"]
+            : ["validate local prerequisites", "prepare local environment"],
+        dependsOrder: "sequence",
+    };
+}
+function validateLocalPrerequisites() {
+    return {
+        label: "validate local prerequisites",
+        type: "shell",
+        command: "exit ${command:fx-extension.validate-local-prerequisites}",
+        presentation: {
+            reveal: "never",
+        },
+    };
+}
+function prepareLocalEnvironment() {
+    return {
+        label: "prepare local environment",
+        type: "shell",
+        command: "exit ${command:fx-extension.pre-debug-check}",
+        presentation: {
+            reveal: "never",
+        },
+    };
+}
+function startFrontend() {
+    return {
+        label: "Start Frontend",
+        type: "shell",
+        command: "npm run dev:teamsfx",
+        isBackground: true,
+        problemMatcher: "$teamsfx-frontend-watch",
+        options: {
+            cwd: "${workspaceFolder}/tabs",
+        },
+    };
+}
+function startBackend(programmingLanguage) {
+    const result = {
+        label: "Start Backend",
+        type: "shell",
+        command: "npm run dev:teamsfx",
+        isBackground: true,
+        problemMatcher: "$teamsfx-backend-watch",
+        options: {
+            cwd: "${workspaceFolder}/api",
+            env: {
+                PATH: "${env:PATH}${command:fx-extension.get-func-path}",
+            },
+        },
+        presentation: {
+            reveal: "silent",
+        },
+    };
+    if (programmingLanguage === constants_1.ProgrammingLanguage.typescript) {
+        result.dependsOn = "Watch Backend";
+    }
+    return result;
+}
+function watchBackend() {
+    return {
+        label: "Watch Backend",
+        type: "shell",
+        command: "npm run watch:teamsfx",
+        isBackground: true,
+        problemMatcher: "$tsc-watch",
+        options: {
+            cwd: "${workspaceFolder}/api",
+        },
+        presentation: {
+            reveal: "silent",
+        },
+    };
+}
+function startBot(includeFrontend) {
+    const result = {
+        label: "Start Bot",
+        type: "shell",
+        command: "npm run dev:teamsfx",
+        isBackground: true,
+        problemMatcher: "$teamsfx-bot-watch",
+        options: {
+            cwd: "${workspaceFolder}/bot",
+        },
+    };
+    if (includeFrontend) {
+        result.presentation = { reveal: "silent" };
+    }
+    return result;
+}
+function startNgrok() {
+    return {
+        label: "start ngrok",
+        dependsOn: `${teamsfx_api_1.ProductName}: ngrok start`,
+    };
+}
+//# sourceMappingURL=tasksNext.js.map

package/build/plugins/solution/fx-solution/debug/util/tasksNext.js.map

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

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

@@ -26,9 +26,9 @@ export declare function createCapabilityQuestion(): MultiSelectQuestion;
 export declare function createV1CapabilityQuestion(): SingleSelectQuestion;
 export declare const FrontendHostTypeQuestion: SingleSelectQuestion;
 export declare const AzureResourcesQuestion: MultiSelectQuestion;
-export declare function createAddAzureResourceQuestion(alreadyHaveFunction: boolean, alreadhHaveSQL: boolean, alreadyHaveAPIM: boolean, alreadyHavekeyVault: boolean): MultiSelectQuestion;
+export declare function createAddAzureResourceQuestion(alreadyHaveFunction: boolean, alreadyHaveSQL: boolean, alreadyHaveAPIM: boolean, alreadyHaveKeyVault: boolean): MultiSelectQuestion;
 export declare function addCapabilityQuestion(alreadyHaveTab: boolean, alreadyHaveBot: boolean): MultiSelectQuestion;
 export declare const DeployPluginSelectQuestion: MultiSelectQuestion;
 export declare const AskSubscriptionQuestion: FuncQuestion;
-export declare const GetUserEmailQuestion: TextInputQuestion;
+export declare function getUserEmailQuestion(currentUserEmail: string): TextInputQuestion;
 //# sourceMappingURL=question.d.ts.map

package/build/plugins/solution/fx-solution/question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEZ,mBAAmB,EAEnB,UAAU,EAEV,oBAAoB,EAEpB,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,aAAa,EAAE,UAM3B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAM3B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,UAMlC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,UAMzB,CAAC;AAEF,oBAAY,0BAA0B;IACpC,YAAY,iBAAiB;IAC7B,YAAY,kBAAkB;IAC9B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,cAAc,oBAAoB;IAClC,qBAAqB,kBAAkB;IACvC,YAAY,wBAAwB;IACpC,OAAO,aAAa;IACpB,MAAM,iBAAiB;IACvB,mBAAmB,yBAAyB;IAC5C,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAGnC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAI/B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,mBAAmB,CAwC9D;AAED,wBAAgB,0BAA0B,IAAI,oBAAoB,CAUjE;AAED,eAAO,MAAM,wBAAwB,EAAE,oBAsBtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,mBAgBpC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,mBAAmB,EAAE,OAAO,EAC5B,cAAc,EAAE,OAAO,EACvB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAuBrB;AAED,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,EACvB,cAAc,EAAE,OAAO,GACtB,mBAAmB,CAcrB;AAED,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,YAMrC,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,iBAiBlC,CAAC"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEZ,mBAAmB,EAEnB,UAAU,EAEV,oBAAoB,EAEpB,iBAAiB,EAElB,MAAM,wBAAwB,CAAC;AAGhC,eAAO,MAAM,aAAa,EAAE,UAM3B,CAAC;AAEF,eAAO,MAAM,aAAa,EAAE,UAM3B,CAAC;AAEF,eAAO,MAAM,oBAAoB,EAAE,UAMlC,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,UAMzB,CAAC;AAEF,oBAAY,0BAA0B;IACpC,YAAY,iBAAiB;IAC7B,YAAY,kBAAkB;IAC9B,SAAS,eAAe;IACxB,QAAQ,cAAc;IACtB,cAAc,oBAAoB;IAClC,qBAAqB,kBAAkB;IACvC,YAAY,wBAAwB;IACpC,OAAO,aAAa;IACpB,MAAM,iBAAiB;IACvB,mBAAmB,yBAAyB;IAC5C,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAGnC,CAAC;AAEF,eAAO,MAAM,iBAAiB,EAAE,UAI/B,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,UAInC,CAAC;AAEF,wBAAgB,wBAAwB,IAAI,mBAAmB,CAwC9D;AAED,wBAAgB,0BAA0B,IAAI,oBAAoB,CAUjE;AAED,eAAO,MAAM,wBAAwB,EAAE,oBAsBtC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,mBAgBpC,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,mBAAmB,EAAE,OAAO,EAC5B,cAAc,EAAE,OAAO,EACvB,eAAe,EAAE,OAAO,EACxB,mBAAmB,EAAE,OAAO,GAC3B,mBAAmB,CAsBrB;AAED,wBAAgB,qBAAqB,CACnC,cAAc,EAAE,OAAO,EACvB,cAAc,EAAE,OAAO,GACtB,mBAAmB,CAcrB;AAED,eAAO,MAAM,0BAA0B,EAAE,mBAOxC,CAAC;AAEF,eAAO,MAAM,uBAAuB,EAAE,YAMrC,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,gBAAgB,EAAE,MAAM,GAAG,iBAAiB,CA8BhF"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetUserEmailQuestion = exports.AskSubscriptionQuestion = exports.DeployPluginSelectQuestion = exports.addCapabilityQuestion = exports.createAddAzureResourceQuestion = exports.AzureResourcesQuestion = exports.FrontendHostTypeQuestion = exports.createV1CapabilityQuestion = exports.createCapabilityQuestion = exports.AzureResourceKeyVault = exports.AzureResourceApim = exports.AzureResourceFunction = exports.AzureResourceSQL = exports.HostTypeOptionSPFx = exports.HostTypeOptionAzure = exports.AzureSolutionQuestionNames = exports.TabSPFxItem = exports.MessageExtensionItem = exports.BotOptionItem = exports.TabOptionItem = void 0;
+exports.getUserEmailQuestion = exports.AskSubscriptionQuestion = exports.DeployPluginSelectQuestion = exports.addCapabilityQuestion = exports.createAddAzureResourceQuestion = exports.AzureResourcesQuestion = exports.FrontendHostTypeQuestion = exports.createV1CapabilityQuestion = exports.createCapabilityQuestion = exports.AzureResourceKeyVault = exports.AzureResourceApim = exports.AzureResourceFunction = exports.AzureResourceSQL = exports.HostTypeOptionSPFx = exports.HostTypeOptionAzure = exports.AzureSolutionQuestionNames = exports.TabSPFxItem = exports.MessageExtensionItem = exports.BotOptionItem = exports.TabOptionItem = void 0;
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
@@ -158,13 +158,11 @@ exports.AzureResourcesQuestion = {
     },
     placeholder: "Select a resource (optional)",
 };
-function createAddAzureResourceQuestion(alreadyHaveFunction, alreadhHaveSQL, alreadyHaveAPIM, alreadyHavekeyVault) {
-    const options = [exports.AzureResourceFunction];
-    if (!alreadhHaveSQL)
-        options.push(exports.AzureResourceSQL);
+function createAddAzureResourceQuestion(alreadyHaveFunction, alreadyHaveSQL, alreadyHaveAPIM, alreadyHaveKeyVault) {
+    const options = [exports.AzureResourceFunction, exports.AzureResourceSQL];
     if (!alreadyHaveAPIM)
         options.push(exports.AzureResourceApim);
-    if (!alreadyHavekeyVault)
+    if (!alreadyHaveKeyVault)
         options.push(exports.AzureResourceKeyVault);
     return {
         name: AzureSolutionQuestionNames.AddResources,
@@ -215,21 +213,33 @@ exports.AskSubscriptionQuestion = {
         return teamsfx_api_1.ok(teamsfx_api_1.Void);
     },
 };
-exports.GetUserEmailQuestion = {
-    name: "email",
-    type: "text",
-    title: "Add owner to Teams/AAD app for the account under the same M365 tenant (email)",
-    validation: {
-        validFunc: (input, previousInputs) => {
-            if (!input || input.trim() === "") {
-                return "Email address cannot be null or empty";
-            }
-            const re = /\S+@\S+\.\S+/;
-            if (!re.test(input)) {
-                return "Email address is not valid";
-            }
-            return undefined;
+function getUserEmailQuestion(currentUserEmail) {
+    let defaultUserEmail = "";
+    if (currentUserEmail && currentUserEmail.indexOf("@") > 0) {
+        defaultUserEmail = "[UserName]@" + currentUserEmail.split("@")[1];
+    }
+    return {
+        name: "email",
+        type: "text",
+        title: "Add owner to Teams/AAD app for the account under the same M365 tenant (email)",
+        default: defaultUserEmail,
+        validation: {
+            validFunc: (input, previousInputs) => {
+                if (!input || input.trim() === "") {
+                    return "Email address cannot be null or empty";
+                }
+                input = input.trim();
+                if (input === defaultUserEmail) {
+                    return "Please change [UserName] to the real user name";
+                }
+                const re = /\S+@\S+\.\S+/;
+                if (!re.test(input)) {
+                    return "Email address is not valid";
+                }
+                return undefined;
+            },
         },
-    },
-};
+    };
+}
+exports.getUserEmailQuestion = getUserEmailQuestion;
 //# sourceMappingURL=question.js.map

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

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

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

@@ -1,6 +1,7 @@
 import { AzureSolutionSettings, Func, FxError, Plugin, PluginContext, QTreeNode, Result, Solution, SolutionContext, Stage } from "@microsoft/teamsfx-api";
 import { ListCollaboratorResult, PermissionsResult } from "../../../common/permissionInterface";
 import { AppStudioPlugin, SpfxPlugin } from "../../resource";
+import { Void } from "./constants";
 export declare type LoadedPlugin = Plugin;
 export declare type PluginsWithContext = [LoadedPlugin, PluginContext];
 export declare enum SolutionRunningState {
@@ -74,7 +75,6 @@ export declare class TeamsAppSolution implements Solution {
     doLocalDebug(ctx: SolutionContext): Promise<Result<any, FxError>>;
     grantPermission(ctx: SolutionContext): Promise<Result<PermissionsResult, FxError>>;
     checkPermission(ctx: SolutionContext): Promise<Result<PermissionsResult, FxError>>;
-    listAllCollaborators(ctx: SolutionContext): Promise<Result<Record<string, ListCollaboratorResult>, FxError>>;
     listCollaborator(ctx: SolutionContext): Promise<Result<ListCollaboratorResult, FxError>>;
     private loadTeamsAppTenantId;
     getAzureSolutionSettings(ctx: SolutionContext): AzureSolutionSettings;
@@ -99,4 +99,5 @@ export declare class TeamsAppSolution implements Solution {
      */
     private registerTeamsAppAndAad;
 }
+export declare function askForProvisionConsent(ctx: SolutionContext): Promise<Result<Void, FxError>>;
 //# sourceMappingURL=solution.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/solution.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../src/plugins/solution/fx-solution/solution.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,qBAAqB,EAMrB,IAAI,EACJ,OAAO,EAKP,MAAM,EACN,aAAa,EAEb,SAAS,EACT,MAAM,EAGN,QAAQ,EAER,eAAe,EAEf,KAAK,EAMN,MAAM,wBAAwB,CAAC;AAShC,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAehG,OAAO,EAAwB,eAAe,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAcnF,OAAO,EAkBL,IAAI,EAKL,MAAM,aAAa,CAAC;AAmDrB,oBAAY,YAAY,GAAG,MAAM,CAAC;AAClC,oBAAY,kBAAkB,GAAG,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;AAG/D,oBAAY,oBAAoB;IAC9B,IAAI,SAAS;IACb,mBAAmB,wBAAwB;IAC3C,gBAAgB,qBAAqB;IACrC,iBAAiB,sBAAsB;CACxC;AAED,qBACa,gBAAiB,YAAW,QAAQ;IAC/C,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,eAAe,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IAEzB,IAAI,SAAuB;IAE3B,YAAY,EAAE,oBAAoB,CAAC;;IAgBnC,OAAO,CAAC,wBAAwB;IAQ1B,IAAI,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAI/D,sBAAsB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,CAAC,EAAE,OAAO,CAAC;IAa7E,wBAAwB,CAC5B,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IAgDlD;;OAEG;IACG,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgD3D,OAAO,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgElE,aAAa,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,MAAM,EAAE;IAMhE,OAAO,CAAC,YAAY;IAQpB,OAAO,CAAC,cAAc;IAMhB,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAIjE,OAAO,CAAC,kBAAkB;IAO1B;;OAEG;IAEG,QAAQ,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAa7D,UAAU,CACd,GAAG,EAAE,eAAe,EACpB,iBAAiB,EAAE,YAAY,EAAE,EACjC,wBAAwB,EAAE,OAAO,EACjC,cAAc,CAAC,EAAE,YAAY,EAAE,GAC9B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAgC1B,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAsBpE;;OAEG;IACH,OAAO,CAAC,0BAA0B;IA+BlC,OAAO,CAAC,6BAA6B;IAIrC;;;;OAIG;IAEG,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IA6EpE;;OAEG;IACG,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAuIhE,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAwDjE;;OAEG;YACW,QAAQ;IA0DhB,OAAO,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAwD5D,uBAAuB,CAC3B,GAAG,EAAE,eAAe,EACpB,gBAAgB,EAAE,OAAO,GACxB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA8ClD;;;OAGG;IACG,YAAY,CAChB,KAAK,EAAE,KAAK,EACZ,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IAsM5C,UAAU,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAyB/D,YAAY,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAkIjE,eAAe,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAKlF,eAAe,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAKlF,gBAAgB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAI9F,OAAO,CAAC,oBAAoB;IAkB5B,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,qBAAqB;IAI/D,0BAA0B,CAC9B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA0H5C,4BAA4B,CAChC,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA2DlD;;OAEG;IACG,uBAAuB,CAC3B,IAAI,EAAE,IAAI,EACV,GAAG,EAAE,eAAe,GACnB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC;IA0B5C,kBAAkB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAkJvE,oBAAoB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAoH/E;;OAEG;IAEG,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAiEtF,OAAO,CAAC,sCAAsC;IAoB9C,OAAO,CAAC,sCAAsC;IA8C9C;;;;OAIG;YACW,sBAAsB;CAsIrC;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAgDjG"}