npm - @microsoft/teamsfx-core - Versions diffs - 1.17.0-rc.2 → 1.17.1-alpha.28543dcd0.0 - Mend

@microsoft/teamsfx-core 1.17.0-rc.2 → 1.17.1-alpha.28543dcd0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (981) hide show

package/build/core/middleware/projectMigrator.js CHANGED Viewed

@@ -14,22 +14,22 @@ const localSettingsProvider_1 = require("../../common/localSettingsProvider");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const os_1 = tslib_1.__importDefault(require("os"));
-const constants_1 = require("../../plugins/solution/fx-solution/constants");
+const constants_1 = require("../../component/constants");
 const projectSettingsLoader_1 = require("./projectSettingsLoader");
-const question_1 = require("../../plugins/solution/fx-solution/question");
-const constants_2 = require("../../common/constants");
-const constants_3 = require("../../component/resource/appManifest/constants");
+const constants_2 = require("../../component/constants");
+const constants_3 = require("../../common/constants");
+const constants_4 = require("../../component/resource/appManifest/constants");
 const utils_1 = require("../../component/resource/appManifest/utils/utils");
 const telemetry_1 = require("../../common/telemetry");
 const dotenv = tslib_1.__importStar(require("dotenv"));
-const constants_4 = require("../../component/resource/spfx/utils/constants");
+const constants_5 = require("../../component/resource/spfx/utils/constants");
 const utils_2 = require("../../component/resource/spfx/utils/utils");
 const localEnvProvider_1 = require("../../common/local/localEnvProvider");
 const globalVars_1 = require("../globalVars");
 const localizeUtils_1 = require("../../common/localizeUtils");
 const utils_3 = require("../../common/utils");
 const typedi_1 = require("typedi");
-const constants_5 = require("../../component/constants");
+const constants_6 = require("../../component/constants");
 const workflow_1 = require("../../component/workflow");
 const utils_4 = require("../../component/utils");
 const lodash_1 = require("lodash");
@@ -37,8 +37,8 @@ const migrate_1 = require("../../component/migrate");
 const projectSettingsHelperV3_1 = require("../../common/projectSettingsHelperV3");
 const programmingLanguage = "programmingLanguage";
 const defaultFunctionName = "defaultFunctionName";
-const learnMoreText = "Learn More";
-const upgradeButton = "Upgrade";
+const learnMoreText = localizeUtils_1.getLocalizedString("core.option.learnMore");
+const upgradeButton = localizeUtils_1.getLocalizedString("core.option.upgrade");
 const solutionName = "solution";
 const subscriptionId = "subscriptionId";
 const resourceGroupName = "resourceGroupName";
