@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/build/common/tools.js

@@ -1,16 +1,211 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listDevTunnels = exports.getSPFxToken = exports.getSPFxTenant = exports.getSideloadingStatus = void 0;
+exports.listDevTunnels = exports.getFixedCommonProjectSettings = exports.ConvertTokenToJson = exports.setRegion = exports.getSPFxToken = exports.getSPFxTenant = exports.AzureScopes = exports.SPFxScopes = exports.GraphReadUserScopes = exports.GraphScopes = exports.AuthSvcScopes = exports.AppStudioScopes = exports.getSideloadingStatus = exports.getCopilotStatus = exports.getAllowedAppMaps = exports.getHashedEnv = exports.isVideoFilterProject = exports.isSPFxProject = exports.getUuid = exports.waitSeconds = exports.parseFromResourceId = exports.getResourceGroupNameFromResourceId = exports.compileHandlebarsTemplateString = exports.getResourceGroupInPortal = exports.askSubscription = exports.isCheckAccountError = exports.isUserCancelError = exports.deepCopy = void 0;
 const tslib_1 = require("tslib");
 const dev_tunnels_management_1 = require("@microsoft/dev-tunnels-management");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const axios_1 = tslib_1.__importDefault(require("axios"));
-const teamsDevPortalClient_1 = require("../client/teamsDevPortalClient");
-const constants_1 = require("./constants");
+const crypto = tslib_1.__importStar(require("crypto"));
+const fs = tslib_1.__importStar(require("fs-extra"));
+const Handlebars = tslib_1.__importStar(require("handlebars"));
+const uuid = tslib_1.__importStar(require("uuid"));
+const yaml_1 = require("yaml");
+const constants_1 = require("../component/constants");
+const appStudioClient_1 = require("../component/driver/teamsApp/clients/appStudioClient");
+const authSvcClient_1 = require("../component/driver/teamsApp/clients/authSvcClient");
+const constants_2 = require("../component/driver/teamsApp/constants");
+const ManifestUtils_1 = require("../component/driver/teamsApp/utils/ManifestUtils");
+const appStudioClient_2 = require("../component/resource/botService/appStudio/appStudioClient");
+const error_1 = require("../core/error");
+const projectSettingsLoader_1 = require("../core/middleware/projectSettingsLoader");
+const common_1 = require("../error/common");
+const constants_3 = require("./constants");
+const localizeUtils_1 = require("./localizeUtils");
+const packageService_1 = require("./m365/packageService");
+Handlebars.registerHelper("contains", (value, array) => {
+    array = array instanceof Array ? array : [array];
+    return array.indexOf(value) > -1 ? this : "";
+});
+Handlebars.registerHelper("notContains", (value, array) => {
+    array = array instanceof Array ? array : [array];
+    return array.indexOf(value) == -1 ? this : "";
+});
+Handlebars.registerHelper("equals", (value, target) => {
+    return value === target ? this : "";
+});
+const AzurePortalUrl = "https://portal.azure.com";
+const deepCopy = (target) => {
+    if (target === null) {
+        return target;
+    }
+    if (target instanceof Date) {
+        return new Date(target.getTime());
+    }
+    if (target instanceof Array) {
+        const cp = [];
+        target.forEach((v) => {
+            cp.push(v);
+        });
+        return cp.map((n) => exports.deepCopy(n));
+    }
+    if (typeof target === "object" && Object.keys(target).length) {
+        const cp = Object.assign({}, target);
+        Object.keys(cp).forEach((k) => {
+            cp[k] = exports.deepCopy(cp[k]);
+        });
+        return cp;
+    }
+    return target;
+};
+exports.deepCopy = deepCopy;
+function isUserCancelError(error) {
+    const errorName = "name" in error ? error["name"] : "";
+    return (errorName === "User Cancel" ||
+        errorName === "CancelProvision" ||
+        errorName === "UserCancel" ||
+        errorName === "UserCancelError");
+}
+exports.isUserCancelError = isUserCancelError;
+function isCheckAccountError(error) {
+    const errorName = "name" in error ? error["name"] : "";
+    return (errorName === constants_1.SolutionError.TeamsAppTenantIdNotRight ||
+        errorName === constants_1.SolutionError.SubscriptionNotFound);
+}
+exports.isCheckAccountError = isCheckAccountError;
+async function askSubscription(azureAccountProvider, ui, activeSubscriptionId) {
+    const subscriptions = await azureAccountProvider.listSubscriptions();
+    if (subscriptions.length === 0) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError("Core", "NoSubscriptionFound", localizeUtils_1.getDefaultString("error.NoSubscriptionFound"), localizeUtils_1.getLocalizedString("error.NoSubscriptionFound")));
+    }
+    let resultSub = subscriptions.find((sub) => sub.subscriptionId === activeSubscriptionId);
+    if (activeSubscriptionId === undefined || resultSub === undefined) {
+        let selectedSub = undefined;
+        if (subscriptions.length === 1) {
+            selectedSub = subscriptions[0];
+        }
+        else {
+            const options = subscriptions.map((sub) => {
+                return {
+                    id: sub.subscriptionId,
+                    label: sub.subscriptionName,
+                    data: sub.tenantId,
+                };
+            });
+            const askRes = await ui.selectOption({
+                name: "subscription",
+                title: "Select a subscription",
+                options: options,
+                returnObject: true,
+            });
+            if (askRes.isErr())
+                return teamsfx_api_1.err(askRes.error);
+            const subItem = askRes.value.result;
+            selectedSub = {
+                subscriptionId: subItem.id,
+                subscriptionName: subItem.label,
+                tenantId: subItem.data,
+            };
+        }
+        if (selectedSub === undefined) {
+            return teamsfx_api_1.err(new teamsfx_api_1.SystemError("Core", "NoSubscriptionFound", localizeUtils_1.getDefaultString("error.NoSubscriptionFound"), localizeUtils_1.getLocalizedString("error.NoSubscriptionFound")));
+        }
+        resultSub = selectedSub;
+    }
+    return teamsfx_api_1.ok(resultSub);
+}
+exports.askSubscription = askSubscription;
+function getResourceGroupInPortal(subscriptionId, tenantId, resourceGroupName) {
+    if (subscriptionId && tenantId && resourceGroupName) {
+        return `${AzurePortalUrl}/#@${tenantId}/resource/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}`;
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getResourceGroupInPortal = getResourceGroupInPortal;
+function compileHandlebarsTemplateString(templateString, context) {
+    const template = Handlebars.compile(templateString);
+    return template(context);
+}
+exports.compileHandlebarsTemplateString = compileHandlebarsTemplateString;
+function getResourceGroupNameFromResourceId(resourceId) {
+    const result = parseFromResourceId(/\/resourceGroups\/([^\/]*)\//i, resourceId);
+    if (!result) {
+        throw error_1.FailedToParseResourceIdError("resource group name", resourceId);
+    }
+    return result;
+}
+exports.getResourceGroupNameFromResourceId = getResourceGroupNameFromResourceId;
+function parseFromResourceId(pattern, resourceId) {
+    const result = resourceId.match(pattern);
+    return result ? result[1].trim() : "";
+}
+exports.parseFromResourceId = parseFromResourceId;
+async function waitSeconds(second) {
+    return new Promise((resolve) => setTimeout(resolve, second * 1000));
+}
+exports.waitSeconds = waitSeconds;
+function getUuid() {
+    return uuid.v4();
+}
+exports.getUuid = getUuid;
+function isSPFxProject(projectSettings) {
+    const solutionSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.solutionSettings;
+    if (solutionSettings) {
+        const selectedPlugins = solutionSettings.activeResourcePlugins;
+        return selectedPlugins && selectedPlugins.indexOf("fx-resource-spfx") !== -1;
+    }
+    return false;
+}
+exports.isSPFxProject = isSPFxProject;
+async function isVideoFilterProject(projectPath) {
+    var _a;
+    let manifestResult;
+    try {
+        manifestResult = await ManifestUtils_1.manifestUtils.readAppManifest(projectPath);
+    }
+    catch (e) {
+        return teamsfx_api_1.err(common_1.assembleError(e));
+    }
+    if (manifestResult.isErr()) {
+        return teamsfx_api_1.err(manifestResult.error);
+    }
+    const manifest = manifestResult.value;
+    return teamsfx_api_1.ok(((_a = manifest.meetingExtensionDefinition) === null || _a === void 0 ? void 0 : _a.videoFiltersConfigurationUrl) !== undefined);
+}
+exports.isVideoFilterProject = isVideoFilterProject;
+function getHashedEnv(envName) {
+    return crypto.createHash("sha256").update(envName).digest("hex");
+}
+exports.getHashedEnv = getHashedEnv;
+function getAllowedAppMaps() {
+    return {
+        [constants_3.TeamsClientId.MobileDesktop]: localizeUtils_1.getLocalizedString("core.common.TeamsMobileDesktopClientName"),
+        [constants_3.TeamsClientId.Web]: localizeUtils_1.getLocalizedString("core.common.TeamsWebClientName"),
+        [constants_3.OfficeClientId.Desktop]: localizeUtils_1.getLocalizedString("core.common.OfficeDesktopClientName"),
+        [constants_3.OfficeClientId.Web1]: localizeUtils_1.getLocalizedString("core.common.OfficeWebClientName1"),
+        [constants_3.OfficeClientId.Web2]: localizeUtils_1.getLocalizedString("core.common.OfficeWebClientName2"),
+        [constants_3.OutlookClientId.Desktop]: localizeUtils_1.getLocalizedString("core.common.OutlookDesktopClientName"),
+        [constants_3.OutlookClientId.Web1]: localizeUtils_1.getLocalizedString("core.common.OutlookWebClientName1"),
+        [constants_3.OutlookClientId.Web2]: localizeUtils_1.getLocalizedString("core.common.OutlookWebClientName2"),
+    };
+}
+exports.getAllowedAppMaps = getAllowedAppMaps;
+function getCopilotStatus(token, ensureUpToDate = false) {
+    return packageService_1.PackageService.GetSharedInstance().getCopilotStatus(token, ensureUpToDate);
+}
+exports.getCopilotStatus = getCopilotStatus;
 async function getSideloadingStatus(token) {
-    return teamsDevPortalClient_1.teamsDevPortalClient.getSideloadingStatus(token);
+    return appStudioClient_1.AppStudioClient.getSideloadingStatus(token);
 }
 exports.getSideloadingStatus = getSideloadingStatus;
+exports.AppStudioScopes = [`${constants_2.getAppStudioEndpoint()}/AppDefinitions.ReadWrite`];
+exports.AuthSvcScopes = ["https://api.spaces.skype.com/Region.ReadWrite"];
+exports.GraphScopes = ["Application.ReadWrite.All", "TeamsAppInstallation.ReadForUser"];
+exports.GraphReadUserScopes = ["https://graph.microsoft.com/User.ReadBasic.All"];
+const SPFxScopes = (tenant) => [`${tenant}/Sites.FullControl.All`];
+exports.SPFxScopes = SPFxScopes;
+exports.AzureScopes = ["https://management.core.windows.net/user_impersonation"];
 async function getSPFxTenant(graphToken) {
     const GRAPH_TENANT_ENDPT = "https://graph.microsoft.com/v1.0/sites/root?$select=webUrl";
     if (graphToken.length > 0) {
@@ -24,41 +219,79 @@ async function getSPFxTenant(graphToken) {
 exports.getSPFxTenant = getSPFxTenant;
 async function getSPFxToken(m365TokenProvider) {
     const graphTokenRes = await m365TokenProvider.getAccessToken({
-        scopes: constants_1.GraphReadUserScopes,
+        scopes: exports.GraphReadUserScopes,
     });
     let spoToken = undefined;
     if (graphTokenRes && graphTokenRes.isOk()) {
         const tenant = await getSPFxTenant(graphTokenRes.value);
         const spfxTokenRes = await m365TokenProvider.getAccessToken({
-            scopes: (0, constants_1.SPFxScopes)(tenant),
+            scopes: exports.SPFxScopes(tenant),
         });
         spoToken = spfxTokenRes.isOk() ? spfxTokenRes.value : undefined;
     }
     return spoToken;
 }
 exports.getSPFxToken = getSPFxToken;
+/**
+ * Get and set regin for App Studio client
+ * @param m365TokenProvider
+ */
+async function setRegion(authSvcToken) {
+    const region = await authSvcClient_1.AuthSvcClient.getRegion(authSvcToken);
+    if (region) {
+        // Do not set region for INT env
+        const appStudioEndpoint = constants_2.getAppStudioEndpoint();
+        if (appStudioEndpoint.includes("dev-int")) {
+            return;
+        }
+        appStudioClient_1.AppStudioClient.setRegion(region);
+        appStudioClient_2.AppStudioClient.setRegion(region);
+    }
+}
+exports.setRegion = setRegion;
+function ConvertTokenToJson(token) {
+    const array = token.split(".");
+    const buff = Buffer.from(array[1], "base64");
+    return JSON.parse(buff.toString("utf8"));
+}
+exports.ConvertTokenToJson = ConvertTokenToJson;
+function getFixedCommonProjectSettings(rootPath) {
+    var _a;
+    if (!rootPath) {
+        return undefined;
+    }
+    try {
+        const settingsPath = projectSettingsLoader_1.getProjectSettingsPath(rootPath);
+        if (!settingsPath || !fs.pathExistsSync(settingsPath)) {
+            return undefined;
+        }
+        const settingsContent = fs.readFileSync(settingsPath, "utf-8");
+        const settings = yaml_1.parse(settingsContent);
+        return {
+            projectId: (_a = settings === null || settings === void 0 ? void 0 : settings.projectId) !== null && _a !== void 0 ? _a : undefined,
+        };
+    }
+    catch (_b) {
+        return undefined;
+    }
+}
+exports.getFixedCommonProjectSettings = getFixedCommonProjectSettings;
 // this function will be deleted after VS has added get dev tunnel and list dev tunnels API
 const TunnelManagementUserAgent = { name: "Teams-Toolkit" };
-async function listDevTunnels(token, isGitHub = false) {
+async function listDevTunnels(token) {
     try {
         const tunnelManagementClientImpl = new dev_tunnels_management_1.TunnelManagementHttpClient(TunnelManagementUserAgent, dev_tunnels_management_1.ManagementApiVersions.Version20230927preview, () => {
-            if (isGitHub === true) {
-                const res = `github client_id=a200baed193bb2088a6e ${token}`;
-                return Promise.resolve(res);
-            }
-            else {
-                const res = `Bearer ${token}`;
-                return Promise.resolve(res);
-            }
+            const res = `Bearer ${token}`;
+            return Promise.resolve(res);
         });
         const options = {
             includeAccessControl: true,
         };
         const tunnels = await tunnelManagementClientImpl.listTunnels(undefined, undefined, options);
-        return (0, teamsfx_api_1.ok)(tunnels);
+        return teamsfx_api_1.ok(tunnels);
     }
     catch (error) {
-        return (0, teamsfx_api_1.err)(new teamsfx_api_1.SystemError("DevTunnels", "ListDevTunnelsFailed", error.message));
+        return teamsfx_api_1.err(new teamsfx_api_1.SystemError("DevTunnels", "ListDevTunnelsFailed", error.message));
     }
 }
 exports.listDevTunnels = listDevTunnels;

package/build/common/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":";;;;AAGA,8EAG2C;AAC3C,wDAAkG;AAClG,0DAA0B;AAC1B,yEAAsE;AACtE,2CAA8D;AAEvD,KAAK,UAAU,oBAAoB,CAAC,KAAa;IACtD,OAAO,2CAAoB,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAFD,oDAEC;AAEM,KAAK,UAAU,aAAa,CAAC,UAAkB;IACpD,MAAM,kBAAkB,GAAG,4DAA4D,CAAC;IACxF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,kBAAkB,EAAE;YACnD,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,UAAU,EAAE,EAAE;SACnD,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;KAC7B;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AATD,sCASC;AAEM,KAAK,UAAU,YAAY,CAChC,iBAAoC;IAEpC,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC3D,MAAM,EAAE,+BAAmB;KAC5B,CAAC,CAAC;IACH,IAAI,QAAQ,GAAG,SAAS,CAAC;IACzB,IAAI,aAAa,IAAI,aAAa,CAAC,IAAI,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;YAC1D,MAAM,EAAE,IAAA,sBAAU,EAAC,MAAM,CAAC;SAC3B,CAAC,CAAC;QACH,QAAQ,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;KACjE;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAfD,oCAeC;AAED,2FAA2F;AAC3F,MAAM,yBAAyB,GAAG,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;AACrD,KAAK,UAAU,cAAc,CAClC,KAAa,EACb,QAAQ,GAAG,KAAK;IAEhB,IAAI;QACF,MAAM,0BAA0B,GAAG,IAAI,mDAA0B,CAC/D,yBAAyB,EACzB,8CAAqB,CAAC,sBAAsB,EAC5C,GAAG,EAAE;YACH,IAAI,QAAQ,KAAK,IAAI,EAAE;gBACrB,MAAM,GAAG,GAAG,yCAAyC,KAAK,EAAE,CAAC;gBAC7D,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC7B;iBAAM;gBACL,MAAM,GAAG,GAAG,UAAU,KAAK,EAAE,CAAC;gBAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aAC7B;QACH,CAAC,CACF,CAAC;QAEF,MAAM,OAAO,GAAG;YACd,oBAAoB,EAAE,IAAI;SAC3B,CAAC;QACF,MAAM,OAAO,GAAG,MAAM,0BAA0B,CAAC,WAAW,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAC5F,OAAO,IAAA,gBAAE,EAAC,OAAO,CAAC,CAAC;KACpB;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,IAAA,iBAAG,EAAC,IAAI,yBAAW,CAAC,YAAY,EAAE,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;KAClF;AACH,CAAC;AA3BD,wCA2BC"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}

package/build/common/utils.d.ts

@@ -1,6 +1,4 @@
-import { Context, Inputs } from "@microsoft/teamsfx-api";
-import { DriverContext } from "../component/driver/interface/commonArgs";
-export declare function waitSeconds(second: number): Promise<void>;
-export declare function generateDriverContext(ctx: Context, inputs: Inputs): DriverContext;
-export declare function isJsonSpecFile(filePath: string): Promise<boolean>;
+export declare function convertToAlphanumericOnly(appName: string): string;
+export declare function loadingOptionsPlaceholder(): string;
+export declare function loadingDefaultPlaceholder(): string;
 //# sourceMappingURL=utils.d.ts.map

package/build/common/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAIzE,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAWjF;AAED,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBvE"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjE;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD"}

package/build/common/utils.js

@@ -1,47 +1,19 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loadingDefaultPlaceholder = exports.loadingOptionsPlaceholder = exports.convertToAlphanumericOnly = void 0;
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isJsonSpecFile = exports.generateDriverContext = exports.waitSeconds = void 0;
-const tslib_1 = require("tslib");
-const axios_1 = tslib_1.__importDefault(require("axios"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-async function waitSeconds(second) {
-    return new Promise((resolve) => setTimeout(resolve, second * 1000));
+const localizeUtils_1 = require("./localizeUtils");
+function convertToAlphanumericOnly(appName) {
+    return appName.replace(/[^\da-zA-Z]/g, "");
 }
-exports.waitSeconds = waitSeconds;
-function generateDriverContext(ctx, inputs) {
-    return {
-        azureAccountProvider: ctx.tokenProvider.azureAccountProvider,
-        m365TokenProvider: ctx.tokenProvider.m365TokenProvider,
-        ui: ctx.userInteraction,
-        progressBar: undefined,
-        logProvider: ctx.logProvider,
-        telemetryReporter: ctx.telemetryReporter,
-        projectPath: ctx.projectPath,
-        platform: inputs.platform,
-    };
+exports.convertToAlphanumericOnly = convertToAlphanumericOnly;
+function loadingOptionsPlaceholder() {
+    return localizeUtils_1.getLocalizedString("ui.select.LoadingOptionsPlaceholder");
 }
-exports.generateDriverContext = generateDriverContext;
-async function isJsonSpecFile(filePath) {
-    const specPath = filePath.toLowerCase();
-    if (specPath.endsWith(".yaml") || specPath.endsWith(".yml")) {
-        return false;
-    }
-    else if (specPath.endsWith(".json")) {
-        return true;
-    }
-    const isRemoteFile = specPath.startsWith("http:") || specPath.startsWith("https:");
-    const fileContent = isRemoteFile
-        ? (await axios_1.default.get(specPath)).data
-        : await fs_extra_1.default.readFile(specPath, "utf-8");
-    try {
-        JSON.parse(fileContent);
-        return true;
-    }
-    catch (error) {
-        return false;
-    }
+exports.loadingOptionsPlaceholder = loadingOptionsPlaceholder;
+function loadingDefaultPlaceholder() {
+    return localizeUtils_1.getLocalizedString("ui.select.LoadingDefaultPlaceholder");
 }
-exports.isJsonSpecFile = isJsonSpecFile;
+exports.loadingDefaultPlaceholder = loadingDefaultPlaceholder;
 //# sourceMappingURL=utils.js.map

package/build/common/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAIlC,0DAA0B;AAC1B,gEAA0B;AAEnB,KAAK,UAAU,WAAW,CAAC,MAAc;IAC9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;AACtE,CAAC;AAFD,kCAEC;AAED,SAAgB,qBAAqB,CAAC,GAAY,EAAE,MAAc;IAChE,OAAO;QACL,oBAAoB,EAAE,GAAG,CAAC,aAAc,CAAC,oBAAoB;QAC7D,iBAAiB,EAAE,GAAG,CAAC,aAAc,CAAC,iBAAiB;QACvD,EAAE,EAAE,GAAG,CAAC,eAAe;QACvB,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,WAAW,EAAE,GAAG,CAAC,WAAY;QAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC;AACJ,CAAC;AAXD,sDAWC;AAEM,KAAK,UAAU,cAAc,CAAC,QAAgB;IACnD,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IACxC,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC3D,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACrC,OAAO,IAAI,CAAC;KACb;IACD,MAAM,YAAY,GAAG,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACnF,MAAM,WAAW,GAAG,YAAY;QAC9B,CAAC,CAAC,CAAC,MAAM,eAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;QAClC,CAAC,CAAC,MAAM,kBAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAEzC,IAAI;QACF,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;KACb;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AAlBD,wCAkBC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/common/utils.ts"],"names":[],"mappings":";;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,mDAAqD;AAErD,SAAgB,yBAAyB,CAAC,OAAe;IACvD,OAAO,OAAO,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;AAC7C,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC;AAED,SAAgB,yBAAyB;IACvC,OAAO,kCAAkB,CAAC,qCAAqC,CAAC,CAAC;AACnE,CAAC;AAFD,8DAEC"}

package/build/common/wrappedAxiosClient.d.ts

@@ -49,7 +49,6 @@ export declare class WrappedAxiosClient {
      * @returns
      */
     private static isTDPApi;
-    private static getEventName;
     /**
      * Flattern query parameters to string, e.g. {a: 1, b: 2} => a:1;b:2
      * @param params

package/build/common/wrappedAxiosClient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrappedAxiosClient.d.ts","sourceRoot":"","sources":["../../src/common/wrappedAxiosClient.ts"],"names":[],"mappings":"AAEA,OAAc,EACZ,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,aAAa,EACb,0BAA0B,EAC3B,MAAM,OAAO,CAAC;AAWf;;GAEG;AACH,qBAAa,kBAAkB;WACf,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,aAAa;IAWjE;;;OAGG;WACW,SAAS,CAAC,OAAO,EAAE,0BAA0B;IAgB3D;;;;OAIG;WACW,UAAU,CAAC,QAAQ,EAAE,aAAa;IAqBhD;;;;OAIG;WACW,UAAU,CAAC,KAAK,EAAE,UAAU;IA4D1C;;;;;;;OAOG;WACW,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IA6H3E;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAoBtC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAU5B;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ;IAMvB,OAAO,CAAC,MAAM,CAAC,YAAY;IAY3B;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAUlC"}
+{"version":3,"file":"wrappedAxiosClient.d.ts","sourceRoot":"","sources":["../../src/common/wrappedAxiosClient.ts"],"names":[],"mappings":"AAEA,OAAc,EACZ,aAAa,EACb,UAAU,EACV,mBAAmB,EACnB,aAAa,EACb,0BAA0B,EAC3B,MAAM,OAAO,CAAC;AAWf;;GAEG;AACH,qBAAa,kBAAkB;WACf,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,aAAa;IAWjE;;;OAGG;WACW,SAAS,CAAC,OAAO,EAAE,0BAA0B;IAuB3D;;;;OAIG;WACW,UAAU,CAAC,QAAQ,EAAE,aAAa;IA0BhD;;;;OAIG;WACW,UAAU,CAAC,KAAK,EAAE,UAAU;IAmD1C;;;;;;;OAOG;WACW,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAyF3E;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAoBtC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,aAAa;IAU5B;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ;IAMvB;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAUlC"}

package/build/common/wrappedAxiosClient.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 const axios_1 = tslib_1.__importDefault(require("axios"));
-const globalVars_1 = require("./globalVars");
+const globalVars_1 = require("../core/globalVars");
 const constants_1 = require("../component/driver/teamsApp/constants");
 const telemetry_1 = require("../component/driver/teamsApp/utils/telemetry");
 const telemetry_2 = require("./telemetry");
@@ -32,7 +32,13 @@ class WrappedAxiosClient {
         const fullPath = `${(_a = request.baseURL) !== null && _a !== void 0 ? _a : ""}${(_b = request.url) !== null && _b !== void 0 ? _b : ""}`;
         const apiName = this.convertUrlToApiName(fullPath, method);
         const properties = Object.assign({ url: `<${apiName}-url>`, method: method, params: this.generateParameters(request.params) }, this.generateExtraProperties(fullPath, request.data));
-        const eventName = this.getEventName(fullPath);
+        let eventName;
+        if (this.isTDPApi(fullPath)) {
+            eventName = telemetry_2.TelemetryEvent.AppStudioApi;
+        }
+        else {
+            eventName = telemetry_2.TelemetryEvent.DependencyApi;
+        }
         (_c = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(`${eventName}-start`, properties);
         return request;
     }
@@ -46,8 +52,14 @@ class WrappedAxiosClient {
         const method = response.request.method;
         const fullPath = `${(_a = response.request.host) !== null && _a !== void 0 ? _a : ""}${(_b = response.request.path) !== null && _b !== void 0 ? _b : ""}`;
         const apiName = this.convertUrlToApiName(fullPath, method);
-        const properties = Object.assign({ url: `<${apiName}-url>`, method: method, params: this.generateParameters(response.config.params), [telemetry_2.TelemetryProperty.Success]: telemetry_2.TelemetrySuccess.Yes, "status-code": response.status.toString() }, this.generateExtraProperties(fullPath, response.data));
-        const eventName = this.getEventName(fullPath);
+        const properties = Object.assign({ url: `<${apiName}-url>`, method: method, params: this.generateParameters(response.config.params), [telemetry_1.TelemetryPropertyKey.success]: telemetry_1.TelemetryPropertyValue.success, "status-code": response.status.toString() }, this.generateExtraProperties(fullPath, response.data));
+        let eventName;
+        if (this.isTDPApi(fullPath)) {
+            eventName = telemetry_2.TelemetryEvent.AppStudioApi;
+        }
+        else {
+            eventName = telemetry_2.TelemetryEvent.DependencyApi;
+        }
         (_c = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.telemetryReporter) === null || _c === void 0 ? void 0 : _c.sendTelemetryEvent(eventName, properties);
         return response;
     }
@@ -57,7 +69,7 @@ class WrappedAxiosClient {
      * @returns
      */
     static onRejected(error) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const method = error.request.method;
         const fullPath = `${(_a = error.request.host) !== null && _a !== void 0 ? _a : ""}${(_b = error.request.path) !== null && _b !== void 0 ? _b : ""}`;
         const apiName = this.convertUrlToApiName(fullPath, method);
@@ -70,30 +82,23 @@ class WrappedAxiosClient {
                 requestData = undefined;
             }
         }
-        const properties = Object.assign({ url: `<${apiName}-url>`, method: method, params: this.generateParameters(error.config.params), [telemetry_2.TelemetryProperty.Success]: telemetry_2.TelemetrySuccess.No, [telemetry_2.TelemetryProperty.ErrorMessage]: error.response
+        const properties = Object.assign({ url: `<${apiName}-url>`, method: method, params: this.generateParameters(error.config.params), [telemetry_1.TelemetryPropertyKey.success]: telemetry_1.TelemetryPropertyValue.failure, [telemetry_1.TelemetryPropertyKey.errorMessage]: error.response
                 ? JSON.stringify(error.response.data)
                 : (_d = error.message) !== null && _d !== void 0 ? _d : "undefined", "status-code": (_f = (_e = error.response) === null || _e === void 0 ? void 0 : _e.status.toString()) !== null && _f !== void 0 ? _f : "undefined" }, this.generateExtraProperties(fullPath, requestData));
-        const eventName = this.getEventName(fullPath);
-        if (eventName === telemetry_2.TelemetryEvent.AppStudioApi) {
+        let eventName;
+        if (this.isTDPApi(fullPath)) {
             const correlationId = (_h = (_g = error.response) === null || _g === void 0 ? void 0 : _g.headers[constants_1.Constants.CORRELATION_ID]) !== null && _h !== void 0 ? _h : "undefined";
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             const extraData = ((_j = error.response) === null || _j === void 0 ? void 0 : _j.data) ? `data: ${JSON.stringify(error.response.data)}` : "";
             const TDPApiFailedError = new teamsApp_1.DeveloperPortalAPIFailedError(error, correlationId, apiName, extraData);
-            properties[telemetry_2.TelemetryProperty.ErrorCode] = `${TDPApiFailedError.source}.${TDPApiFailedError.name}`;
-            properties[telemetry_2.TelemetryProperty.ErrorMessage] = TDPApiFailedError.message;
-            properties[telemetry_2.TelemetryProperty.TDPTraceId] = correlationId;
+            properties[telemetry_1.TelemetryPropertyKey.errorCode] = `${TDPApiFailedError.source}.${TDPApiFailedError.name}`;
+            properties[telemetry_1.TelemetryPropertyKey.errorMessage] = TDPApiFailedError.message;
+            eventName = telemetry_2.TelemetryEvent.AppStudioApi;
         }
-        else if (eventName === telemetry_2.TelemetryEvent.MOSApi) {
-            const tracingId = ((_m = (_l = (_k = error.response) === null || _k === void 0 ? void 0 : _k.headers) === null || _l === void 0 ? void 0 : _l.traceresponse) !== null && _m !== void 0 ? _m : "undefined");
-            const originalMessage = error.message;
-            const innerError = ((_o = error.response) === null || _o === void 0 ? void 0 : _o.data).error || { code: "", message: "" };
-            const finalMessage = `${originalMessage} (tracingId: ${tracingId}) ${innerError.code}: ${innerError.message} `;
-            properties[telemetry_2.TelemetryProperty.ErrorMessage] = finalMessage;
-            properties[telemetry_2.TelemetryProperty.MOSTraceId] = tracingId;
-            const relativePath = (error.request.path || "");
-            properties[telemetry_2.TelemetryProperty.MOSPATH] = method + " " + relativePath.replace(/\//g, "__");
+        else {
+            eventName = telemetry_2.TelemetryEvent.DependencyApi;
         }
-        (_p = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.telemetryReporter) === null || _p === void 0 ? void 0 : _p.sendTelemetryErrorEvent(eventName, properties);
+        (_k = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.telemetryReporter) === null || _k === void 0 ? void 0 : _k.sendTelemetryErrorEvent(eventName, properties);
         return Promise.reject(error);
     }
     /**
@@ -136,25 +141,21 @@ class WrappedAxiosClient {
                 return constants_1.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP;
             }
             if (fullPath.match(new RegExp("/api/publishing/.*"))) {
-                return constants_1.APP_STUDIO_API_NAMES.GET_PUBLISHED_APP;
-            }
-            if (fullPath.match(new RegExp("/api/publishing"))) {
-                return constants_1.APP_STUDIO_API_NAMES.PUBLISH_APP;
-            }
-            if (fullPath.match(new RegExp("/api/usersettings/mtUserAppPolicy"))) {
-                return constants_1.APP_STUDIO_API_NAMES.CHECK_SIDELOADING_STATUS;
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
+                    return constants_1.APP_STUDIO_API_NAMES.GET_PUBLISHED_APP;
+                }
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.POST) {
+                    return constants_1.APP_STUDIO_API_NAMES.PUBLISH_APP;
+                }
             }
             if (fullPath.match(new RegExp("/api/v1.0/apiSecretRegistrations/.*"))) {
                 if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.GET_API_KEY;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.PATCH) {
-                    return constants_1.APP_STUDIO_API_NAMES.UPDATE_API_KEY;
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.POST) {
+                    return constants_1.APP_STUDIO_API_NAMES.CREATE_API_KEY;
                 }
             }
-            if (fullPath.match(new RegExp("/api/v1.0/apiSecretRegistrations"))) {
-                return constants_1.APP_STUDIO_API_NAMES.CREATE_API_KEY;
-            }
             if (fullPath.match(new RegExp(/\/api\/botframework\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/))) {
                 if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.GET_BOT;
@@ -174,26 +175,6 @@ class WrappedAxiosClient {
                     return constants_1.APP_STUDIO_API_NAMES.CREATE_BOT;
                 }
             }
-            if (fullPath.match(new RegExp("/api/v1.0/appvalidations/appdefinition/validate"))) {
-                return constants_1.APP_STUDIO_API_NAMES.SUBMIT_APP_VALIDATION;
-            }
-            if (fullPath.match(new RegExp("/api/v1.0/appvalidations/appdefinitions/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"))) {
-                return constants_1.APP_STUDIO_API_NAMES.GET_APP_VALIDATION_REQUESTS;
-            }
-            if (fullPath.match(new RegExp("/api/v1.0/appvalidations/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}"))) {
-                return constants_1.APP_STUDIO_API_NAMES.GET_APP_VALIDATION_RESULT;
-            }
-            if (fullPath.match(new RegExp("/api/v1.0/oAuthConfigurations/.*"))) {
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
-                    return constants_1.APP_STUDIO_API_NAMES.GET_OAUTH;
-                }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.PATCH) {
-                    return constants_1.APP_STUDIO_API_NAMES.UPDATE_OAUTH;
-                }
-            }
-            if (fullPath.match(new RegExp("/api/v1.0/oAuthConfigurations"))) {
-                return constants_1.APP_STUDIO_API_NAMES.CREATE_OAUTH;
-            }
         }
         if (fullPath.match(new RegExp(/(^https:\/\/)?authsvc\.teams\.microsoft\.com\/v1\.0\/users\/region/))) {
             return "get-region";
@@ -248,17 +229,6 @@ class WrappedAxiosClient {
         const matches = regex.exec(baseUrl);
         return matches != null && matches.length > 0;
     }
-    static getEventName(baseUrl) {
-        if (this.isTDPApi(baseUrl)) {
-            return telemetry_2.TelemetryEvent.AppStudioApi;
-        }
-        else if (baseUrl.includes("titles.prod.mos.microsoft.com")) {
-            return telemetry_2.TelemetryEvent.MOSApi;
-        }
-        else {
-            return telemetry_2.TelemetryEvent.DependencyApi;
-        }
-    }
     /**
      * Flattern query parameters to string, e.g. {a: 1, b: 2} => a:1;b:2
      * @param params