@microsoft/teamsfx-core 2.0.2-alpha.0fc621c97.0 → 2.0.2-alpha.21023e5be.0

package/build/component/{resource/appManifest → driver/teamsApp}/utils/ManifestUtils.js

@@ -1,32 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.manifestUtils = exports.getManifestTemplatePath = exports.resolveManifestTemplate = exports.ManifestUtils = void 0;
+exports.manifestUtils = exports.resolveManifestTemplate = exports.ManifestUtils = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const lodash_1 = require("lodash");
+const mustache_1 = tslib_1.__importDefault(require("mustache"));
 const path = tslib_1.__importStar(require("path"));
-const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
-const uuid_1 = require("uuid");
 require("reflect-metadata");
 const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
-const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
-const utils_1 = require("../../../../common/utils");
+const uuid_1 = require("uuid");
+const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
+const tools_1 = require("../../../../common/tools");
+const common_1 = require("../../../../error/common");
+const constants_1 = require("../../../constants");
 const migrate_1 = require("../../../migrate");
+const common_2 = require("../../../utils/common");
+const constants_2 = require("../constants");
 const errors_1 = require("../errors");
 const results_1 = require("../results");
-const lodash_1 = require("lodash");
-const constants_1 = require("../constants");
-const constants_2 = require("../../../constants");
-const utils_2 = require("./utils");
 const telemetry_1 = require("./telemetry");