@@ -181,11 +181,11 @@ async function getOldProjectInfoForTelemetry(projectPath) {
         const solutionSettings = projectSettings.solutionSettings;
         const hostType = solutionSettings === null || solutionSettings === void 0 ? void 0 : solutionSettings.hostType;
         const result = { [telemetry_1.TelemetryProperty.HostType]: hostType };
-        if (hostType === question_1.HostTypeOptionAzure.id || hostType === question_1.HostTypeOptionSPFx.id) {
+        if (hostType === constants_2.HostTypeOptionAzure.id || hostType === constants_2.HostTypeOptionSPFx.id) {
             result[telemetry_1.TelemetryProperty.ActivePlugins] = JSON.stringify(solutionSettings.activeResourcePlugins);
             result[telemetry_1.TelemetryProperty.Capabilities] = JSON.stringify(solutionSettings.capabilities);
         }
-        if (hostType === question_1.HostTypeOptionAzure.id) {
+        if (hostType === constants_2.HostTypeOptionAzure.id) {
             const azureSolutionSettings = solutionSettings;
             result[telemetry_1.TelemetryProperty.AzureResources] = JSON.stringify(azureSolutionSettings.azureResources);
         }
@@ -231,15 +231,15 @@ async function migrateToArmAndMultiEnv(ctx) {
     await postMigration(projectPath, ctx, inputs, backupFolder);
 }
 async function getManifestPath(fx, projectPath) {
-    if (await fs_extra_1.default.pathExists(path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, constants_3.REMOTE_MANIFEST))) {
-        return path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, constants_3.REMOTE_MANIFEST);
+    if (await fs_extra_1.default.pathExists(path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, constants_4.REMOTE_MANIFEST))) {
+        return path_1.default.join(projectPath, teamsfx_api_1.AppPackageFolderName, constants_4.REMOTE_MANIFEST);
     }
     // 2.3.2<= version <= 2.4.1
-    if (await fs_extra_1.default.pathExists(path_1.default.join(fx, teamsfx_api_1.AppPackageFolderName, constants_3.REMOTE_MANIFEST))) {
-        return path_1.default.join(fx, teamsfx_api_1.AppPackageFolderName, constants_3.REMOTE_MANIFEST);
+    if (await fs_extra_1.default.pathExists(path_1.default.join(fx, teamsfx_api_1.AppPackageFolderName, constants_4.REMOTE_MANIFEST))) {
+        return path_1.default.join(fx, teamsfx_api_1.AppPackageFolderName, constants_4.REMOTE_MANIFEST);
     }
     // 2.0.1 <= version <= 2.3.1
-    return path_1.default.join(fx, constants_3.REMOTE_MANIFEST);
+    return path_1.default.join(fx, constants_4.REMOTE_MANIFEST);
 }
 async function preCheckKeyFiles(projectPath, ctx) {
     const fx = path_1.default.join(projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
@@ -392,8 +392,8 @@ async function copyManifest(projectPath, fx, target) {
     }
     else {
         // version <= 2.3.1
-        await fs_extra_1.default.copy(path_1.default.join(fx, constants_3.REMOTE_MANIFEST), path_1.default.join(target, constants_3.REMOTE_MANIFEST));
-        const manifest = await getManifest(path_1.default.join(target, constants_3.REMOTE_MANIFEST));
+        await fs_extra_1.default.copy(path_1.default.join(fx, constants_4.REMOTE_MANIFEST), path_1.default.join(target, constants_4.REMOTE_MANIFEST));
+        const manifest = await getManifest(path_1.default.join(target, constants_4.REMOTE_MANIFEST));
         const color = (await fs_extra_1.default.pathExists(path_1.default.join(fx, "color.png")))
             ? "color.png"
             : manifest.icons.color;
@@ -415,8 +415,8 @@ async function migrateProjectSettings(projectPath) {
     }
     const projectSettings = loadRes.value;
     if (projectSettingsHelperV3_1.hasAzureResourceV3(projectSettings, true)) {
-        if (!workflow_1.getComponent(projectSettings, constants_5.ComponentNames.Identity)) {
-            projectSettings.components.push({ name: constants_5.ComponentNames.Identity });
+        if (!workflow_1.getComponent(projectSettings, constants_6.ComponentNames.Identity)) {
+            projectSettings.components.push({ name: constants_6.ComponentNames.Identity });
         }
     }
     return projectSettings;
@@ -439,40 +439,40 @@ async function migrateMultiEnv(projectPath, log) {
     const configDev = getConfigDevJson(appName);
     // migrate skipAddingSqlUser
     const envDefault = await fs_extra_1.default.readJson(envDefaultFilePath);
-    if ((_a = envDefault[constants_2.ResourcePlugins.AzureSQL]) === null || _a === void 0 ? void 0 : _a[EnvConfigName.SqlSkipAddingUser]) {
+    if ((_a = envDefault[constants_3.ResourcePlugins.AzureSQL]) === null || _a === void 0 ? void 0 : _a[EnvConfigName.SqlSkipAddingUser]) {
         configDev["skipAddingSqlUser"] =
-            envDefault[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlSkipAddingUser];
+            envDefault[constants_3.ResourcePlugins.AzureSQL][EnvConfigName.SqlSkipAddingUser];
     }
-    if (((_b = envDefault[constants_2.ResourcePlugins.Aad]) === null || _b === void 0 ? void 0 : _b[EnvConfigName.AadSkipProvision]) === "true") {
+    if (((_b = envDefault[constants_3.ResourcePlugins.Aad]) === null || _b === void 0 ? void 0 : _b[EnvConfigName.AadSkipProvision]) === "true") {
         configDev.auth = {};
-        if (envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.OAuthScopeId]) {
+        if (envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.OAuthScopeId]) {
             configDev.auth.accessAsUserScopeId =
-                envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.OAuthScopeId];
+                envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.OAuthScopeId];
         }
-        if (envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.ObjectId]) {
-            configDev.auth.objectId = envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.ObjectId];
+        if (envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.ObjectId]) {
+            configDev.auth.objectId = envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.ObjectId];
         }
-        if (envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.ClientId]) {
-            configDev.auth.clientId = envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.ClientId];
+        if (envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.ClientId]) {
+            configDev.auth.clientId = envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.ClientId];
         }
-        if (envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.ClientSecret]) {
-            await globalState_1.globalStateUpdate(AADClientSecretFlag, envDefault[constants_2.ResourcePlugins.Aad][EnvConfigName.ClientSecret]);
+        if (envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.ClientSecret]) {
+            await globalState_1.globalStateUpdate(AADClientSecretFlag, envDefault[constants_3.ResourcePlugins.Aad][EnvConfigName.ClientSecret]);
             configDev.auth.clientSecret = AadSecret;
         }
     }
     await fs_extra_1.default.writeFile(configDevJsonFilePath, JSON.stringify(configDev, null, 4));
     // appPackage
     await copyManifest(projectPath, fx, templateAppPackage);
