@microsoft/teamsfx-core 2.0.2-alpha.9fd4f497a.0 → 2.0.2-alpha.ae74bc360.0

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

@@ -1,32 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.manifestUtils = exports.resolveManifestTemplate = exports.ManifestUtils = void 0;
+exports.manifestUtils = 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 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 common_1 = require("../../../../error/common");
+const question_1 = require("../../../../question");
+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");
 class ManifestUtils {
     async readAppManifest(projectPath) {
         const filePath = await this.getTeamsAppManifestPath(projectPath);
@@ -34,7 +29,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()
@@ -51,21 +46,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;
@@ -83,14 +69,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 === question_1.CapabilityOptions.dashboardTab().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);
@@ -105,11 +91,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;
@@ -120,46 +106,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 === question_1.CapabilityOptions.commandBot().id ||
+                                    feature == question_1.CapabilityOptions.workflowBot().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 === question_1.CapabilityOptions.notificationBot().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);
                             }
                         }
                     }
@@ -171,10 +157,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;
@@ -183,7 +169,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;
             }
@@ -199,7 +185,7 @@ class ManifestUtils {
     _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":
@@ -212,7 +198,7 @@ class ManifestUtils {
                 return false;
         }
     }
-    _getCapabilities(template) {
+    getCapabilities(template) {
         const capabilities = [];
         if (template.staticTabs && template.staticTabs.length > 0) {
             capabilities.push("staticTab");
@@ -228,74 +214,6 @@ class ManifestUtils {
         }
         return capabilities;
     }
-    async getManifest(projectPath, envInfo, ignoreEnvStateValueMissing, telemetryProps) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        // Read template
-        const manifestTemplateRes = await exports.manifestUtils.readAppManifest(projectPath);
-        if (manifestTemplateRes.isErr()) {
-            return teamsfx_api_1.err(manifestTemplateRes.error);
-        }
-        const templateJson = manifestTemplateRes.value;
-        //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;
-        if (!tabEndpoint && !hasFrontend && hasUnresolvedPlaceholders) {
-            templateJson.developer = constants_1.DEFAULT_DEVELOPER;
-        }
-        const manifestTemplateString = JSON.stringify(templateJson);
-        const customizedKeys = utils_2.getCustomizedKeys("", JSON.parse(manifestTemplateString));
-        if (telemetryProps) {
-            telemetryProps[telemetry_1.TelemetryPropertyKey.customizedKeys] = JSON.stringify(customizedKeys);
-        }
-        // Render mustache template with state and config
-        const resolvedManifestString = resolveManifestTemplate(envInfo, manifestTemplateString, !ignoreEnvStateValueMissing);
-        const isLocalDebug = envInfo.envName === "local";
-        const isProvisionSucceeded = envInfo.state.solution.provisionSucceeded === "true" ||
-            envInfo.state.solution.provisionSucceeded === true;
-        const tokens = [
-            ...new Set(mustache_1.default.parse(resolvedManifestString)
-                .filter((x) => {
-                return x[0] != "text" && x[1] != "state.app-manifest.teamsAppId";
-            })
-                .map((x) => x[1])),
-        ];
-        const manifestTemplatePath = await this.getTeamsAppManifestPath(projectPath);
-        if (tokens.length > 0) {
-            return teamsfx_api_1.err(new common_2.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;
-            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);
-            if (botId) {
-                if (!botDomain && !ignoreEnvStateValueMissing) {
-                    return teamsfx_api_1.err(new common_2.MissingEnvironmentVariablesError("teamsApp", "validDomain", manifestTemplatePath));
-                }
-                else if (botDomain) {
-                    validDomains.push(botDomain);
-                }
-            }
-            for (const domain of validDomains) {
-                if (((_h = manifest.validDomains) === null || _h === void 0 ? void 0 : _h.indexOf(domain)) == -1) {
-                    manifest.validDomains.push(domain);
-                }
-            }
-        }
-        return teamsfx_api_1.ok(manifest);
-    }
     async getManifestV3(manifestTemplatePath, generateIdIfNotResolved = true) {
         const manifestRes = await exports.manifestUtils._readAppManifest(manifestTemplatePath);
         if (manifestRes.isErr()) {
@@ -305,18 +223,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) {
@@ -329,22 +247,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);
@@ -352,32 +259,5 @@ class ManifestUtils {
     }
 }
 exports.ManifestUtils = ManifestUtils;
-function resolveManifestTemplate(envInfo, templateString, keepEnvStatePlaceHoldersIfValuesNotExist = true) {
-    var _a;
-    const view = {
-        config: lodash_1.cloneDeep(envInfo.config),
-        state: lodash_1.cloneDeep(envInfo.state),
-    };
-    if (keepEnvStatePlaceHoldersIfValuesNotExist) {
-        const spans = mustache_1.default.parse(templateString);
-        for (const span of spans) {
-            if (span[0] !== "text") {
-                const placeholder = span[1];
-                const array = placeholder.split(".");
-                if (array.length === 3 && array[0] === "state") {
-                    const component = array[1];
-                    const configKey = array[2];
-                    if (((_a = view.state[component]) === null || _a === void 0 ? void 0 : _a[configKey]) == undefined) {
-                        view.state[component] = view.state[component] || {};
-                        view.state[component][configKey] = `{{${placeholder}}}`;
-                    }
-                }
-            }
-        }
-    }
-    const result = tools_1.compileHandlebarsTemplateString(templateString, view);
-    return result;
-}
-exports.resolveManifestTemplate = resolveManifestTemplate;
 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,11 +1,10 @@
-import { PluginContext, SystemError, UserError, v2 } from "@microsoft/teamsfx-api";
-import { DriverContext } from "../../../driver/interface/commonArgs";
+import { Context, SystemError, UserError } from "@microsoft/teamsfx-api";
+import { DriverContext } from "../../interface/commonArgs";
 export declare enum TelemetryPropertyKey {
     component = "component",
     errorType = "error-type",
     errorCode = "error-code",
     errorMessage = "error-message",
-    validationResult = "validation-result",
     updateExistingApp = "update",
     success = "success",
     appId = "appid",
@@ -14,35 +13,19 @@ export declare enum TelemetryPropertyKey {
     customizedKeys = "customized-manifest-keys",
     validationErrors = "validation-errors",
     validationWarnings = "validation-warnings",
-    manual = "manual",
-    statusCode = "status-code",
-    url = "url",
-    method = "method"
+    OverwriteIfAppAlreadyExists = "overwrite-if-app-already-exists",
+    region = "region"
 }
 export declare enum TelemetryEventName {
-    scaffold = "scaffold",
-    validateManifest = "validate-manifest",
-    buildTeamsPackage = "build",
-    publish = "publish",
-    deploy = "deploy",
-    updateManifest = "update-manifest",
-    provision = "provision",
-    provisionManifest = "provision-manifest",
-    postProvision = "post-provision",
     checkPermission = "check-permission",
     grantPermission = "grant-permission",
     listCollaborator = "list-collaborator",
-    localDebug = "local-debug",
-    init = "init",
-    addCapability = "add-capability",
-    loadManifest = "load-manifest",
-    saveManifest = "save-manifest",
     appStudioApi = "app-studio-api",
     authSvcApi = "auth-svc-api"
 }
 export declare class TelemetryUtils {
-    static ctx: PluginContext | v2.Context | DriverContext;
-    static init(ctx: PluginContext | v2.Context | DriverContext): void;
+    static ctx: Context | DriverContext;
+    static init(ctx: Context | DriverContext): void;
     static sendStartEvent(eventName: string, _properties?: {
         [key: string]: string;
     }, measurements?: {

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,EAAE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,oBAAY,oBAAoB;IAC9B,SAAS,cAAc;IACvB,SAAS,eAAe;IACxB,SAAS,eAAe;IACxB,YAAY,kBAAkB;IAC9B,iBAAiB,WAAW;IAC5B,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,cAAc;IACtB,cAAc,qBAAqB;IACnC,cAAc,6BAA6B;IAC3C,gBAAgB,sBAAsB;IACtC,kBAAkB,wBAAwB;IAC1C,2BAA2B,oCAAoC;IAC/D,MAAM,WAAW;CAClB;AASD,oBAAY,kBAAkB;IAC5B,eAAe,qBAAqB;IACpC,eAAe,qBAAqB;IACpC,gBAAgB,sBAAsB;IACtC,YAAY,mBAAmB;IAC/B,UAAU,iBAAiB;CAC5B;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa,CAAC;WAEtB,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,aAAa;WAIjC,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;CAGjC"}

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

@@ -5,14 +5,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TelemetryUtils = exports.TelemetryEventName = exports.TelemetryPropertyKey = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const constants_1 = require("../constants");
-const constants_2 = require("../../../constants");
 var TelemetryPropertyKey;
 (function (TelemetryPropertyKey) {
     TelemetryPropertyKey["component"] = "component";
     TelemetryPropertyKey["errorType"] = "error-type";
     TelemetryPropertyKey["errorCode"] = "error-code";
     TelemetryPropertyKey["errorMessage"] = "error-message";
-    TelemetryPropertyKey["validationResult"] = "validation-result";
     TelemetryPropertyKey["updateExistingApp"] = "update";
     TelemetryPropertyKey["success"] = "success";
     TelemetryPropertyKey["appId"] = "appid";
@@ -21,10 +19,8 @@ var TelemetryPropertyKey;
     TelemetryPropertyKey["customizedKeys"] = "customized-manifest-keys";
     TelemetryPropertyKey["validationErrors"] = "validation-errors";
     TelemetryPropertyKey["validationWarnings"] = "validation-warnings";
-    TelemetryPropertyKey["manual"] = "manual";
-    TelemetryPropertyKey["statusCode"] = "status-code";
-    TelemetryPropertyKey["url"] = "url";
-    TelemetryPropertyKey["method"] = "method";
+    TelemetryPropertyKey["OverwriteIfAppAlreadyExists"] = "overwrite-if-app-already-exists";
+    TelemetryPropertyKey["region"] = "region";
 })(TelemetryPropertyKey = exports.TelemetryPropertyKey || (exports.TelemetryPropertyKey = {}));
 var TelemetryPropertyValue;
 (function (TelemetryPropertyValue) {
@@ -35,23 +31,9 @@ var TelemetryPropertyValue;
 })(TelemetryPropertyValue || (TelemetryPropertyValue = {}));
 var TelemetryEventName;
 (function (TelemetryEventName) {
-    TelemetryEventName["scaffold"] = "scaffold";
-    TelemetryEventName["validateManifest"] = "validate-manifest";
-    TelemetryEventName["buildTeamsPackage"] = "build";
-    TelemetryEventName["publish"] = "publish";
-    TelemetryEventName["deploy"] = "deploy";
-    TelemetryEventName["updateManifest"] = "update-manifest";
-    TelemetryEventName["provision"] = "provision";
-    TelemetryEventName["provisionManifest"] = "provision-manifest";
-    TelemetryEventName["postProvision"] = "post-provision";
     TelemetryEventName["checkPermission"] = "check-permission";
     TelemetryEventName["grantPermission"] = "grant-permission";
     TelemetryEventName["listCollaborator"] = "list-collaborator";
-    TelemetryEventName["localDebug"] = "local-debug";
-    TelemetryEventName["init"] = "init";
-    TelemetryEventName["addCapability"] = "add-capability";
-    TelemetryEventName["loadManifest"] = "load-manifest";
-    TelemetryEventName["saveManifest"] = "save-manifest";
     TelemetryEventName["appStudioApi"] = "app-studio-api";
     TelemetryEventName["authSvcApi"] = "auth-svc-api";
 })(TelemetryEventName = exports.TelemetryEventName || (exports.TelemetryEventName = {}));
@@ -91,23 +73,6 @@ class TelemetryUtils {
         (_a = TelemetryUtils.ctx.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryErrorEvent(eventName, properties, measurements);
     }
     static addCommonProperty(properties) {
-        var _a, _b, _c, _d, _e, _f, _g;
-        let tenantId;
-        let teamsAppId;
-        if (((_a = this.ctx.envInfo) === null || _a === void 0 ? void 0 : _a.state) instanceof Map) {
-            tenantId = (_c = (_b = this.ctx.envInfo) === null || _b === void 0 ? void 0 : _b.state.get(constants_2.PluginNames.SOLUTION)) === null || _c === void 0 ? void 0 : _c.get(constants_2.REMOTE_TEAMS_APP_TENANT_ID);
-            teamsAppId = (_e = (_d = this.ctx.envInfo) === null || _d === void 0 ? void 0 : _d.state.get(constants_2.PluginNames.APPST)) === null || _e === void 0 ? void 0 : _e.get(constants_1.Constants.TEAMS_APP_ID);
-        }
-        else {
-            tenantId = (_f = this.ctx.envInfo) === null || _f === void 0 ? void 0 : _f.state[constants_2.PluginNames.SOLUTION].teamsAppTenantId;
-            teamsAppId = (_g = this.ctx.envInfo) === null || _g === void 0 ? void 0 : _g.state[constants_2.ComponentNames.AppManifest].teamsAppId;
-        }
-        if (tenantId) {
-            properties[TelemetryPropertyKey.tenantId] = tenantId;
-        }
-        if (teamsAppId) {
-            properties[TelemetryPropertyKey.appId] = teamsAppId;
-        }
         properties[TelemetryPropertyKey.component] = constants_1.Constants.PLUGIN_NAME;
     }
 }

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,CAgBnE;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,7 +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 constants_1 = require("../constants");
+const constants_1 = require(".././constants");
 function getCustomizedKeys(prefix, manifest) {
     let keys = [];
     for (const key in manifest) {
@@ -46,9 +46,16 @@ function renderTemplate(manifestString, view) {
 }
 exports.renderTemplate = renderTemplate;
 function isPersonalApp(appDefinition) {
+    const restrictedEntityIds = [
+        "conversations",
+        "recent",
+        "about",
+        "alltabs",
+        "chat",
+    ];
     if (!!appDefinition.staticTabs && appDefinition.staticTabs.length > 0) {
-        const tabsWithUrls = appDefinition.staticTabs.filter((tab) => !!tab.contentUrl);
-        return tabsWithUrls.length > 0;
+        return (appDefinition.staticTabs.filter((tab) => !restrictedEntityIds.includes(tab.entityId)).length >
+            0);
     }
     return false;
 }

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");

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

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