-const mustache_1 = tslib_1.__importDefault(require("mustache"));
-const constants_3 = require("../../../constants");
-const tools_1 = require("../../../../common/tools");
-const projectSettingsHelperV3_1 = require("../../../../common/projectSettingsHelperV3");
-const common_1 = require("../../../utils/common");
-const common_2 = require("../../../../error/common");
+const utils_1 = require("./utils");
 class ManifestUtils {
     async readAppManifest(projectPath) {
         const filePath = await this.getTeamsAppManifestPath(projectPath);
@@ -34,7 +31,7 @@ class ManifestUtils {
     }
     async _readAppManifest(manifestTemplatePath) {
         if (!(await fs_extra_1.default.pathExists(manifestTemplatePath))) {
-            return teamsfx_api_1.err(new common_2.FileNotFoundError("teamsApp", manifestTemplatePath));
+            return teamsfx_api_1.err(new common_1.FileNotFoundError("teamsApp", manifestTemplatePath));
         }
         // Be compatible with UTF8-BOM encoding
         // Avoid Unexpected token error at JSON.parse()
@@ -44,10 +41,6 @@ class ManifestUtils {
         const manifest = JSON.parse(contentV3);
         return teamsfx_api_1.ok(manifest);
     }
-    async writeAppManifest(appManifest, projectPath) {
-        const filePath = await this.getTeamsAppManifestPath(projectPath);
-        return await this._writeAppManifest(appManifest, filePath);
-    }
     async _writeAppManifest(appManifest, manifestTemplatePath) {
         const content = JSON.stringify(appManifest, undefined, 4);
         const contentV2 = migrate_1.convertManifestTemplateToV2(content);
@@ -55,21 +48,12 @@ class ManifestUtils {
         return teamsfx_api_1.ok(undefined);
     }
     async getTeamsAppManifestPath(projectPath) {
-        const templateFolder = await utils_1.getProjectTemplatesFolderPath(projectPath);
-        const filePath = tools_1.isV3Enabled()
-            ? path.join(projectPath, "appPackage", "manifest.json")
-            : path.join(templateFolder, "appPackage", "manifest.template.json");
+        const filePath = path.join(projectPath, "appPackage", "manifest.json");
         return filePath;
     }
     async addCapabilities(inputs, capabilities, isM365 = false) {
         var _a, _b, _c, _d;
-        let appManifestRes;
-        if (tools_1.isV3Enabled()) {
-            appManifestRes = await this._readAppManifest(inputs["addManifestPath"]);
-        }
-        else {
-            appManifestRes = await this.readAppManifest(inputs.projectPath);
-        }
+        const appManifestRes = await this._readAppManifest(inputs["addManifestPath"]);
         if (appManifestRes.isErr())
             return teamsfx_api_1.err(appManifestRes.error);
         const appManifest = appManifestRes.value;
@@ -87,14 +71,14 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            const template = lodash_1.cloneDeep(constants_1.STATIC_TABS_TPL_EXISTING_APP[0]);
+                            const template = lodash_1.cloneDeep(constants_2.STATIC_TABS_TPL_EXISTING_APP[0]);
                             template.entityId = "index" + staticTabIndex;
                             appManifest.staticTabs.push(template);
                         }
                         else {
-                            const tabManifest = inputs.features === constants_2.DashboardOptionItem().id
-                                ? constants_1.STATIC_TABS_TPL_V3[1]
-                                : constants_1.STATIC_TABS_TPL_V3[0];
+                            const tabManifest = inputs.features === constants_1.DashboardOptionItem().id
+                                ? constants_2.STATIC_TABS_TPL_V3[1]
+                                : constants_2.STATIC_TABS_TPL_V3[0];
                             const template = lodash_1.cloneDeep(tabManifest);
                             template.entityId = "index" + staticTabIndex;
                             appManifest.staticTabs.push(template);
@@ -109,11 +93,11 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            appManifest.configurableTabs = appManifest.configurableTabs.concat(constants_1.CONFIGURABLE_TABS_TPL_EXISTING_APP);
+                            appManifest.configurableTabs = appManifest.configurableTabs.concat(constants_2.CONFIGURABLE_TABS_TPL_EXISTING_APP);
                         }
                         else {
                             appManifest.configurableTabs =
-                                appManifest.configurableTabs.concat(constants_1.CONFIGURABLE_TABS_TPL_V3);
+                                appManifest.configurableTabs.concat(constants_2.CONFIGURABLE_TABS_TPL_V3);
                         }
                     }
                     break;
@@ -124,46 +108,46 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_EXISTING_APP);
+                            appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_EXISTING_APP);
                         }
                         else {
                             // import CoreQuestionNames introduces dependency cycle and breaks the whole program
                             // inputs[CoreQuestionNames.Features]
                             if (inputs.features) {
                                 const feature = inputs.features;
-                                if (feature === constants_2.CommandAndResponseOptionItem().id ||
-                                    feature == constants_2.WorkflowOptionItem().id) {
+                                if (feature === constants_1.CommandAndResponseOptionItem().id ||
+                                    feature == constants_1.WorkflowOptionItem().id) {
                                     // command and response bot or workflow bot
-                                    appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_FOR_COMMAND_AND_RESPONSE_V3);
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_COMMAND_AND_RESPONSE_V3);
                                 }
-                                else if (feature === constants_2.NotificationOptionItem().id) {
+                                else if (feature === constants_1.NotificationOptionItem().id) {
                                     // notification
-                                    appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_FOR_NOTIFICATION_V3);
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_NOTIFICATION_V3);
                                 }
                                 else {
                                     // legacy bot
-                                    appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_V3);
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_V3);
                                 }
                             }
                             else if (inputs.scenarios) {
                                 const scenariosRaw = inputs.scenarios;
                                 const scenarios = Array.isArray(scenariosRaw) ? scenariosRaw : [];
-                                if (scenarios.includes(constants_2.BotScenario.CommandAndResponseBot) ||
-                                    scenarios.includes(constants_2.BotScenario.WorkflowBot)) {
+                                if (scenarios.includes(constants_1.BotScenario.CommandAndResponseBot) ||
+                                    scenarios.includes(constants_1.BotScenario.WorkflowBot)) {
                                     // command and response bot or workflow bot
-                                    appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_FOR_COMMAND_AND_RESPONSE_V3);
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_COMMAND_AND_RESPONSE_V3);
                                 }