-    const sourceManifestFile = path_1.default.join(templateAppPackage, constants_3.REMOTE_MANIFEST);
+    const sourceManifestFile = path_1.default.join(templateAppPackage, constants_4.REMOTE_MANIFEST);
     const manifest = await getManifest(sourceManifestFile);
     await fs_extra_1.default.remove(sourceManifestFile);
     // generate manifest.remote.template.json
-    const targetRemoteManifestFile = path_1.default.join(templateAppPackage, constants_3.MANIFEST_TEMPLATE);
+    const targetRemoteManifestFile = path_1.default.join(templateAppPackage, constants_4.MANIFEST_TEMPLATE);
     const remoteManifest = await generateRemoteTemplate(JSON.stringify(manifest));
     await fs_extra_1.default.writeFile(targetRemoteManifestFile, JSON.stringify(remoteManifest, null, 4));
     // generate manifest.local.template.json
     const localManifest = await generateLocalTemplate(JSON.stringify(manifest), isSPFx, log);
-    const targetLocalManifestFile = path_1.default.join(templateAppPackage, constants_3.MANIFEST_LOCAL);
+    const targetLocalManifestFile = path_1.default.join(templateAppPackage, constants_4.MANIFEST_LOCAL);
     await fs_extra_1.default.writeFile(targetLocalManifestFile, JSON.stringify(localManifest, null, 4));
     if (isSPFx) {
         const replaceMap = new Map();
@@ -481,8 +481,8 @@ async function migrateMultiEnv(projectPath, log) {
             throw error_1.SPFxConfigError(packageSolutionFile);
         }
         const solutionConfig = await fs_extra_1.default.readJson(packageSolutionFile);
-        replaceMap.set(constants_4.PlaceHolders.componentId, solutionConfig.solution.id);
-        replaceMap.set(constants_4.PlaceHolders.componentNameUnescaped, localManifest.packageName);
+        replaceMap.set(constants_5.PlaceHolders.componentId, solutionConfig.solution.id);
+        replaceMap.set(constants_5.PlaceHolders.componentNameUnescaped, localManifest.packageName);
         await utils_2.Utils.configure(targetLocalManifestFile, replaceMap);
     }
     // state.dev.json / dev.userdata
