@microsoft/teamsfx-core 2.0.2-alpha.eebec21dd.0 → 2.0.2

package/build/core/middleware/projectSettingsLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectSettingsLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"AAOA,OAAO,EAEL,OAAO,EAEP,MAAM,EACN,eAAe,EAEf,MAAM,EAKP,MAAM,wBAAwB,CAAC;AAchC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAK3C;AAED,wBAAsB,gCAAgC,CACpD,WAAW,EAAE,MAAM,EACnB,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAe3C;AAGD,wBAAsB,kCAAkC,CACtD,WAAW,EAAE,MAAM,EACnB,iBAAiB,UAAQ,EACzB,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAmB3C;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAW3D;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAElE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAOnE"}
+{"version":3,"file":"projectSettingsLoader.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsLoader.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAGL,OAAO,EAEP,MAAM,EAEN,eAAe,EAEf,MAAM,EACN,eAAe,EAGf,KAAK,EACN,MAAM,wBAAwB,CAAC;AAehC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAM3C,eAAO,MAAM,uBAAuB,EAAE,UAsCrC,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,MAAM,EAAE,MAAM,EACd,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAK3C;AAED,wBAAsB,gCAAgC,CACpD,WAAW,EAAE,MAAM,EACnB,iBAAiB,UAAQ,GACxB,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAmB3C;AAGD,wBAAsB,kCAAkC,CACtD,WAAW,EAAE,MAAM,EACnB,iBAAiB,UAAQ,EACzB,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAmB3C;AAED,wBAAsB,kBAAkB,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB/F;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAW3D;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAMlE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAOnE"}

package/build/core/middleware/projectSettingsLoader.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProjectSettingPathV2 = exports.getProjectSettingPathV3 = exports.getProjectSettingsPath = exports.shouldIgnored = exports.loadProjectSettingsByProjectPathV2 = exports.loadProjectSettingsByProjectPath = exports.loadProjectSettings = void 0;
+exports.getProjectSettingPathV2 = exports.getProjectSettingPathV3 = exports.getProjectSettingsPath = exports.shouldIgnored = exports.newSolutionContext = exports.loadProjectSettingsByProjectPathV2 = exports.loadProjectSettingsByProjectPath = exports.loadProjectSettings = exports.ProjectSettingsLoaderMW = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
@@ -10,12 +10,50 @@ const uuid = tslib_1.__importStar(require("uuid"));
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const projectSettingsHelper_1 = require("../../common/projectSettingsHelper");
 const telemetry_1 = require("../../common/telemetry");
-const versionMetadata_1 = require("../../common/versionMetadata");
-const migrate_1 = require("../../component/migrate");
-const settingsUtil_1 = require("../../component/utils/settingsUtil");
+const tools_1 = require("../../common/tools");
+const crypto_1 = require("../crypto");
+const environment_1 = require("../environment");
 const error_1 = require("../error");
 const globalVars_1 = require("../globalVars");
+const permissionRequest_1 = require("../permissionRequest");
+const migrate_1 = require("../../component/migrate");
+const versionMetadata_1 = require("../../common/versionMetadata");
+const settingsUtil_1 = require("../../component/utils/settingsUtil");
 const common_1 = require("../../error/common");