-                                else if (scenarios.includes(constants_2.BotScenario.NotificationBot)) {
+                                else if (scenarios.includes(constants_1.BotScenario.NotificationBot)) {
                                     // notification
-                                    appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_FOR_NOTIFICATION_V3);
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_NOTIFICATION_V3);
                                 }
                                 else {
                                     // legacy bot
-                                    appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_V3);
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_V3);
                                 }
                             }
                             else {
-                                appManifest.bots = appManifest.bots.concat(constants_1.BOTS_TPL_V3);
+                                appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_V3);
                             }
                         }
                     }
@@ -175,10 +159,10 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            appManifest.composeExtensions = appManifest.composeExtensions.concat(constants_1.COMPOSE_EXTENSIONS_TPL_EXISTING_APP);
+                            appManifest.composeExtensions = appManifest.composeExtensions.concat(constants_2.COMPOSE_EXTENSIONS_TPL_EXISTING_APP);
                         }
                         else {
-                            appManifest.composeExtensions = appManifest.composeExtensions.concat(isM365 ? constants_1.COMPOSE_EXTENSIONS_TPL_M365_V3 : constants_1.COMPOSE_EXTENSIONS_TPL_V3);
+                            appManifest.composeExtensions = appManifest.composeExtensions.concat(isM365 ? constants_2.COMPOSE_EXTENSIONS_TPL_M365_V3 : constants_2.COMPOSE_EXTENSIONS_TPL_V3);
                         }
                     }
                     break;
@@ -187,7 +171,7 @@ class ManifestUtils {
                         appManifest.webApplicationInfo = capability.snippet;
                     }
                     else {
-                        appManifest.webApplicationInfo = constants_1.WEB_APPLICATION_INFO_V3;
+                        appManifest.webApplicationInfo = constants_2.WEB_APPLICATION_INFO_V3;
                     }
                     break;
             }