@@ -564,8 +564,8 @@ async function queryProjectStatus(fx) {
     const hasFrontend = projectSettingsHelperV3_1.hasAzureTab(settingsV3);
     const hasBackend = projectSettingsHelperV3_1.hasApi(settingsV3);
     const hasBot = projectSettingsHelperV3_1.hasBot(settingsV3);
-    const hasBotCapability = settings.solutionSettings.capabilities.includes(question_1.BotOptionItem.id);
-    const hasMessageExtensionCapability = settings.solutionSettings.capabilities.includes(question_1.MessageExtensionItem.id);
+    const hasBotCapability = settings.solutionSettings.capabilities.includes(constants_2.BotOptionItem.id);
+    const hasMessageExtensionCapability = settings.solutionSettings.capabilities.includes(constants_2.MessageExtensionItem.id);
     const isSPFx = projectSettingsHelperV3_1.hasSPFxTab(settingsV3);
     const hasProvision = (_a = envDefaultJson.solution) === null || _a === void 0 ? void 0 : _a.provisionSucceeded;
     return {
@@ -648,7 +648,7 @@ async function removeOldProjectFiles(projectPath) {
     // version <= 2.4.1, remove .fx/appPackage.
     await fs_extra_1.default.remove(path_1.default.join(fx, teamsfx_api_1.AppPackageFolderName));
     // version <= 3.2.1
-    await fs_extra_1.default.remove(path_1.default.join(fx, constants_3.REMOTE_MANIFEST));
+    await fs_extra_1.default.remove(path_1.default.join(fx, constants_4.REMOTE_MANIFEST));
     await fs_extra_1.default.remove(path_1.default.join(fx, "color.png"));
     await fs_extra_1.default.remove(path_1.default.join(fx, "outline.png"));
 }
@@ -705,9 +705,9 @@ async function updateConfig(ctx) {
     const inputs = ctx.arguments[ctx.arguments.length - 1];
     const fx = path_1.default.join(inputs.projectPath, `.${teamsfx_api_1.ConfigFolderName}`);
     const envConfig = await fs_extra_1.default.readJson(path_1.default.join(fx, "env.default.json"));
-    if (envConfig[constants_2.ResourcePlugins.Bot]) {
-        delete envConfig[constants_2.ResourcePlugins.Bot];
-        envConfig[constants_2.ResourcePlugins.Bot] = { wayToRegisterBot: "create-new" };
+    if (envConfig[constants_3.ResourcePlugins.Bot]) {
+        delete envConfig[constants_3.ResourcePlugins.Bot];
+        envConfig[constants_3.ResourcePlugins.Bot] = { wayToRegisterBot: "create-new" };
         envConfig.solution.provisionSucceeded = false;
     }
     let needUpdate = false;
@@ -716,43 +716,43 @@ async function updateConfig(ctx) {
         configPrefix = `/subscriptions/${envConfig[solutionName][subscriptionId]}/resourcegroups/${envConfig[solutionName][resourceGroupName]}`;
         needUpdate = true;
     }
-    if (needUpdate && ((_a = envConfig[constants_2.ResourcePlugins.FrontendHosting]) === null || _a === void 0 ? void 0 : _a[EnvConfigName.StorageName])) {
-        envConfig[constants_2.ResourcePlugins.FrontendHosting][EnvConfigName.StorageResourceId] = `${configPrefix}/providers/Microsoft.Storage/storageAccounts/${envConfig[constants_2.ResourcePlugins.FrontendHosting][EnvConfigName.StorageName]}`;
+    if (needUpdate && ((_a = envConfig[constants_3.ResourcePlugins.FrontendHosting]) === null || _a === void 0 ? void 0 : _a[EnvConfigName.StorageName])) {
+        envConfig[constants_3.ResourcePlugins.FrontendHosting][EnvConfigName.StorageResourceId] = `${configPrefix}/providers/Microsoft.Storage/storageAccounts/${envConfig[constants_3.ResourcePlugins.FrontendHosting][EnvConfigName.StorageName]}`;
     }
-    if (needUpdate && ((_b = envConfig[constants_2.ResourcePlugins.AzureSQL]) === null || _b === void 0 ? void 0 : _b[EnvConfigName.SqlEndpoint])) {
-        envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlResourceId] = `${configPrefix}/providers/Microsoft.Sql/servers/${envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlEndpoint].split(".database.windows.net")[0]}`;
+    if (needUpdate && ((_b = envConfig[constants_3.ResourcePlugins.AzureSQL]) === null || _b === void 0 ? void 0 : _b[EnvConfigName.SqlEndpoint])) {
+        envConfig[constants_3.ResourcePlugins.AzureSQL][EnvConfigName.SqlResourceId] = `${configPrefix}/providers/Microsoft.Sql/servers/${envConfig[constants_3.ResourcePlugins.AzureSQL][EnvConfigName.SqlEndpoint].split(".database.windows.net")[0]}`;
     }
-    if (needUpdate && ((_c = envConfig[constants_2.ResourcePlugins.Function]) === null || _c === void 0 ? void 0 : _c[EnvConfigName.FuncAppName])) {
-        envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.FunctionAppResourceId] = `${configPrefix}/providers/Microsoft.Web/sites/${envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.FuncAppName]}`;
-        delete envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.FuncAppName];
-        if (envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.StorageAccountName]) {
-            delete envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.StorageAccountName];
+    if (needUpdate && ((_c = envConfig[constants_3.ResourcePlugins.Function]) === null || _c === void 0 ? void 0 : _c[EnvConfigName.FuncAppName])) {
+        envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.FunctionAppResourceId] = `${configPrefix}/providers/Microsoft.Web/sites/${envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.FuncAppName]}`;
+        delete envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.FuncAppName];
+        if (envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.StorageAccountName]) {
+            delete envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.StorageAccountName];
         }
-        if (envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.AppServicePlanName]) {
-            delete envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.AppServicePlanName];
+        if (envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.AppServicePlanName]) {
+            delete envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.AppServicePlanName];
         }
     }
-    if (needUpdate && ((_d = envConfig[constants_2.ResourcePlugins.Identity]) === null || _d === void 0 ? void 0 : _d[EnvConfigName.Identity])) {
-        envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityResourceId] = `${configPrefix}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.Identity]}`;
-        envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityName] =
-            envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.Identity];
-        delete envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.Identity];
+    if (needUpdate && ((_d = envConfig[constants_3.ResourcePlugins.Identity]) === null || _d === void 0 ? void 0 : _d[EnvConfigName.Identity])) {
+        envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.IdentityResourceId] = `${configPrefix}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/${envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.Identity]}`;
+        envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.IdentityName] =
+            envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.Identity];
+        delete envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.Identity];
     }