+const ProjectSettingsLoaderMW = async (ctx, next) => {
+    const inputs = ctx.arguments[ctx.arguments.length - 1];
+    if (!shouldIgnored(ctx)) {
+        if (!inputs.projectPath) {
+            ctx.result = teamsfx_api_1.err(new error_1.NoProjectOpenedError());
+            return;
+        }
+        const projectPathExist = await fs.pathExists(inputs.projectPath);
+        if (!projectPathExist) {
+            ctx.result = teamsfx_api_1.err(new common_1.FileNotFoundError("ProjectSettingsLoaderMW", inputs.projectPath));
+            return;
+        }
+        const loadRes = await loadProjectSettings(inputs, true);
+        if (loadRes.isErr()) {
+            ctx.result = teamsfx_api_1.err(loadRes.error);
+            return;
+        }
+        const projectSettings = loadRes.value;
+        const validRes = projectSettingsHelper_1.validateProjectSettings(projectSettings);
+        if (validRes) {
+            ctx.result = teamsfx_api_1.err(new error_1.InvalidProjectSettingsFileError(validRes));
+            return;
+        }
+        ctx.projectSettings = projectSettings;
+        ctx.self.isFromSample = projectSettings.isFromSample === true;
+        ctx.self.settingsVersion = projectSettings.version;
+        ctx.self.tools.cryptoProvider = new crypto_1.LocalCrypto(projectSettings.projectId);
+        ctx.contextV2 = tools_1.createV2Context(projectSettings);
+        // set global variable once project settings is loaded
+        globalVars_1.globalVars.isVS = projectSettingsHelper_1.isVSProject(projectSettings);
+    }
+    await next();
+};
+exports.ProjectSettingsLoaderMW = ProjectSettingsLoaderMW;
 async function loadProjectSettings(inputs, isMultiEnvEnabled = false) {
     if (!inputs.projectPath) {
         return teamsfx_api_1.err(new error_1.NoProjectOpenedError());
@@ -25,20 +63,25 @@ async function loadProjectSettings(inputs, isMultiEnvEnabled = false) {
 exports.loadProjectSettings = loadProjectSettings;
 async function loadProjectSettingsByProjectPath(projectPath, isMultiEnvEnabled = false) {
     try {
-        const readSettingsResult = await settingsUtil_1.settingsUtil.readSettings(projectPath, true);
-        if (readSettingsResult.isOk()) {
-            const projectSettings = {
-                projectId: readSettingsResult.value.trackingId,
-                version: readSettingsResult.value.version,
-            };
-            return teamsfx_api_1.ok(projectSettings);
+        if (tools_1.isV3Enabled()) {
+            const readSettingsResult = await settingsUtil_1.settingsUtil.readSettings(projectPath, true);
+            if (readSettingsResult.isOk()) {
+                const projectSettings = {
+                    projectId: readSettingsResult.value.trackingId,
+                    version: readSettingsResult.value.version,
+                };
+                return teamsfx_api_1.ok(projectSettings);
+            }
+            else {
+                return teamsfx_api_1.err(readSettingsResult.error);
+            }
         }
         else {
-            return teamsfx_api_1.err(readSettingsResult.error);
+            return await loadProjectSettingsByProjectPathV2(projectPath, isMultiEnvEnabled);
         }
     }
     catch (e) {
-        return teamsfx_api_1.err(new common_1.ReadFileError(e, "projectSettingsLoader"));
+        return teamsfx_api_1.err(error_1.ReadFileError(e));
     }
 }
 exports.loadProjectSettingsByProjectPath = loadProjectSettingsByProjectPath;
@@ -64,6 +107,22 @@ async function loadProjectSettingsByProjectPathV2(projectPath, isMultiEnvEnabled
     return teamsfx_api_1.ok(migrate_1.convertProjectSettingsV2ToV3(projectSettings, projectPath));
 }
 exports.loadProjectSettingsByProjectPathV2 = loadProjectSettingsByProjectPathV2;
+async function newSolutionContext(tools, inputs) {
+    const projectSettings = {
+        appName: "",
+        programmingLanguage: "",
+        projectId: uuid.v4(),
+        solutionSettings: {
+            name: "fx-solution-azure",
+            version: "1.0.0",
+        },
+    };
+    const solutionContext = Object.assign(Object.assign(Object.assign({ projectSettings: projectSettings, envInfo: environment_1.newEnvInfo(), root: inputs.projectPath || "" }, tools), tools.tokenProvider), { answers: inputs, cryptoProvider: new crypto_1.LocalCrypto(projectSettings.projectId), permissionRequestProvider: inputs.projectPath
+            ? new permissionRequest_1.PermissionRequestFileProvider(inputs.projectPath)
+            : undefined });
+    return solutionContext;
+}
+exports.newSolutionContext = newSolutionContext;
 function shouldIgnored(ctx) {
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     const method = ctx.method;
@@ -76,7 +135,12 @@ function shouldIgnored(ctx) {
 }
 exports.shouldIgnored = shouldIgnored;
 function getProjectSettingsPath(projectPath) {
-    return getProjectSettingPathV3(projectPath);
+    if (tools_1.isV3Enabled()) {
+        return getProjectSettingPathV3(projectPath);
+    }
+    else {
+        return getProjectSettingPathV2(projectPath);
+    }
 }
 exports.getProjectSettingsPath = getProjectSettingsPath;
 function getProjectSettingPathV3(projectPath) {

package/build/core/middleware/projectSettingsLoader.js.map

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

package/build/core/middleware/projectSettingsWriter.d.ts

@@ -0,0 +1,6 @@
+import { Middleware } from "@feathersjs/hooks";
+/**
+ * This middleware will help to persist project settings if necessary.
+ */
+export declare const ProjectSettingsWriterMW: Middleware;
+//# sourceMappingURL=projectSettingsWriter.d.ts.map

package/build/core/middleware/projectSettingsWriter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectSettingsWriter.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsWriter.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAkB7D;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,UAmCrC,CAAC"}

package/build/core/middleware/projectSettingsWriter.js

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectSettingsWriterMW = void 0;
+const tslib_1 = require("tslib");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const fs = tslib_1.__importStar(require("fs-extra"));
+const tools_1 = require("../../common/tools");
+const migrate_1 = require("../../component/migrate");
+const error_1 = require("../error");
+const globalVars_1 = require("../globalVars");
+const projectSettingsLoader_1 = require("./projectSettingsLoader");
+/**
+ * This middleware will help to persist project settings if necessary.
+ */
+const ProjectSettingsWriterMW = async (ctx, next) => {
+    await next();
+    if (!projectSettingsLoader_1.shouldIgnored(ctx)) {
+        const lastArg = ctx.arguments[ctx.arguments.length - 1];
+        const inputs = lastArg === ctx ? ctx.arguments[ctx.arguments.length - 2] : lastArg;
+        if (!inputs.projectPath ||
+            inputs.ignoreConfigPersist === true ||
+            teamsfx_api_1.StaticPlatforms.includes(inputs.platform))
+            return;
+        let projectSettings = ctx.projectSettings;
+        if (projectSettings === undefined)
+            return;
+        try {
+            if (!tools_1.isV3Enabled()) {
+                projectSettings = migrate_1.convertProjectSettingsV3ToV2(projectSettings);
+                const solutionSettings = projectSettings.solutionSettings;
+                if (solutionSettings) {
+                    if (!solutionSettings.activeResourcePlugins)
+                        solutionSettings.activeResourcePlugins = [];
+                    if (!solutionSettings.azureResources)
+                        solutionSettings.azureResources = [];
+                }
+                const settingFile = projectSettingsLoader_1.getProjectSettingsPath(inputs.projectPath);
+                await fs.writeFile(settingFile, JSON.stringify(projectSettings, null, 4));
+                globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.debug(`[core] persist project setting file: ${settingFile}`);
+            }
+        }
+        catch (e) {
+            if (ctx.result.isOk()) {
+                ctx.result = teamsfx_api_1.err(error_1.WriteFileError(e));
+            }
+        }
+    }
+};
+exports.ProjectSettingsWriterMW = ProjectSettingsWriterMW;
+//# sourceMappingURL=projectSettingsWriter.js.map

package/build/core/middleware/projectSettingsWriter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectSettingsWriter.js","sourceRoot":"","sources":["../../../src/core/middleware/projectSettingsWriter.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAGb,wDAQgC;AAChC,qDAA+B;AAC/B,8CAAiD;AACjD,qDAAuE;AACvE,oCAA0C;AAC1C,8CAAsC;AAEtC,mEAAgF;AAEhF;;GAEG;AACI,MAAM,uBAAuB,GAAe,KAAK,EACtD,GAAoB,EACpB,IAAkB,EAClB,EAAE;IACF,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,CAAC,qCAAa,CAAC,GAAG,CAAC,EAAE;QACvB,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,MAAM,GAAW,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;QAC3F,IACE,CAAC,MAAM,CAAC,WAAW;YACnB,MAAM,CAAC,mBAAmB,KAAK,IAAI;YACnC,6BAAe,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;YAEzC,OAAO;QACT,IAAI,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC;QAC1C,IAAI,eAAe,KAAK,SAAS;YAAE,OAAO;QAC1C,IAAI;YACF,IAAI,CAAC,mBAAW,EAAE,EAAE;gBAClB,eAAe,GAAG,sCAA4B,CAAC,eAAoC,CAAC,CAAC;gBACrF,MAAM,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;gBAC1D,IAAI,gBAAgB,EAAE;oBACpB,IAAI,CAAC,gBAAgB,CAAC,qBAAqB;wBAAE,gBAAgB,CAAC,qBAAqB,GAAG,EAAE,CAAC;oBACzF,IAAI,CAAC,gBAAgB,CAAC,cAAc;wBAAE,gBAAgB,CAAC,cAAc,GAAG,EAAE,CAAC;iBAC5E;gBAED,MAAM,WAAW,GAAG,8CAAsB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAC/D,MAAM,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;gBAC1E,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CAAC,wCAAwC,WAAW,EAAE,CAAC,CAAC;aACjF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAK,GAAG,CAAC,MAA+B,CAAC,IAAI,EAAE,EAAE;gBAC/C,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,sBAAc,CAAC,CAAC,CAAC,CAAC,CAAC;aACrC;SACF;KACF;AACH,CAAC,CAAC;AAnCW,QAAA,uBAAuB,2BAmClC"}

package/build/core/middleware/projectVersionChecker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"projectVersionChecker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAcjE,eAAO,MAAM,uBAAuB,EAAE,UAYrC,CAAC"}
+{"version":3,"file":"projectVersionChecker.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/projectVersionChecker.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAgB,MAAM,uBAAuB,CAAC;AAqBjE,eAAO,MAAM,uBAAuB,EAAE,UAYrC,CAAC"}

package/build/core/middleware/projectVersionChecker.js

@@ -5,13 +5,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectVersionCheckerMW = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const semver_1 = tslib_1.__importDefault(require("semver"));
+const globalVars_1 = require("../globalVars");
 const localizeUtils_1 = require("../../common/localizeUtils");
+const semver_1 = tslib_1.__importDefault(require("semver"));
+const tools_1 = require("../../common/tools");
+const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
 const versionMetadata_1 = require("../../common/versionMetadata");
-const error_1 = require("../error");
-const globalVars_1 = require("../globalVars");
+const projectMigrator_1 = require("./projectMigrator");
 const projectMigratorV3_1 = require("./projectMigratorV3");
-const v3MigrationUtils_1 = require("./utils/v3MigrationUtils");
+const telemetry_1 = require("../../common/telemetry");
+const error_1 = require("../error");
 let userCancelFlag = false;
 const methods = new Set(["getProjectConfig", "checkPermission"]);
 const ProjectVersionCheckerMW = async (ctx, next) => {
@@ -25,8 +28,18 @@ const ProjectVersionCheckerMW = async (ctx, next) => {
 };
 exports.ProjectVersionCheckerMW = ProjectVersionCheckerMW;
 async function needToShowUpdateDialog(ctx, versionInfo) {
-    if (versionInfo.source === versionMetadata_1.VersionSource.teamsapp && semver_1.default.gte(versionInfo.version, "2.0.0")) {
-        return true;
+    if (tools_1.isV3Enabled()) {
+        if (versionInfo.source === versionMetadata_1.VersionSource.teamsapp && semver_1.default.gte(versionInfo.version, "2.0.0")) {
+            return true;
+        }
+    }
+    else {
+        if (versionInfo.source !== versionMetadata_1.VersionSource.projectSettings) {
+            telemetry_1.sendTelemetryEvent(telemetry_1.Component.core, telemetry_1.TelemetryEvent.DisplayToolingUpdateNotification, {
+                [telemetry_1.TelemetryProperty.ToolkitVersion]: "V2",
+            });
+            return true;
+        }
     }
     return false;
 }
@@ -36,8 +49,8 @@ async function showDialog(ctx) {
     if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
         const messageKey = "core.projectVersionChecker.incompatibleProject";
         const message = localizeUtils_1.getLocalizedString(messageKey);
-        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigratorV3_1.moreInfoButton).then((res) => {
-            if (res.isOk() && res.value === projectMigratorV3_1.moreInfoButton) {
+        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigrator_1.learnMoreText).then((res) => {
+            if (res.isOk() && res.value === projectMigrator_1.learnMoreText) {
                 globalVars_1.TOOLS.ui.openUrl(versionMetadata_1.MetadataV2.updateToolkitLink);
             }
         });
@@ -51,8 +64,8 @@ async function showDialog(ctx) {
     else {
         const messageKey = "core.projectVersionChecker.vs.incompatibleProject";
         const message = localizeUtils_1.getLocalizedString(messageKey);
-        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigratorV3_1.moreInfoButton).then((res) => {
-            if (res.isOk() && res.value === projectMigratorV3_1.moreInfoButton) {
+        globalVars_1.TOOLS.ui.showMessage("warn", message, false, projectMigrator_1.learnMoreText).then((res) => {
+            if (res.isOk() && res.value === projectMigrator_1.learnMoreText) {
                 globalVars_1.TOOLS.ui.openUrl(projectMigratorV3_1.learnMoreLink);
             }
         });

package/build/core/middleware/projectVersionChecker.js.map

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

package/build/core/middleware/questionModel.d.ts

@@ -4,6 +4,7 @@ import { FxError, Inputs, QTreeNode, Result } from "@microsoft/teamsfx-api";
  * This middleware will help to collect input from question flow
  */
 export declare const QuestionModelMW: Middleware;
+export declare function traverseToCollectPasswordNodes(node: QTreeNode, names: Set<string>): void;
 export declare function getQuestionsForCreateProjectV2(inputs: Inputs): Promise<Result<QTreeNode | undefined, FxError>>;
 export declare function addOfficeAddinQuestions(node: QTreeNode): void;
 //# sourceMappingURL=questionModel.d.ts.map

package/build/core/middleware/questionModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAEL,OAAO,EACP,MAAM,EAEN,SAAS,EACT,MAAM,EAGP,MAAM,wBAAwB,CAAC;AAsDhC;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,UA4B7B,CAAC;AAgQF,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAY7D"}
+{"version":3,"file":"questionModel.d.ts","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAgB,MAAM,mBAAmB,CAAC;AAC7D,OAAO,EAGL,OAAO,EACP,MAAM,EAGN,SAAS,EACT,MAAM,EAEP,MAAM,wBAAwB,CAAC;AA0DhC;;GAEG;AACH,eAAO,MAAM,eAAe,EAAE,UA4B7B,CAAC;AAYF,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAOxF;AAuRD,wBAAsB,8BAA8B,CAClD,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAQjD;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,SAAS,GAAG,IAAI,CAY7D"}

package/build/core/middleware/questionModel.js

@@ -2,20 +2,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addOfficeAddinQuestions = exports.getQuestionsForCreateProjectV2 = exports.QuestionModelMW = void 0;
+exports.addOfficeAddinQuestions = exports.getQuestionsForCreateProjectV2 = exports.traverseToCollectPasswordNodes = exports.QuestionModelMW = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const featureFlags_1 = require("../../common/featureFlags");
+const tools_1 = require("../../common/tools");
 const utils_1 = require("../../common/utils");
 const constants_1 = require("../../component/constants");
 const developerPortalScaffoldUtils_1 = require("../../component/developerPortalScaffoldUtils");
+const spfx_1 = require("../../component/feature/spfx");
 const question_1 = require("../../component/generator/officeAddin/question");
 const question_2 = require("../../component/question");
 const utils_2 = require("../../component/resource/appManifest/utils/utils");
 const collaborator_1 = require("../collaborator");
 const globalVars_1 = require("../globalVars");
 const question_3 = require("../question");
-const visitor_1 = require("../../ui/visitor");
-const questions_1 = require("../../component/generator/spfx/utils/questions");
 /**
  * This middleware will help to collect input from question flow
  */
@@ -26,10 +26,10 @@ const QuestionModelMW = async (ctx, next) => {
     if (method === "grantPermission") {
         getQuestionRes = await collaborator_1.getQuestionsForGrantPermission(inputs);
     }
-    else if (method === "listCollaborator" || method == "checkPermission") {
+    else if (tools_1.isV3Enabled() && (method === "listCollaborator" || method == "checkPermission")) {
         getQuestionRes = await collaborator_1.getQuestionsForListCollaborator(inputs);
     }
-    else if (method === "deployAadManifest") {
+    else if (tools_1.isV3Enabled() && method === "deployAadManifest") {
         getQuestionRes = await question_3.getQuestionForDeployAadManifest(inputs);
     }
     if (getQuestionRes.isErr()) {
@@ -39,7 +39,7 @@ const QuestionModelMW = async (ctx, next) => {
     }
     const node = getQuestionRes.value;
     if (node) {
-        const res = await visitor_1.traverse(node, inputs, globalVars_1.TOOLS.ui, globalVars_1.TOOLS.telemetryReporter);
+        const res = await teamsfx_api_1.traverse(node, inputs, globalVars_1.TOOLS.ui, globalVars_1.TOOLS.telemetryReporter);
         if (res.isErr()) {
             ctx.result = teamsfx_api_1.err(res.error);
             return;
@@ -48,6 +48,24 @@ const QuestionModelMW = async (ctx, next) => {
     await next();
 };
 exports.QuestionModelMW = QuestionModelMW;
+// export function desensitize(node: QTreeNode, input: Inputs): Inputs {
+//   const copy = deepCopy(input);
+//   const names = new Set<string>();
+//   traverseToCollectPasswordNodes(node, names);
+//   for (const name of names) {
+//     copy[name] = "******";
+//   }
+//   return copy;
+// }
+function traverseToCollectPasswordNodes(node, names) {
+    if (node.data.type === "text" && node.data.password === true) {
+        names.add(node.data.name);
+    }
+    for (const child of node.children || []) {
+        traverseToCollectPasswordNodes(child, names);
+    }
+}
+exports.traverseToCollectPasswordNodes = traverseToCollectPasswordNodes;
 async function getQuestionsForCreateProjectWithoutDotNet(inputs) {
     var _a, _b, _c, _d;
     if (developerPortalScaffoldUtils_1.isFromDevPortal(inputs)) {
@@ -62,8 +80,15 @@ async function getQuestionsForCreateProjectWithoutDotNet(inputs) {
     node.addChild(createNew);
     createNew.condition = { equals: question_3.ScratchOptionYes().id };
     // capabilities
-    const capQuestion = question_3.createCapabilityQuestionPreview(inputs);
-    const capNode = new teamsfx_api_1.QTreeNode(capQuestion);
+    let capNode;
+    if (featureFlags_1.isPreviewFeaturesEnabled()) {
+        const capQuestion = question_3.createCapabilityQuestionPreview(inputs);
+        capNode = new teamsfx_api_1.QTreeNode(capQuestion);
+    }
+    else {
+        const capQuestion = question_3.createCapabilityQuestion();
+        capNode = new teamsfx_api_1.QTreeNode(capQuestion);
+    }
     createNew.addChild(capNode);
     const triggerNodeRes = await question_2.getNotificationTriggerQuestionNode(inputs);
     if (triggerNodeRes.isErr())
@@ -71,14 +96,33 @@ async function getQuestionsForCreateProjectWithoutDotNet(inputs) {
     if (triggerNodeRes.value) {
         capNode.addChild(triggerNodeRes.value);
     }
-    const spfxNode = await question_2.getSPFxScaffoldQuestion(inputs.platform);
+    const spfxNode = await spfx_1.getSPFxScaffoldQuestion(inputs.platform);
     if (spfxNode) {
         spfxNode.condition = { equals: constants_1.TabSPFxItem().id };
         capNode.addChild(spfxNode);
     }
     // Language
     const programmingLanguage = new teamsfx_api_1.QTreeNode(question_3.ProgrammingLanguageQuestion);
+    if (featureFlags_1.isPreviewFeaturesEnabled()) {
+        programmingLanguage.condition = {
+            notEquals: constants_1.ExistingTabOptionItem().id,
+        };
+    }
+    else {
+        programmingLanguage.condition = {
+            minItems: 1,
+            excludes: constants_1.ExistingTabOptionItem().id,
+        };
+    }
     capNode.addChild(programmingLanguage);
+    // existing tab endpoint
+    if (tools_1.isExistingTabAppEnabled()) {
+        const existingTabEndpoint = new teamsfx_api_1.QTreeNode(question_3.ExistingTabEndpointQuestion());
+        existingTabEndpoint.condition = {
+            equals: constants_1.ExistingTabOptionItem().id,
+        };
+        capNode.addChild(existingTabEndpoint);
+    }
     createNew.addChild(new teamsfx_api_1.QTreeNode(question_3.QuestionRootFolder()));
     const defaultName = !((_c = inputs.teamsAppFromTdp) === null || _c === void 0 ? void 0 : _c.appName)
         ? undefined
@@ -130,7 +174,7 @@ async function getQuestionsForCreateProjectWithDotNet(inputs) {
     if (triggerNodeRes.value) {
         dotnetCapNode.addChild(triggerNodeRes.value);
     }
-    const spfxNode = await question_2.getSPFxScaffoldQuestion(inputs.platform);
+    const spfxNode = await spfx_1.getSPFxScaffoldQuestion(inputs.platform);
     if (spfxNode) {
         spfxNode.condition = { equals: constants_1.TabSPFxItem().id };
         dotnetCapNode.addChild(spfxNode);
@@ -183,7 +227,7 @@ async function getQuestionsForCreateProjectInVSC(inputs) {
         equals: constants_1.NewProjectTypeTabOptionItem().id,
     };
     typeNode.addChild(tabTypeNode);
-    const spfxNode = await question_2.getSPFxScaffoldQuestion(inputs.platform);
+    const spfxNode = await spfx_1.getSPFxScaffoldQuestion(inputs.platform);
     if (spfxNode) {
         spfxNode.condition = { equals: constants_1.TabSPFxItem().id };
         tabTypeNode.addChild(spfxNode);
@@ -211,7 +255,6 @@ async function getQuestionsForCreateProjectInVSC(inputs) {
     const defaultName = !((_e = inputs.teamsAppFromTdp) === null || _e === void 0 ? void 0 : _e.appName)
         ? undefined
         : utils_1.convertToAlphanumericOnly((_f = inputs.teamsAppFromTdp) === null || _f === void 0 ? void 0 : _f.appName);
-    root.addChild(new teamsfx_api_1.QTreeNode(questions_1.skipAppName));
     root.addChild(new teamsfx_api_1.QTreeNode(question_3.createAppNameQuestion(defaultName)));
     if (developerPortalScaffoldUtils_1.isFromDevPortal(inputs)) {
         const updateTabUrls = await getQuestionsForUpdateStaticTabUrls(inputs.teamsAppFromTdp);

package/build/core/middleware/questionModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"questionModel.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAGlC,wDASgC;AAEhC,4DAAqF;AACrF,8CAA+D;AAC/D,yDAMmC;AACnC,+FAA8F;AAC9F,6EAA4F;AAC5F,uDAGkC;AAElC,4EAA8F;AAC9F,kDAAkG;AAClG,8CAAsC;AACtC,0CA4BqB;AAErB,8CAA4C;AAC5C,8EAA6E;AAE7E;;GAEG;AACI,MAAM,eAAe,GAAe,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IAC5F,MAAM,MAAM,GAAW,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,IAAI,cAAc,GAA2C,gBAAE,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,iBAAiB,EAAE;QAChC,cAAc,GAAG,MAAM,6CAA8B,CAAC,MAAM,CAAC,CAAC;KAC/D;SAAM,IAAI,MAAM,KAAK,kBAAkB,IAAI,MAAM,IAAI,iBAAiB,EAAE;QACvE,cAAc,GAAG,MAAM,8CAA+B,CAAC,MAAM,CAAC,CAAC;KAChE;SAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;QACzC,cAAc,GAAG,MAAM,0CAA+B,CAAC,MAAM,CAAC,CAAC;KAChE;IAED,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;QAC1B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CACtB,sCAAsC,MAAM,KAAK,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,CAChF,CAAC;QACF,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO;KACR;IACD,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC;IAClC,IAAI,IAAI,EAAE;QACR,MAAM,GAAG,GAAG,MAAM,kBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5E,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;SACR;KACF;IACD,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;AA5BW,QAAA,eAAe,mBA4B1B;AAEF,KAAK,UAAU,yCAAyC,CACtD,MAAc;;IAEd,IAAI,8CAAe,CAAC,MAAM,CAAC,EAAE;QAC3B,4GAA4G;QAC5G,MAAM,CAAC,4BAAiB,CAAC,iBAAiB,CAAC,GAAG,8BAAmB,EAAE,CAAC,EAAE,CAAC;QACvE,MAAM,CAAC,4BAAiB,CAAC,YAAY,CAAC;YACpC,MAAA,MAAM,CAAC,4BAAiB,CAAC,YAAY,CAAC,mCAAI,MAAA,4CAAa,CAAC,MAAM,CAAC,eAAe,CAAC,0CAAE,UAAU,CAAC;KAC/F;IACD,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,2CAAgC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE9E,aAAa;IACb,MAAM,SAAS,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACnD,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;IACzB,SAAS,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,2BAAgB,EAAE,CAAC,EAAE,EAAE,CAAC;IAExD,eAAe;IACf,MAAM,WAAW,GAAG,0CAA+B,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;IAE3C,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE5B,MAAM,cAAc,GAAG,MAAM,6CAAkC,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,cAAc,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,cAAc,CAAC,KAAK,EAAE;QACxB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;KACxC;IACD,MAAM,QAAQ,GAAG,MAAM,kCAAuB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,uBAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAC5B;IACD,WAAW;IACX,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAEtC,SAAS,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC,CAAC;IACxD,MAAM,WAAW,GAAG,CAAC,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,OAAO,CAAA;QAClD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,iCAAyB,CAAC,MAAA,MAAM,CAAC,eAAe,0CAAE,OAAO,CAAC,CAAC;IAC/D,SAAS,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAEtE,IAAI,8CAAe,CAAC,MAAM,CAAC,EAAE;QAC3B,MAAM,aAAa,GAAG,MAAM,kCAAkC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACvF,IAAI,aAAa,EAAE;YACjB,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;SACnC;QAED,MAAM,YAAY,GAAG,MAAM,2BAA2B,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/E,IAAI,YAAY,EAAE;YAChB,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SAClC;KACF;IACD,qBAAqB;IACrB,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,uBAAY,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1B,UAAU,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,0BAAe,EAAE,CAAC,EAAE,EAAE,CAAC;IACxD,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC,CAAC;IAEzD,IAAI,mCAAoB,EAAE,EAAE;QAC1B,uBAAuB,CAAC,IAAI,CAAC,CAAC;KAC/B;IAED,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,sCAAsC,CACnD,MAAc;IAEd,MAAM,WAAW,GAAG,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC;IACxD,MAAM,SAAS,GAAG,MAAM,yCAAyC,CAAC,MAAM,CAAC,CAAC;IAC1E,IAAI,SAAS,CAAC,KAAK,EAAE,EAAE;QACrB,OAAO,iBAAG,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;KAC7B;IACD,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC;IAE7B,IAAI,IAAI,EAAE;QACR,IAAI,CAAC,SAAS,GAAG;YACf,MAAM,EAAE,8BAAmB,EAAE,CAAC,EAAE;SACjC,CAAC;QACF,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KAC5B;IAED,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACpD,UAAU,CAAC,SAAS,GAAG;QACrB,MAAM,EAAE,8BAAmB,EAAE,CAAC,EAAE;KACjC,CAAC;IACF,WAAW,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEjC,MAAM,aAAa,GAAG,IAAI,uBAAS,CAAC,oCAAyB,EAAE,CAAC,CAAC;IACjE,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,MAAM,6CAAkC,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,cAAc,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,cAAc,CAAC,KAAK,EAAE;QACxB,aAAa,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;KAC9C;IACD,MAAM,QAAQ,GAAG,MAAM,kCAAuB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,uBAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,aAAa,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAClC;IAED,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,+CAAoC,CAAC,CAAC,CAAC;IAE5E,6BAA6B;IAC7B,IAAI,0BAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAC1C,WAAW,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC,CAAC;KAC3D;IACD,WAAW,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;IAE7D,OAAO,gBAAE,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;AAChC,CAAC;AAED,KAAK,UAAU,iCAAiC,CAC9C,MAAc;;IAEd,IAAI,MAAM,CAAC,4BAAiB,CAAC,iBAAiB,CAAC,KAAK,6BAAkB,EAAE,CAAC,EAAE,EAAE;QAC3E,0BAA0B;QAC1B,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,uBAAY,EAAE,CAAC,CAAC;QACjD,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC,CAAC;QAEzD,OAAO,gBAAE,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC;KAC9B;IAED,uDAAuD;IACvD,MAAM,CAAC,4BAAiB,CAAC,iBAAiB,CAAC,GAAG,8BAAmB,EAAE,CAAC,EAAE,CAAC;IACvE,IAAI,8CAAe,CAAC,MAAM,CAAC,EAAE;QAC3B,MAAM,CAAC,4BAAiB,CAAC,WAAW,CAAC;YACnC,MAAA,MAAM,CAAC,4BAAiB,CAAC,WAAW,CAAC,mCAAI,MAAA,4CAAa,CAAC,MAAM,CAAC,eAAe,CAAC,0CAAE,WAAW,CAAC;QAC9F,MAAM,CAAC,4BAAiB,CAAC,YAAY,CAAC;YACpC,MAAA,MAAM,CAAC,4BAAiB,CAAC,YAAY,CAAC,mCAAI,MAAA,4CAAa,CAAC,MAAM,CAAC,eAAe,CAAC,0CAAE,UAAU,CAAC;KAC/F;IAED,0BAA0B;IAC1B,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAE9C,eAAe;IACf,MAAM,WAAW,GAAG,8CAAmC,CAAC,MAAM,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;IAC5C,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAExB,wBAAwB;IACxB,MAAM,WAAW,GAAG,IAAI,uBAAS,CAAC,oCAAyB,CAAC,MAAM,CAAC,CAAC,CAAC;IACrE,WAAW,CAAC,SAAS,GAAG;QACtB,MAAM,EAAE,uCAA2B,EAAE,CAAC,EAAE;KACzC,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/B,MAAM,cAAc,GAAG,MAAM,6CAAkC,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,cAAc,CAAC,KAAK,EAAE;QAAE,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAC7D,IAAI,cAAc,CAAC,KAAK,EAAE;QACxB,WAAW,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;KAC5C;IAED,WAAW;IACX,MAAM,WAAW,GAAG,IAAI,uBAAS,CAAC,wCAA6B,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,WAAW,CAAC,SAAS,GAAG;QACtB,MAAM,EAAE,uCAA2B,EAAE,CAAC,EAAE;KACzC,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE/B,MAAM,QAAQ,GAAG,MAAM,kCAAuB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,uBAAW,EAAE,CAAC,EAAE,EAAE,CAAC;QAClD,WAAW,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;KAChC;IAED,yBAAyB;IACzB,MAAM,wBAAwB,GAAG,IAAI,uBAAS,CAC5C,qDAA0C,CAAC,MAAM,CAAC,CACnD,CAAC;IACF,wBAAwB,CAAC,SAAS,GAAG;QACnC,MAAM,EAAE,oDAAwC,EAAE,CAAC,EAAE;KACtD,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC;IAE5C,qBAAqB;IACrB,MAAM,oBAAoB,GAAG,IAAI,uBAAS,CAAC,iDAAsC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3F,oBAAoB,CAAC,SAAS,GAAG;QAC/B,MAAM,EAAE,gDAAoC,EAAE,CAAC,EAAE;KAClD,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACxC,oBAAoB,CAAC,QAAQ,CAAC,qCAA0B,EAAE,CAAC,CAAC;IAE5D,WAAW;IACX,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;IACvE,mBAAmB,CAAC,SAAS,GAAG;QAC9B,SAAS,EAAE,gDAAoC,EAAE,CAAC,EAAE;KACrD,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAEvC,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,CAAC,CAAA,MAAA,MAAM,CAAC,eAAe,0CAAE,OAAO,CAAA;QAClD,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,iCAAyB,CAAC,MAAA,MAAM,CAAC,eAAe,0CAAE,OAAO,CAAC,CAAC;IAC/D,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,uBAAW,CAAC,CAAC,CAAC;IAC1C,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAEjE,IAAI,8CAAe,CAAC,MAAM,CAAC,EAAE;QAC3B,MAAM,aAAa,GAAG,MAAM,kCAAkC,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QACvF,IAAI,aAAa,EAAE;YACjB,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;SAClC;QAED,MAAM,YAAY,GAAG,MAAM,2BAA2B,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;QAC/E,IAAI,YAAY,EAAE;YAChB,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;SACjC;KACF;IAED,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACzB,CAAC;AAED,KAAK,UAAU,kCAAkC,CAC/C,aAA4B;IAE5B,IAAI,CAAC,qBAAa,CAAC,aAAa,CAAC,EAAE;QACjC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,aAAa,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACvD,MAAM,IAAI,GAAG,aAAa,CAAC,UAAW,CAAC;IACvC,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC/D,MAAM,mBAAmB,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;IAC/D,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QAClC,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,kCAAuB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;KACrF;IAED,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QAClC,aAAa,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,iCAAsB,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;KACpF;IAED,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,2BAA2B,CACxC,aAA4B;IAE5B,IAAI,CAAC,mBAAW,CAAC,aAAa,CAAC,EAAE;QAC/B,OAAO,SAAS,CAAC;KAClB;IACD,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC;IAChC,MAAM,iBAAiB,GAAG,aAAa,CAAC,mBAAmB,CAAC;IAE5D,sDAAsD;IACtD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACrE,oEAAoE;IACpE,MAAM,kBAAkB,GACtB,CAAC,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAEhG,OAAO,IAAI,uBAAS,CAAC,yBAAc,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC;AAClE,CAAC;AAEM,KAAK,UAAU,8BAA8B,CAClD,MAAc;IAEd,IAAI,iCAAkB,EAAE,IAAI,0BAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QAClE,OAAO,sCAAsC,CAAC,MAAM,CAAC,CAAC;KACvD;SAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,MAAM,EAAE;QAC9C,OAAO,iCAAiC,CAAC,MAAM,CAAC,CAAC;KAClD;SAAM;QACL,OAAO,yCAAyC,CAAC,MAAM,CAAC,CAAC;KAC1D;AACH,CAAC;AAVD,wEAUC;AAED,SAAgB,uBAAuB,CAAC,IAAe;IACrD,MAAM,cAAc,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IACxD,cAAc,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,qCAA0B,EAAE,CAAC,EAAE,EAAE,CAAC;IACvE,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IAE9B,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,yCAA8B,EAAE,CAAC,CAAC;IAChE,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEjC,OAAO,CAAC,QAAQ,CAAC,qCAA0B,EAAE,CAAC,CAAC;IAE/C,cAAc,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,EAAE,CAAC,CAAC,CAAC;IAC7D,cAAc,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;AAClE,CAAC;AAZD,0DAYC"}
+{"version":3,"file":"questionModel.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModel.ts"],"names":[],"mappings":"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"}

package/build/core/middleware/utils/MigrationUtils.d.ts

@@ -1,4 +1,14 @@
 import { FxError, Result } from "@microsoft/teamsfx-api";
+import { CoreHookContext } from "../../types";
+import { RequiredResourceAccess } from "../../../component/resource/aadApp/interfaces/AADManifest";
+export interface Permission {
+    resource: string;
+    delegated: string[];
+    application: string[];
+}
+export declare function permissionsToRequiredResourceAccess(permissions: Permission[]): RequiredResourceAccess[] | undefined;
+export declare function generateAadManifest(projectPath: string, projectSettingsJson: any): Promise<void>;
+export declare function needMigrateToAadManifest(ctx: CoreHookContext): Promise<boolean>;
 export declare enum FileType {
     STATE = 0,
     CONFIG = 1,
@@ -7,6 +17,14 @@ export declare enum FileType {
 export declare const fixedNamingsV3: {
     [key: string]: string;
 };
+export declare const provisionOutputNamingsV3: string[];
+export declare const nameMappingV3: {
+    [key: string]: string;
+};
+export declare const pluginIdMappingV3: {
+    [key: string]: string;
+};
+export declare const secretKeys: string[];
 export declare function namingConverterV3(name: string, type: FileType, bicepContent: string, needsRename?: boolean): Result<string, FxError>;
 export declare function convertPluginId(name: string): string;
 export declare function replacePlaceholdersForV3(content: string, bicepContent: string): string;

package/build/core/middleware/utils/MigrationUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAe,MAAM,wBAAwB,CAAC;AAG/E,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;CACT;AACD,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAoBnD,CAAC;AAuEF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,UAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAsED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAapD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAsBtF"}
+{"version":3,"file":"MigrationUtils.d.ts","sourceRoot":"","sources":["../../../../src/core/middleware/utils/MigrationUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAc,MAAM,EAAe,MAAM,wBAAwB,CAAC;AAGvF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAM9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,2DAA2D,CAAC;AAGnG,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,wBAAgB,mCAAmC,CACjD,WAAW,EAAE,UAAU,EAAE,GACxB,sBAAsB,EAAE,GAAG,SAAS,CAuBtC;AAED,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,mBAAmB,EAAE,GAAG,GACvB,OAAO,CAAC,IAAI,CAAC,CAcf;AAED,wBAAsB,wBAAwB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,CA8CrF;AAED,oBAAY,QAAQ;IAClB,KAAK,IAAA;IACL,MAAM,IAAA;IACN,QAAQ,IAAA;CACT;AACD,eAAO,MAAM,cAAc,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAoBnD,CAAC;AACF,eAAO,MAAM,wBAAwB,EAAE,MAAM,EAiC5C,CAAC;AACF,eAAO,MAAM,aAAa,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAIlD,CAAC;AACF,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAWtD,CAAC;AACF,eAAO,MAAM,UAAU,UAKtB,CAAC;AAcF,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,QAAQ,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,UAAQ,GAClB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAyBzB;AAsED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAapD;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAsBtF"}