@@ -195,130 +179,15 @@ class ManifestUtils {
         if (inputs.validDomain && !((_c = appManifest.validDomains) === null || _c === void 0 ? void 0 : _c.includes(inputs.validDomain))) {
             (_d = appManifest.validDomains) === null || _d === void 0 ? void 0 : _d.push(inputs.validDomain);
         }
-        if (tools_1.isV3Enabled()) {
-            const content = JSON.stringify(appManifest, undefined, 4);
-            const contentV2 = migrate_1.convertManifestTemplateToV2(content);
-            await fs_extra_1.default.writeFile(inputs["addManifestPath"], contentV2);
-        }
-        else {
-            const writeRes = await this.writeAppManifest(appManifest, inputs.projectPath);
-            if (writeRes.isErr())
-                return teamsfx_api_1.err(writeRes.error);
-        }
-        return teamsfx_api_1.ok(undefined);
-    }
-    async updateCapability(projectPath, capability) {
-        var _a;
-        const appManifestRes = await this.readAppManifest(projectPath);
-        if (appManifestRes.isErr())
-            return teamsfx_api_1.err(appManifestRes.error);
-        const manifest = appManifestRes.value;
-        switch (capability.name) {
-            case "staticTab":
-                // find the corresponding static Tab with entity id
-                const entityId = capability.snippet.entityId;
-                const index = (_a = manifest.staticTabs) === null || _a === void 0 ? void 0 : _a.map((x) => x.entityId).indexOf(entityId);
-                if (index !== undefined && index !== -1) {
-                    manifest.staticTabs[index] = capability.snippet;
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.StaticTabNotExistError.name, errors_1.AppStudioError.StaticTabNotExistError.message(entityId)));
-                }
-                break;
-            case "configurableTab":
-                if (manifest.configurableTabs && manifest.configurableTabs.length) {
-                    manifest.configurableTabs[0] = capability.snippet;
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.CapabilityNotExistError.name, errors_1.AppStudioError.CapabilityNotExistError.message(capability.name)));
-                }
-                break;
-            case "Bot":
-                if (manifest.bots && manifest.bots.length > 0) {
-                    manifest.bots[0] = capability.snippet;
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.CapabilityNotExistError.name, errors_1.AppStudioError.CapabilityNotExistError.message(capability.name)));
-                }
-                break;
-            case "MessageExtension":
-                if (manifest.composeExtensions && manifest.composeExtensions.length > 0) {
-                    manifest.composeExtensions[0] = capability.snippet;
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.CapabilityNotExistError.name, errors_1.AppStudioError.CapabilityNotExistError.message(capability.name)));
-                }
-                break;
-            case "WebApplicationInfo":
-                manifest.webApplicationInfo = capability.snippet;
-                break;
-        }
-        const writeRes = await this.writeAppManifest(manifest, projectPath);
-        if (writeRes.isErr())
-            return teamsfx_api_1.err(writeRes.error);
-        return teamsfx_api_1.ok(undefined);
-    }
-    async deleteCapability(projectPath, capability) {
-        var _a;
-        const appManifestRes = await this.readAppManifest(projectPath);
-        if (appManifestRes.isErr())
-            return teamsfx_api_1.err(appManifestRes.error);
-        const manifest = appManifestRes.value;
-        switch (capability.name) {
-            case "staticTab":
-                // find the corresponding static Tab with entity id
-                const entityId = capability.snippet.entityId;
-                const index = (_a = manifest.staticTabs) === null || _a === void 0 ? void 0 : _a.map((x) => x.entityId).indexOf(entityId);
-                if (index !== undefined && index !== -1) {
-                    manifest.staticTabs.slice(index, 1);
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.StaticTabNotExistError.name, errors_1.AppStudioError.StaticTabNotExistError.message(entityId)));
-                }
-                break;
-            case "configurableTab":
-                if (manifest.configurableTabs && manifest.configurableTabs.length > 0) {
-                    manifest.configurableTabs = [];
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.CapabilityNotExistError.name, errors_1.AppStudioError.CapabilityNotExistError.message(capability.name)));
-                }
-                break;
-            case "Bot":
-                if (manifest.bots && manifest.bots.length > 0) {
-                    manifest.bots = [];
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.CapabilityNotExistError.name, errors_1.AppStudioError.CapabilityNotExistError.message(capability.name)));
-                }
-                break;
-            case "MessageExtension":
-                if (manifest.composeExtensions && manifest.composeExtensions.length > 0) {
-                    manifest.composeExtensions = [];
-                }
-                else {
-                    return teamsfx_api_1.err(results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.CapabilityNotExistError.name, errors_1.AppStudioError.CapabilityNotExistError.message(capability.name)));
-                }
-                break;
-            case "WebApplicationInfo":
-                manifest.webApplicationInfo = undefined;
-                break;
-        }
-        const writeRes = await this.writeAppManifest(manifest, projectPath);
-        if (writeRes.isErr())
-            return teamsfx_api_1.err(writeRes.error);
+        const content = JSON.stringify(appManifest, undefined, 4);
+        const contentV2 = migrate_1.convertManifestTemplateToV2(content);
+        await fs_extra_1.default.writeFile(inputs["addManifestPath"], contentV2);
         return teamsfx_api_1.ok(undefined);
     }