-    if (needUpdate && ((_e = envConfig[constants_2.ResourcePlugins.Identity]) === null || _e === void 0 ? void 0 : _e[EnvConfigName.IdentityId])) {
-        envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityClientId] =
-            envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityId];
-        delete envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityId];
+    if (needUpdate && ((_e = envConfig[constants_3.ResourcePlugins.Identity]) === null || _e === void 0 ? void 0 : _e[EnvConfigName.IdentityId])) {
+        envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.IdentityClientId] =
+            envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.IdentityId];
+        delete envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.IdentityId];
     }
-    if (needUpdate && ((_f = envConfig[constants_2.ResourcePlugins.Apim]) === null || _f === void 0 ? void 0 : _f[EnvConfigName.ServiceName])) {
-        envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ServiceResourceId] = `${configPrefix}/providers/Microsoft.ApiManagement/service/${envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ServiceName]}`;
-        delete envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ServiceName];
-        if ((_g = envConfig[constants_2.ResourcePlugins.Apim]) === null || _g === void 0 ? void 0 : _g[EnvConfigName.ProductId]) {
-            envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ProductResourceId] = `${envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ServiceResourceId]}/products/${envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ProductId]}`;
-            delete envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ProductId];
+    if (needUpdate && ((_f = envConfig[constants_3.ResourcePlugins.Apim]) === null || _f === void 0 ? void 0 : _f[EnvConfigName.ServiceName])) {
+        envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ServiceResourceId] = `${configPrefix}/providers/Microsoft.ApiManagement/service/${envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ServiceName]}`;
+        delete envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ServiceName];
+        if ((_g = envConfig[constants_3.ResourcePlugins.Apim]) === null || _g === void 0 ? void 0 : _g[EnvConfigName.ProductId]) {
+            envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ProductResourceId] = `${envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ServiceResourceId]}/products/${envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ProductId]}`;
+            delete envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ProductId];
         }
-        if ((_h = envConfig[constants_2.ResourcePlugins.Apim]) === null || _h === void 0 ? void 0 : _h[EnvConfigName.OAuthServerId]) {
-            envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.AuthServerResourceId] = `${envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.ServiceResourceId]}/authorizationServers/${envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.OAuthServerId]}`;
-            delete envConfig[constants_2.ResourcePlugins.Apim][EnvConfigName.OAuthServerId];
+        if ((_h = envConfig[constants_3.ResourcePlugins.Apim]) === null || _h === void 0 ? void 0 : _h[EnvConfigName.OAuthServerId]) {
+            envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.AuthServerResourceId] = `${envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.ServiceResourceId]}/authorizationServers/${envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.OAuthServerId]}`;
+            delete envConfig[constants_3.ResourcePlugins.Apim][EnvConfigName.OAuthServerId];
         }
     }
     await fs_extra_1.default.writeFile(path_1.default.join(fx, "new.env.default.json"), JSON.stringify(envConfig, null, 4));