-    async capabilityExceedLimit(projectPath, capability) {
-        const manifestRes = await this.readAppManifest(projectPath);
-        if (manifestRes.isErr())
-            return teamsfx_api_1.err(manifestRes.error);
-        return teamsfx_api_1.ok(this._capabilityExceedLimit(manifestRes.value, capability));
-    }
     _capabilityExceedLimit(manifest, capability) {
         switch (capability) {
             case "staticTab":
-                return (manifest.staticTabs !== undefined && manifest.staticTabs.length >= constants_1.STATIC_TABS_MAX_ITEMS);
+                return (manifest.staticTabs !== undefined && manifest.staticTabs.length >= constants_2.STATIC_TABS_MAX_ITEMS);
             case "configurableTab":
                 return manifest.configurableTabs !== undefined && manifest.configurableTabs.length >= 1;
             case "Bot":
@@ -347,18 +216,6 @@ class ManifestUtils {
         }
         return capabilities;
     }
-    /**
-     * Only works for manifest.template.json
-     * @param projectRoot
-     * @returns
-     */
-    async getCapabilities(projectRoot) {
-        const manifestRes = await this.readAppManifest(projectRoot);
-        if (manifestRes.isErr()) {
-            return teamsfx_api_1.err(manifestRes.error);
-        }
-        return teamsfx_api_1.ok(this._getCapabilities(manifestRes.value));
-    }
     async getManifest(projectPath, envInfo, ignoreEnvStateValueMissing, telemetryProps) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         // Read template
@@ -370,13 +227,13 @@ class ManifestUtils {
         //adjust template for samples with unnecessary placeholders
         const capabilities = this._getCapabilities(templateJson);
         const hasFrontend = capabilities.includes("staticTab") || capabilities.includes("configurableTab");
-        const tabEndpoint = (_a = envInfo.state[constants_3.ComponentNames.TeamsTab]) === null || _a === void 0 ? void 0 : _a.endpoint;
-        const hasUnresolvedPlaceholders = JSON.stringify(templateJson.developer).match(constants_1.manifestStateDataRegex) !== null;
+        const tabEndpoint = (_a = envInfo.state[constants_1.ComponentNames.TeamsTab]) === null || _a === void 0 ? void 0 : _a.endpoint;
+        const hasUnresolvedPlaceholders = JSON.stringify(templateJson.developer).match(constants_2.manifestStateDataRegex) !== null;
         if (!tabEndpoint && !hasFrontend && hasUnresolvedPlaceholders) {
-            templateJson.developer = constants_1.DEFAULT_DEVELOPER;
+            templateJson.developer = constants_2.DEFAULT_DEVELOPER;
         }
         const manifestTemplateString = JSON.stringify(templateJson);
-        const customizedKeys = utils_2.getCustomizedKeys("", JSON.parse(manifestTemplateString));
+        const customizedKeys = utils_1.getCustomizedKeys("", JSON.parse(manifestTemplateString));
         if (telemetryProps) {
             telemetryProps[telemetry_1.TelemetryPropertyKey.customizedKeys] = JSON.stringify(customizedKeys);
         }
@@ -394,26 +251,26 @@ class ManifestUtils {
         ];
         const manifestTemplatePath = await this.getTeamsAppManifestPath(projectPath);
         if (tokens.length > 0) {
-            return teamsfx_api_1.err(new common_2.MissingEnvironmentVariablesError("teamsApp", tokens.join(","), manifestTemplatePath));
+            return teamsfx_api_1.err(new common_1.MissingEnvironmentVariablesError("teamsApp", tokens.join(","), manifestTemplatePath));
         }
         const manifest = JSON.parse(resolvedManifestString);
         // dynamically set validDomains for manifest, which can be refactored by static manifest templates
         if (isLocalDebug || ((_b = manifest.validDomains) === null || _b === void 0 ? void 0 : _b.length) === 0) {
             const validDomains = [];
-            const tabEndpoint = (_c = envInfo.state[constants_3.ComponentNames.TeamsTab]) === null || _c === void 0 ? void 0 : _c.endpoint;
-            const tabDomain = (_d = envInfo.state[constants_3.ComponentNames.TeamsTab]) === null || _d === void 0 ? void 0 : _d.domain;
+            const tabEndpoint = (_c = envInfo.state[constants_1.ComponentNames.TeamsTab]) === null || _c === void 0 ? void 0 : _c.endpoint;
+            const tabDomain = (_d = envInfo.state[constants_1.ComponentNames.TeamsTab]) === null || _d === void 0 ? void 0 : _d.domain;
             if (tabDomain) {
                 validDomains.push(tabDomain);
             }
             if (tabEndpoint && isLocalDebug) {
                 validDomains.push(tabEndpoint.slice(8));
             }
-            const botId = (_e = envInfo.state[constants_3.ComponentNames.TeamsBot]) === null || _e === void 0 ? void 0 : _e.botId;
-            const botDomain = ((_f = envInfo.state[constants_3.ComponentNames.TeamsBot]) === null || _f === void 0 ? void 0 : _f.validDomain) ||
-                ((_g = envInfo.state[constants_3.ComponentNames.TeamsBot]) === null || _g === void 0 ? void 0 : _g.domain);
+            const botId = (_e = envInfo.state[constants_1.ComponentNames.TeamsBot]) === null || _e === void 0 ? void 0 : _e.botId;
+            const botDomain = ((_f = envInfo.state[constants_1.ComponentNames.TeamsBot]) === null || _f === void 0 ? void 0 : _f.validDomain) ||
+                ((_g = envInfo.state[constants_1.ComponentNames.TeamsBot]) === null || _g === void 0 ? void 0 : _g.domain);
             if (botId) {
                 if (!botDomain && !ignoreEnvStateValueMissing) {
-                    return teamsfx_api_1.err(new common_2.MissingEnvironmentVariablesError("teamsApp", "validDomain", manifestTemplatePath));
+                    return teamsfx_api_1.err(new common_1.MissingEnvironmentVariablesError("teamsApp", "validDomain", manifestTemplatePath));
                 }
                 else if (botDomain) {
                     validDomains.push(botDomain);
@@ -436,18 +293,18 @@ class ManifestUtils {
         let teamsAppId = "";
         if (generateIdIfNotResolved) {
             // Corner Case: Avoid MissingEnvironmentVariablesError for manifest.id
-            teamsAppId = common_1.expandEnvironmentVariable(manifest.id);
+            teamsAppId = common_2.expandEnvironmentVariable(manifest.id);
             manifest.id = "";
         }
         const manifestTemplateString = JSON.stringify(manifest);
         // Add environment variable keys to telemetry
-        const customizedKeys = common_1.getEnvironmentVariables(manifestTemplateString);
+        const customizedKeys = common_2.getEnvironmentVariables(manifestTemplateString);
         const telemetryProps = {};
         telemetryProps[telemetry_1.TelemetryPropertyKey.customizedKeys] = JSON.stringify(customizedKeys);
-        const resolvedManifestString = common_1.expandEnvironmentVariable(manifestTemplateString);
-        const tokens = common_1.getEnvironmentVariables(resolvedManifestString);
+        const resolvedManifestString = common_2.expandEnvironmentVariable(manifestTemplateString);
+        const tokens = common_2.getEnvironmentVariables(resolvedManifestString);
         if (tokens.length > 0) {
-            return teamsfx_api_1.err(new common_2.MissingEnvironmentVariablesError("teamsApp", tokens.join(","), manifestTemplatePath));
+            return teamsfx_api_1.err(new common_1.MissingEnvironmentVariablesError("teamsApp", tokens.join(","), manifestTemplatePath));
         }
         manifest = JSON.parse(resolvedManifestString);
         if (generateIdIfNotResolved) {
@@ -460,22 +317,11 @@ class ManifestUtils {
         }
         return teamsfx_api_1.ok(manifest);
     }
-    async isExistingTab(inputs, context) {
-        const manifestTemplateRes = await this.readAppManifest(inputs.projectPath);
-        if (manifestTemplateRes.isErr())
-            return teamsfx_api_1.err(manifestTemplateRes.error);
-        const manifest = manifestTemplateRes.value;
-        const hasTabInProjectSettings = projectSettingsHelperV3_1.hasTab(context.projectSetting);
-        const hasExistingTabInManifest = manifest.staticTabs !== undefined &&
-            manifest.staticTabs.filter((tab) => tab.contentUrl && !tab.contentUrl.includes("{{state."))
-                .length > 0;
-        return teamsfx_api_1.ok(hasExistingTabInManifest && !hasTabInProjectSettings);
-    }
     extractManifestFromArchivedFile(archivedFile) {
         const zipEntries = new adm_zip_1.default(archivedFile).getEntries();
-        const manifestFile = zipEntries.find((x) => x.entryName === constants_1.Constants.MANIFEST_FILE);
+        const manifestFile = zipEntries.find((x) => x.entryName === constants_2.Constants.MANIFEST_FILE);
         if (!manifestFile) {
-            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.FileNotFoundError.name, errors_1.AppStudioError.FileNotFoundError.message(constants_1.Constants.MANIFEST_FILE)));
+            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.FileNotFoundError.name, errors_1.AppStudioError.FileNotFoundError.message(constants_2.Constants.MANIFEST_FILE)));
         }
         const manifestString = manifestFile.getData().toString();
         const manifest = JSON.parse(manifestString);
@@ -510,10 +356,5 @@ function resolveManifestTemplate(envInfo, templateString, keepEnvStatePlaceHolde
     return result;
 }
 exports.resolveManifestTemplate = resolveManifestTemplate;
-async function getManifestTemplatePath(projectRoot) {
-    const appDir = await tools_1.getAppDirectory(projectRoot);
-    return `${appDir}/${constants_1.MANIFEST_TEMPLATE_CONSOLIDATE}`;
-}
-exports.getManifestTemplatePath = getManifestTemplatePath;
 exports.manifestUtils = new ManifestUtils();
 //# sourceMappingURL=ManifestUtils.js.map

package/build/component/driver/teamsApp/utils/ManifestUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":"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"}

package/build/component/{resource/appManifest → driver/teamsApp}/utils/telemetry.d.ts

@@ -1,5 +1,5 @@
 import { PluginContext, SystemError, UserError, v2 } from "@microsoft/teamsfx-api";
-import { DriverContext } from "../../../driver/interface/commonArgs";
+import { DriverContext } from "../../interface/commonArgs";
 export declare enum TelemetryPropertyKey {
     component = "component",
     errorType = "error-type",

package/build/component/driver/teamsApp/utils/telemetry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,WAAW,EACX,SAAS,EACT,EAAE,EAEH,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,gBAAgB,sBAAsB;IACtC,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,MAAM,WAAW;IACjB,UAAU,gBAAgB;IAC1B,GAAG,QAAQ;IACX,MAAM,WAAW;CAClB;AASD,oBAAY,kBAAkB;IAC5B,QAAQ,aAAa;IACrB,gBAAgB,sBAAsB;IACtC,iBAAiB,UAAU;IAC3B,OAAO,YAAY;IACnB,MAAM,WAAW;IACjB,cAAc,oBAAoB;IAClC,SAAS,cAAc;IACvB,iBAAiB,uBAAuB;IACxC,aAAa,mBAAmB;IAChC,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,gBAAgB,sBAAsB;IACtC,UAAU,gBAAgB;IAC1B,IAAI,SAAS;IACb,aAAa,mBAAmB;IAChC,YAAY,kBAAkB;IAC9B,YAAY,kBAAkB;IAC9B,YAAY,mBAAmB;IAC/B,UAAU,iBAAiB;CAC5B;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,EAAE,CAAC,OAAO,GAAG,aAAa,CAAC;WAEzC,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,EAAE,CAAC,OAAO,GAAG,aAAa;WAIpD,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAY5B,gBAAgB,CAC5B,SAAS,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;WAS5B,cAAc,CAC1B,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GAAG,SAAS,EAC9B,WAAW,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EACvC,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAwB1C,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAyBjC"}

package/build/component/driver/teamsApp/utils/telemetry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/telemetry.ts"],"names":[],"mappings":"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"}

package/build/component/{resource/appManifest → driver/teamsApp}/utils/utils.d.ts

@@ -1,4 +1,4 @@
-import { AppDefinition } from "../interfaces/appDefinition";
+import { AppDefinition } from "../interfaces/appdefinitions/appDefinition";
 export declare function getCustomizedKeys(prefix: string, manifest: any): string[];
 export declare function getLocalAppName(appName: string): string;
 export declare function renderTemplate(manifestString: string, view: any): string;

package/build/component/driver/teamsApp/utils/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAG3E,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAMvD;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAOnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAExE;AAED,wBAAgB,wBAAwB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE9E;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,qBAAa,YAAY;IACvB,OAAc,OAAO,SAAK;WACN,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAkB3E"}

package/build/component/{resource/appManifest → driver/teamsApp}/utils/utils.js

@@ -6,8 +6,7 @@ const tslib_1 = require("tslib");
 // Licensed under the MIT license.
 const lodash_1 = require("lodash");
 const mustache_1 = tslib_1.__importDefault(require("mustache"));
-const developerPortalScaffoldUtils_1 = require("../../../developerPortalScaffoldUtils");
-const constants_1 = require("../constants");
+const constants_1 = require(".././constants");
 function getCustomizedKeys(prefix, manifest) {
     let keys = [];
     for (const key in manifest) {
@@ -122,22 +121,22 @@ exports.hasMeetingExtension = hasMeetingExtension;
 const groupAppConfigured = (tab) => {
     const validGroupAppContext = lodash_1.includes(tab.context, MeetingsContext.ChannelTab) ||
         lodash_1.includes(tab.context, MeetingsContext.PrivateChatTab);
-    if (tab.scopes) {
-        tab.scopes = developerPortalScaffoldUtils_1.updateScope(tab.scopes);
-    }
-    const validGroupAppScope = lodash_1.includes(tab.scopes, CommandScope.GroupChat) || lodash_1.includes(tab.scopes, CommandScope.Team);
+    const validGroupAppScope = (!!tab.scopes && includeGroupChatScope(tab.scopes)) || includeTeamScope(tab.scopes);
     return validGroupAppScope && validGroupAppContext;
 };
 const meetingExtensionConfigured = (tab) => {
     const validMeetingContext = lodash_1.includes(tab.context, MeetingsContext.SidePanel) ||
         lodash_1.includes(tab.context, MeetingsContext.DetailsTab) ||
         lodash_1.includes(tab.context, MeetingsContext.ChatTab);
-    if (tab.scopes) {
-        tab.scopes = developerPortalScaffoldUtils_1.updateScope(tab.scopes);
-    }
-    const validMeetingScope = lodash_1.includes(tab.scopes, CommandScope.GroupChat);
+    const validMeetingScope = !!tab.scopes && includeGroupChatScope(tab.scopes);
     return validMeetingScope && validMeetingContext;
 };
+const includeTeamScope = (scopes) => {
+    return !!scopes.find((scope) => scope.toLowerCase() === CommandScope.Team.toLowerCase());
+};
+const includeGroupChatScope = (scopes) => {
+    return !!scopes.find((scope) => scope.toLowerCase() === CommandScope.GroupChat.toLowerCase());
+};
 var CommandScope;
 (function (CommandScope) {
     CommandScope["Team"] = "team";

package/build/component/driver/teamsApp/utils/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}

package/build/component/driver/teamsApp/validate.js

@@ -10,10 +10,10 @@ const typedi_1 = require("typedi");
 const os_1 = require("os");
 const wrapUtil_1 = require("../util/wrapUtil");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const telemetry_1 = require("../../resource/appManifest/utils/telemetry");
-const results_1 = require("../../resource/appManifest/results");
-const errors_1 = require("../../resource/appManifest/errors");
-const ManifestUtils_1 = require("../../resource/appManifest/utils/ManifestUtils");
+const telemetry_1 = require("./utils/telemetry");
+const results_1 = require("./results");
+const errors_1 = require("./errors");
+const ManifestUtils_1 = require("./utils/ManifestUtils");
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const constants_1 = require("../../../common/constants");
 const common_1 = require("../../utils/common");