@@ -769,14 +769,14 @@ async function generateBicepsV3(projectSettings, inputs) {
     const context = utils_4.createContextV3(projectSettings);
     // teams-tab
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.TeamsTab);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.TeamsTab);
         if (config) {
-            const hosting = config.hosting || constants_5.ComponentNames.AzureStorage;
+            const hosting = config.hosting || constants_6.ComponentNames.AzureStorage;
             const hostingComponent = typedi_1.Container.get(hosting);
             const clonedInputs = lodash_1.cloneDeep(inputs);
             lodash_1.assign(clonedInputs, {
-                componentId: constants_5.ComponentNames.TeamsTab,
-                scenario: constants_5.Scenarios.Tab,
+                componentId: constants_6.ComponentNames.TeamsTab,
+                scenario: constants_6.Scenarios.Tab,
             });
             const res = await hostingComponent.generateBicep(context, clonedInputs);
             if (res.isErr())
@@ -786,16 +786,16 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // teams-bot
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.TeamsBot);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.TeamsBot);
         if (config) {
             // bot hosting
-            const hosting = config.hosting || constants_5.ComponentNames.AzureWebApp;
+            const hosting = config.hosting || constants_6.ComponentNames.AzureWebApp;
             {
                 const hostingComponent = typedi_1.Container.get(hosting);
                 const clonedInputs = lodash_1.cloneDeep(inputs);
                 lodash_1.assign(clonedInputs, {
-                    componentId: constants_5.ComponentNames.TeamsBot,
-                    scenario: constants_5.Scenarios.Bot,
+                    componentId: constants_6.ComponentNames.TeamsBot,
+                    scenario: constants_6.Scenarios.Bot,
                 });
                 const res = await hostingComponent.generateBicep(context, clonedInputs);
                 if (res.isErr())
@@ -807,9 +807,9 @@ async function generateBicepsV3(projectSettings, inputs) {
                 const clonedInputs = lodash_1.cloneDeep(inputs);
                 lodash_1.assign(clonedInputs, {
                     hosting: hosting,
-                    scenario: constants_5.Scenarios.Bot,
+                    scenario: constants_6.Scenarios.Bot,
                 });
-                const botService = typedi_1.Container.get(constants_5.ComponentNames.BotService);
+                const botService = typedi_1.Container.get(constants_6.ComponentNames.BotService);
                 const res = await botService.generateBicep(context, clonedInputs);
                 if (res.isErr())
                     return teamsfx_api_1.err(res.error);
@@ -819,15 +819,15 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // teams-api
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.TeamsApi);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.TeamsApi);
         if (config) {
             const clonedInputs = lodash_1.cloneDeep(inputs);
             lodash_1.assign(clonedInputs, {
-                componentId: constants_5.ComponentNames.TeamsApi,
-                hosting: constants_5.ComponentNames.Function,
-                scenario: constants_5.Scenarios.Api,
+                componentId: constants_6.ComponentNames.TeamsApi,
+                hosting: constants_6.ComponentNames.Function,
+                scenario: constants_6.Scenarios.Api,
             });
-            const functionComponent = typedi_1.Container.get(constants_5.ComponentNames.Function);
+            const functionComponent = typedi_1.Container.get(constants_6.ComponentNames.Function);
             const res = await functionComponent.generateBicep(context, clonedInputs);
             if (res.isErr())
                 return teamsfx_api_1.err(res.error);
@@ -836,14 +836,14 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // identity
     {
-        const identity = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.Identity);
+        const identity = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.Identity);
         if (identity) {
             const clonedInputs = lodash_1.cloneDeep(inputs);
             lodash_1.assign(clonedInputs, {
                 componentId: "",
                 scenario: "",
             });
-            const identityComponent = typedi_1.Container.get(constants_5.ComponentNames.Identity);
+            const identityComponent = typedi_1.Container.get(constants_6.ComponentNames.Identity);
             const res = await identityComponent.generateBicep(context, clonedInputs);
             if (res.isErr())
                 return teamsfx_api_1.err(res.error);
@@ -852,9 +852,9 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // apim
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.APIM);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.APIM);
         if (config) {
-            const resource = typedi_1.Container.get(constants_5.ComponentNames.APIM);
+            const resource = typedi_1.Container.get(constants_6.ComponentNames.APIM);
             const res = await resource.generateBicep(context, inputs);
             if (res.isErr())
                 return teamsfx_api_1.err(res.error);
@@ -863,9 +863,9 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // keyvault
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.KeyVault);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.KeyVault);
         if (config) {
-            const resource = typedi_1.Container.get(constants_5.ComponentNames.KeyVault);
+            const resource = typedi_1.Container.get(constants_6.ComponentNames.KeyVault);
             const res = await resource.generateBicep(context, inputs);
             if (res.isErr())
                 return teamsfx_api_1.err(res.error);
@@ -874,12 +874,12 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // sql
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.AzureSQL);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.AzureSQL);
         if (config) {
             const provisionType = "server";
             const clonedInputs = lodash_1.cloneDeep(inputs);
             clonedInputs.provisionType = provisionType;
-            const sqlResource = typedi_1.Container.get(constants_5.ComponentNames.AzureSQL);
+            const sqlResource = typedi_1.Container.get(constants_6.ComponentNames.AzureSQL);
             const res = await sqlResource.generateBicep(context, clonedInputs);
             if (res.isErr())
                 return teamsfx_api_1.err(res.error);
@@ -888,9 +888,9 @@ async function generateBicepsV3(projectSettings, inputs) {
     }
     // aad
     {
-        const config = workflow_1.getComponent(projectSettings, constants_5.ComponentNames.AadApp);
+        const config = workflow_1.getComponent(projectSettings, constants_6.ComponentNames.AadApp);
         if (config) {
-            const aadApp = typedi_1.Container.get(constants_5.ComponentNames.AadApp);
+            const aadApp = typedi_1.Container.get(constants_6.ComponentNames.AadApp);
             const res = await aadApp.generateBicep(context, inputs);
             if (res.isErr())
                 return teamsfx_api_1.err(res.error);
@@ -941,71 +941,71 @@ async function generateArmParameterJson(ctx) {
     const targetJson = await fs_extra_1.default.readJson(path_1.default.join(fxConfig, parameterEnvFileName));
     const parameterObj = targetJson["parameters"]["provisionParameters"]["value"];
     // frontend hosting
-    if ((_a = envConfig[constants_2.ResourcePlugins.FrontendHosting]) === null || _a === void 0 ? void 0 : _a[EnvConfigName.StorageName]) {
+    if ((_a = envConfig[constants_3.ResourcePlugins.FrontendHosting]) === null || _a === void 0 ? void 0 : _a[EnvConfigName.StorageName]) {
         parameterObj[ArmParameters.FEStorageName] =
-            envConfig[constants_2.ResourcePlugins.FrontendHosting][EnvConfigName.StorageName];
+            envConfig[constants_3.ResourcePlugins.FrontendHosting][EnvConfigName.StorageName];
     }
     // manage identity
-    if ((_b = envConfig[constants_2.ResourcePlugins.Identity]) === null || _b === void 0 ? void 0 : _b[EnvConfigName.Identity]) {
+    if ((_b = envConfig[constants_3.ResourcePlugins.Identity]) === null || _b === void 0 ? void 0 : _b[EnvConfigName.Identity]) {
         // Teams Toolkit <= 2.7
         parameterObj[ArmParameters.IdentityName] =
-            envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.Identity];
+            envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.Identity];
     }
-    else if ((_c = envConfig[constants_2.ResourcePlugins.Identity]) === null || _c === void 0 ? void 0 : _c[EnvConfigName.IdentityName]) {
+    else if ((_c = envConfig[constants_3.ResourcePlugins.Identity]) === null || _c === void 0 ? void 0 : _c[EnvConfigName.IdentityName]) {
         // Teams Toolkit >= 2.8
         parameterObj[ArmParameters.IdentityName] =
-            envConfig[constants_2.ResourcePlugins.Identity][EnvConfigName.IdentityName];
+            envConfig[constants_3.ResourcePlugins.Identity][EnvConfigName.IdentityName];
     }
     // azure SQL
-    if ((_d = envConfig[constants_2.ResourcePlugins.AzureSQL]) === null || _d === void 0 ? void 0 : _d[EnvConfigName.SqlEndpoint]) {
+    if ((_d = envConfig[constants_3.ResourcePlugins.AzureSQL]) === null || _d === void 0 ? void 0 : _d[EnvConfigName.SqlEndpoint]) {
         parameterObj[ArmParameters.SQLServer] =
-            envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlEndpoint].split(".database.windows.net")[0];
+            envConfig[constants_3.ResourcePlugins.AzureSQL][EnvConfigName.SqlEndpoint].split(".database.windows.net")[0];
     }
-    if ((_e = envConfig[constants_2.ResourcePlugins.AzureSQL]) === null || _e === void 0 ? void 0 : _e[EnvConfigName.SqlDataBase]) {
+    if ((_e = envConfig[constants_3.ResourcePlugins.AzureSQL]) === null || _e === void 0 ? void 0 : _e[EnvConfigName.SqlDataBase]) {
         parameterObj[ArmParameters.SQLDatabase] =
-            envConfig[constants_2.ResourcePlugins.AzureSQL][EnvConfigName.SqlDataBase];
+            envConfig[constants_3.ResourcePlugins.AzureSQL][EnvConfigName.SqlDataBase];
     }
     // SimpleAuth
-    if ((_f = envConfig[constants_2.ResourcePlugins.SimpleAuth]) === null || _f === void 0 ? void 0 : _f[EnvConfigName.SkuName]) {
+    if ((_f = envConfig[constants_3.ResourcePlugins.SimpleAuth]) === null || _f === void 0 ? void 0 : _f[EnvConfigName.SkuName]) {
         parameterObj[ArmParameters.SimpleAuthSku] =
-            envConfig[constants_2.ResourcePlugins.SimpleAuth][EnvConfigName.SkuName];
+            envConfig[constants_3.ResourcePlugins.SimpleAuth][EnvConfigName.SkuName];
     }
-    if ((_g = envConfig[constants_2.ResourcePlugins.SimpleAuth]) === null || _g === void 0 ? void 0 : _g[EnvConfigName.Endpoint]) {
-        const simpleAuthHost = new URL((_h = envConfig[constants_2.ResourcePlugins.SimpleAuth]) === null || _h === void 0 ? void 0 : _h[EnvConfigName.Endpoint])
+    if ((_g = envConfig[constants_3.ResourcePlugins.SimpleAuth]) === null || _g === void 0 ? void 0 : _g[EnvConfigName.Endpoint]) {
+        const simpleAuthHost = new URL((_h = envConfig[constants_3.ResourcePlugins.SimpleAuth]) === null || _h === void 0 ? void 0 : _h[EnvConfigName.Endpoint])
             .hostname;
         const simpleAuthName = simpleAuthHost.split(".")[0];
         parameterObj[ArmParameters.SimpleAuthWebAppName] = parameterObj[ArmParameters.SimpleAuthServerFarm] = simpleAuthName;
     }
     // Function
-    if ((_j = envConfig[constants_2.ResourcePlugins.Function]) === null || _j === void 0 ? void 0 : _j[EnvConfigName.AppServicePlanName]) {
+    if ((_j = envConfig[constants_3.ResourcePlugins.Function]) === null || _j === void 0 ? void 0 : _j[EnvConfigName.AppServicePlanName]) {
         parameterObj[ArmParameters.functionServerName] =
-            envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.AppServicePlanName];
+            envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.AppServicePlanName];
     }
-    if ((_k = envConfig[constants_2.ResourcePlugins.Function]) === null || _k === void 0 ? void 0 : _k[EnvConfigName.StorageAccountName]) {
+    if ((_k = envConfig[constants_3.ResourcePlugins.Function]) === null || _k === void 0 ? void 0 : _k[EnvConfigName.StorageAccountName]) {
         parameterObj[ArmParameters.functionStorageName] =
-            envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.StorageAccountName];
+            envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.StorageAccountName];
     }
-    if ((_l = envConfig[constants_2.ResourcePlugins.Function]) === null || _l === void 0 ? void 0 : _l[EnvConfigName.FuncAppName]) {
+    if ((_l = envConfig[constants_3.ResourcePlugins.Function]) === null || _l === void 0 ? void 0 : _l[EnvConfigName.FuncAppName]) {
         parameterObj[ArmParameters.functionAppName] =
-            envConfig[constants_2.ResourcePlugins.Function][EnvConfigName.FuncAppName];
+            envConfig[constants_3.ResourcePlugins.Function][EnvConfigName.FuncAppName];
     }
     // Bot
-    if ((_m = envConfig[constants_2.ResourcePlugins.Bot]) === null || _m === void 0 ? void 0 : _m[EnvConfigName.SkuName]) {
+    if ((_m = envConfig[constants_3.ResourcePlugins.Bot]) === null || _m === void 0 ? void 0 : _m[EnvConfigName.SkuName]) {
         parameterObj[ArmParameters.botWebAppSku] =
-            (_o = envConfig[constants_2.ResourcePlugins.Bot]) === null || _o === void 0 ? void 0 : _o[EnvConfigName.SkuName];
+            (_o = envConfig[constants_3.ResourcePlugins.Bot]) === null || _o === void 0 ? void 0 : _o[EnvConfigName.SkuName];
     }
     // Apim
-    if ((_p = envConfig[constants_2.ResourcePlugins.Apim]) === null || _p === void 0 ? void 0 : _p[EnvConfigName.ServiceName]) {
+    if ((_p = envConfig[constants_3.ResourcePlugins.Apim]) === null || _p === void 0 ? void 0 : _p[EnvConfigName.ServiceName]) {
         parameterObj[ArmParameters.ApimServiceName] =
-            (_q = envConfig[constants_2.ResourcePlugins.Apim]) === null || _q === void 0 ? void 0 : _q[EnvConfigName.ServiceName];
+            (_q = envConfig[constants_3.ResourcePlugins.Apim]) === null || _q === void 0 ? void 0 : _q[EnvConfigName.ServiceName];
     }
-    if ((_r = envConfig[constants_2.ResourcePlugins.Apim]) === null || _r === void 0 ? void 0 : _r[EnvConfigName.ProductId]) {
+    if ((_r = envConfig[constants_3.ResourcePlugins.Apim]) === null || _r === void 0 ? void 0 : _r[EnvConfigName.ProductId]) {
         parameterObj[ArmParameters.ApimProductName] =
-            (_s = envConfig[constants_2.ResourcePlugins.Apim]) === null || _s === void 0 ? void 0 : _s[EnvConfigName.ProductId];
+            (_s = envConfig[constants_3.ResourcePlugins.Apim]) === null || _s === void 0 ? void 0 : _s[EnvConfigName.ProductId];
     }
-    if ((_t = envConfig[constants_2.ResourcePlugins.Apim]) === null || _t === void 0 ? void 0 : _t[EnvConfigName.OAuthServerId]) {
+    if ((_t = envConfig[constants_3.ResourcePlugins.Apim]) === null || _t === void 0 ? void 0 : _t[EnvConfigName.OAuthServerId]) {
         parameterObj[ArmParameters.ApimOauthServerName] =
-            (_u = envConfig[constants_2.ResourcePlugins.Apim]) === null || _u === void 0 ? void 0 : _u[EnvConfigName.OAuthServerId];
+            (_u = envConfig[constants_3.ResourcePlugins.Apim]) === null || _u === void 0 ? void 0 : _u[EnvConfigName.OAuthServerId];
     }
     await fs_extra_1.default.writeFile(path_1.default.join(fxConfig, parameterEnvFileName), JSON.stringify(targetJson, null, 4));
 }