@microsoft/teamsfx-core 3.1.0 → 3.1.2-alpha.31d08fb48a.0

package/build/common/telemetry.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.telemetryUtils = exports.ApiSpecTelemetryPropertis = exports.ProjectMigratorGuideStatus = exports.WebApplicationIdValue = exports.ProjectMigratorStatus = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.ProjectTypeProps = exports.TelemetryEvent = exports.TelemetryConstants = exports.TelemetryProperty = void 0;
+exports.telemetryUtils = exports.ApiSpecTelemetryPropertis = exports.WebApplicationIdValue = exports.CustomizeSubscriptionType = exports.CustomizeResourceGroupType = exports.Component = exports.TelemetryErrorType = exports.TelemetrySuccess = exports.ProjectTypeProps = exports.TelemetryEvent = exports.TelemetryConstants = exports.TelemetryProperty = void 0;
 exports.getQuestionValidationErrorEventName = getQuestionValidationErrorEventName;
 exports.sendTelemetryEvent = sendTelemetryEvent;
 exports.sendTelemetryErrorEvent = sendTelemetryErrorEvent;
@@ -59,6 +59,10 @@ var TelemetryProperty;
     TelemetryProperty["TemplateScenario"] = "template-scenario";
     TelemetryProperty["TemplateFallback"] = "template-fallback";
     TelemetryProperty["TemplateName"] = "template-name";
+    TelemetryProperty["TemplateChannel"] = "template-channel";
+    TelemetryProperty["TemplatePackageSource"] = "template-package-source";
+    TelemetryProperty["TemplatePackageVersion"] = "template-package-version";
+    TelemetryProperty["TemplatePackageDigest"] = "template-package-digest";
     TelemetryProperty["TenantId"] = "tenant-id";
     TelemetryProperty["TimeCost"] = "time-cost";
     TelemetryProperty["SampleDownloadDirectory"] = "sample-download-directory";
@@ -89,6 +93,7 @@ var TelemetryProperty;
     TelemetryProperty["TDPTraceId"] = "tdp-trace-id";
     TelemetryProperty["MOSTraceId"] = "mos-trace-id";
     TelemetryProperty["MOSPATH"] = "mos-api-path";
+    TelemetryProperty["TeamsGraphTraceId"] = "teams-graph-trace-id";
     TelemetryProperty["AddAuthType"] = "add-auth-type";
     TelemetryProperty["MosTitleId"] = "mos-title-id";
     TelemetryProperty["MosAppId"] = "mos-app-id";
@@ -126,12 +131,6 @@ var TelemetryEvent;
     TelemetryEvent["CheckSideloading"] = "check-sideloading";
     TelemetryEvent["EnvConfig"] = "env-config";
     TelemetryEvent["DisplayToolingUpdateNotification"] = "display-tooling-update-notification";
-    TelemetryEvent["ProjectMigratorNotificationStart"] = "project-migrator-notification-start";
-    TelemetryEvent["ProjectMigratorNotification"] = "project-migrator-notification";
-    TelemetryEvent["ProjectMigratorMigrateStart"] = "project-migrator-migrate-start";
-    TelemetryEvent["ProjectMigratorMigrate"] = "project-migrator-migrate";
-    TelemetryEvent["ProjectMigratorPrecheckFailed"] = "project-migrator-pre-check-failed";
-    TelemetryEvent["ProjectMigratorError"] = "project-migrator-error";
     TelemetryEvent["ProjectConsolidateNotificationStart"] = "project-consolidate-notification-start";
     TelemetryEvent["ProjectConsolidateNotification"] = "project-consolidate-notification";
     TelemetryEvent["ProjectConsolidateUpgradeStart"] = "project-consolidate-upgrade-start";
@@ -171,6 +170,7 @@ var TelemetryEvent;
     TelemetryEvent["DependencyApi"] = "dependency-api";
     TelemetryEvent["AppStudioApi"] = "app-studio-api";
     TelemetryEvent["MOSApi"] = "ttk-mos-api";
+    TelemetryEvent["TeamsGraphApi"] = "teams-graph-api";
     TelemetryEvent["ViewPluginManifestAfterAdded"] = "view-plugin-manifest-after-added";
     TelemetryEvent["AddAuthAction"] = "add-auth-action";
     TelemetryEvent["ViewAgentManifestAfterAdded"] = "view-agent-manifest-after-added";
@@ -229,23 +229,12 @@ var CustomizeSubscriptionType;
     CustomizeSubscriptionType["EnvState"] = "env-state";
     CustomizeSubscriptionType["Default"] = "default";
 })(CustomizeSubscriptionType || (exports.CustomizeSubscriptionType = CustomizeSubscriptionType = {}));
-var ProjectMigratorStatus;
-(function (ProjectMigratorStatus) {
-    ProjectMigratorStatus["OK"] = "ok";
-    ProjectMigratorStatus["Cancel"] = "cancel";
-})(ProjectMigratorStatus || (exports.ProjectMigratorStatus = ProjectMigratorStatus = {}));
 var WebApplicationIdValue;
 (function (WebApplicationIdValue) {
     WebApplicationIdValue["None"] = "none";
     WebApplicationIdValue["Default"] = "default";
     WebApplicationIdValue["Customized"] = "customized";
 })(WebApplicationIdValue || (exports.WebApplicationIdValue = WebApplicationIdValue = {}));
-var ProjectMigratorGuideStatus;
-(function (ProjectMigratorGuideStatus) {
-    ProjectMigratorGuideStatus["Reload"] = "reload";
-    ProjectMigratorGuideStatus["LearnMore"] = "learn-more";
-    ProjectMigratorGuideStatus["Cancel"] = "cancel";
-})(ProjectMigratorGuideStatus || (exports.ProjectMigratorGuideStatus = ProjectMigratorGuideStatus = {}));
 var ApiSpecTelemetryPropertis;
 (function (ApiSpecTelemetryPropertis) {
     ApiSpecTelemetryPropertis["SpecNotValidDetails"] = "spec-not-valid-details";
@@ -259,7 +248,7 @@ function sendTelemetryEvent(component, eventName, properties, measurements) {
         properties = {};
     }
     properties[TelemetryProperty.Component] = component;
-    globalVars_1.TOOLS.telemetryReporter?.sendTelemetryEvent(eventName, properties, measurements);
+    globalVars_1.TOOLS?.telemetryReporter?.sendTelemetryEvent(eventName, properties, measurements);
 }
 function sendTelemetryErrorEvent(component, eventName, fxError, properties) {
     if (!properties) {
@@ -267,7 +256,7 @@ function sendTelemetryErrorEvent(component, eventName, fxError, properties) {
     }
     properties[TelemetryProperty.Component] = component;
     exports.telemetryUtils.fillInErrorProperties(properties, fxError);
-    globalVars_1.TOOLS.telemetryReporter?.sendTelemetryErrorEvent(eventName, properties, {});
+    globalVars_1.TOOLS?.telemetryReporter?.sendTelemetryErrorEvent(eventName, properties, {});
 }
 class TelemetryUtils {
     /**

package/build/common/telemetry.js.map

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

package/build/common/templates-config.json

@@ -1,14 +1,21 @@
 {
-    "version": "~6.7",
-    "localVersion": "6.7.0",
+    "version": "~6.14",
+    "localVersion": "6.14.1-alpha.31d08fb48a.0",
     "tagPrefix": "templates@",
+    "v4tagPrefix": "templates-v4@",
     "vstagPrefix": "templates-vs@",
     "vsversion": "18.6.0",
     "vsVersionPattern": "~18.6",
     "tagListURL": "https://github.com/OfficeDev/microsoft-365-agents-toolkit/releases/download/template-tag-list/template-tags.txt",
+    "templatesV4TagListURL": "https://github.com/OfficeDev/microsoft-365-agents-toolkit/releases/download/template-v4-tag-list/template-v4-tags.ndjson",
     "templateDownloadBaseURL": "https://github.com/OfficeDev/microsoft-365-agents-toolkit/releases/download",
     "templateReleaseURL": "https://github.com/OfficeDev/microsoft-365-agents-toolkit/releases/expanded_assets",
     "templateDownloadBasePath": "/OfficeDev/microsoft-365-agents-toolkit/releases/download",
     "templateExt": ".zip",
-    "useLocalTemplate": false
+    "useLocalTemplate": true,
+    "v4": {
+        "range": "~6.14",
+        "bundled": true,
+        "localVersion": "6.14.1"
+    }
 }

package/build/common/tools.d.ts

@@ -1,7 +1,7 @@
 import { Tunnel } from "@microsoft/dev-tunnels-contracts";
 import { FxError, M365TokenProvider, Result } from "@microsoft/teamsfx-api";
-import { TypeSpecCompileArgs } from "../component/driver/typeSpec/interface/typeSpecCompileArgs";
 import { DriverContext } from "../component/driver/interface/commonArgs";
+import { TypeSpecCompileArgs } from "../component/driver/typeSpec/interface/typeSpecCompileArgs";
 export declare function getSideloadingStatus(token: string): Promise<boolean | undefined>;
 export declare function isSandboxedEnabled(tokenProvider: M365TokenProvider): Promise<boolean>;
 export declare function listAllTenants(token: string): Promise<Record<string, any>[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAK1D,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAwB,MAAM,wBAAwB,CAAC;AAclG,OAAO,EAAE,mBAAmB,EAAE,MAAM,4DAA4D,CAAC;AAIjG,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAIzE,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAEtF;AAED,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ3F;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAgBlF;AAED,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASvE;AAED,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAID,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EACb,QAAQ,UAAQ,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAwBpC;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAUrE;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,mBAAmB,CAiCxE;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC,CAuBf"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAK1D,OAAO,EAAO,OAAO,EAAE,iBAAiB,EAAM,MAAM,EAAe,MAAM,wBAAwB,CAAC;AAQlG,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAGzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4DAA4D,CAAC;AAWjG,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAEtF;AAED,wBAAsB,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAQ3F;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAgBlF;AAED,wBAAsB,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CASvE;AAED,wBAAsB,YAAY,CAChC,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAa7B;AAID,wBAAsB,cAAc,CAClC,KAAK,EAAE,MAAM,EACb,QAAQ,UAAQ,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CAwBpC;AAED,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAUrE;AAED,wBAAgB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,mBAAmB,CAiCxE;AAED,wBAAsB,qBAAqB,CACzC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC,CAuBf"}

package/build/common/tools.js

@@ -13,16 +13,16 @@ 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 graphClient_1 = require("../client/graphClient");
-const constants_1 = require("./constants");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const versionMetadata_1 = require("./versionMetadata");
-const pathUtils_1 = require("../component/utils/pathUtils");
+const typedi_1 = tslib_1.__importDefault(require("typedi"));
 const yaml_1 = require("yaml");
+const graphClient_1 = require("../client/graphClient");
+const teamsDevPortalClient_1 = require("../client/teamsDevPortalClient");
+const pathUtils_1 = require("../component/utils/pathUtils");
+const constants_1 = require("./constants");
 const projectTypeChecker_1 = require("./projectTypeChecker");
-const typedi_1 = tslib_1.__importDefault(require("typedi"));
+const versionMetadata_1 = require("./versionMetadata");
 async function getSideloadingStatus(token) {
     return teamsDevPortalClient_1.teamsDevPortalClient.getSideloadingStatus(token);
 }

package/build/common/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":";;AA6BA,oDAEC;AAED,gDAQC;AAED,wCAgBC;AAED,sCASC;AAED,oCAeC;AAID,wCA2BC;AAED,4DAUC;AAED,0CAiCC;AAED,sDA0BC;;AA9LD,8EAG2C;AAC3C,wDAAkG;AAClG,0DAA0B;AAC1B,yEAAsE;AACtE,uDAAoD;AACpD,2CAKqB;AACrB,gEAA0B;AAC1B,wDAAwB;AACxB,uDAA2D;AAC3D,4DAAyD;AAEzD,+BAAqC;AAIrC,6DAAyD;AACzD,4DAA+B;AAExB,KAAK,UAAU,oBAAoB,CAAC,KAAa;IACtD,OAAO,2CAAoB,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAEM,KAAK,UAAU,kBAAkB,CAAC,aAAgC;IACvE,MAAM,WAAW,GAAG,IAAI,yBAAW,CAAC,aAAa,CAAC,CAAC;IACnD,MAAM,gBAAgB,GAAG,MAAM,WAAW,CAAC,wBAAwB,EAAE,CAAC;IACtE,OAAO,CACL,gBAAgB,CAAC,uBAAuB;QACxC,gBAAgB,CAAC,uBAAuB,CAAC,iDAAiD;YACxF,EAAE,CACL,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,cAAc,CAAC,KAAa;IAChD,MAAM,WAAW,GAAG,GAAG,IAAA,sCAA0B,EAC/C,+BAAmB,CAAC,KAAK,CAC1B,iCAAiC,CAAC;IACnC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,WAAW,EAAE;gBAC5C,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;aAC9C,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;QAC7B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAC;AACZ,CAAC;AAEM,KAAK,UAAU,aAAa,CAAC,UAAkB;IACpD,MAAM,kBAAkB,GAAG,4DAA4D,CAAC;IACxF,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,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;IAC9B,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;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,CAAC;QAC1C,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;IAClE,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,2FAA2F;AAC3F,MAAM,yBAAyB,GAAG,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;AACrD,KAAK,UAAU,cAAc,CAClC,KAAa,EACb,QAAQ,GAAG,KAAK;IAEhB,IAAI,CAAC;QACH,MAAM,0BAA0B,GAAG,IAAI,mDAA0B,CAC/D,yBAAyB,EACzB,8CAAqB,CAAC,sBAAsB,EAC5C,GAAG,EAAE;YACH,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;gBACtB,MAAM,GAAG,GAAG,yCAAyC,KAAK,EAAE,CAAC;gBAC7D,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,MAAM,GAAG,GAAG,UAAU,KAAK,EAAE,CAAC;gBAC9B,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC;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;IACrB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,IAAA,iBAAG,EAAC,IAAI,yBAAW,CAAC,YAAY,EAAE,sBAAsB,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACnF,CAAC;AACH,CAAC;AAED,SAAgB,wBAAwB,CAAC,WAAmB;IAC1D,MAAM,iBAAiB,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,4BAAU,CAAC,kBAAkB,CAAC,CAAC;IAChF,IAAI,kBAAE,CAAC,cAAc,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,4BAAU,CAAC,kBAAkB,CAAC,CAAC;IAC9E,IAAI,kBAAE,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,eAAe,CAAC,WAAmB;IACjD,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE,YAAY;QAClB,YAAY,EAAE,4BAA4B;QAC1C,SAAS,EAAE,yBAAyB;QACpC,kBAAkB,EAAE,kBAAkB;KACvC,CAAC;IACF,MAAM,YAAY,GAAG,qBAAS,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC3D,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,WAAW,GAAG,kBAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAA,oBAAa,EAAC,WAAW,CAAC,CAAC;IAC5C,MAAM,aAAa,GAAG,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAQ,CAAC;IACvD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,gBAAgB,GAAG,aAAa,CAAC,KAAK,CAAC,IAAI,CAC/C,CAAC,IAAS,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,kBAAkB,CACvD,CAAC;IACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1C,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,WAAW,CAAC,IAAI;QAC1C,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,WAAW,CAAC,YAAY;QAClE,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,SAAS;QACzD,kBAAkB,EAAE,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,IAAI,WAAW,CAAC,kBAAkB;KACrF,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,qBAAqB,CACzC,WAA+B,EAC/B,OAAsB;IAEtB,MAAM,YAAY,GAAG,IAAA,sCAAiB,EAAC,WAAW,CAAC,CAAC;IACpD,IAAI,YAAY,EAAE,CAAC;QACjB,mBAAmB;QACnB,MAAM,gBAAgB,GAAmB,gBAAS,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;QAC5E,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,qCAAqC;SAC5C,CAAC;QACF,MAAM,gBAAgB,GAAG,CAAC,MAAM,gBAAgB,CAAC,OAAO,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QAC1F,IAAI,gBAAgB,CAAC,KAAK,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAA,iBAAG,EAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QAED,wBAAwB;QACxB,MAAM,qBAAqB,GAA0B,gBAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;QACvF,MAAM,mBAAmB,GAAwB,eAAe,CAAC,WAAY,CAAC,CAAC;QAC/E,MAAM,qBAAqB,GAAG,CAC5B,MAAM,qBAAqB,CAAC,OAAO,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAClE,CAAC,MAAM,CAAC;QACT,IAAI,qBAAqB,CAAC,KAAK,EAAE,EAAE,CAAC;YAClC,MAAM,IAAA,iBAAG,EAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/common/tools.ts"],"names":[],"mappings":"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"}

package/build/common/treatmentVariables.d.ts

@@ -0,0 +1,5 @@
+export declare const TreatmentVariables: {
+    readonly VSCodeConfig: "vscode";
+    readonly RaiValidation: "RaiValidation";
+};
+//# sourceMappingURL=treatmentVariables.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"treatmentVariables.d.ts","sourceRoot":"","sources":["../../src/common/treatmentVariables.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC"}

package/build/common/treatmentVariables.js

@@ -0,0 +1,10 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TreatmentVariables = void 0;
+exports.TreatmentVariables = {
+    VSCodeConfig: "vscode",
+    RaiValidation: "RaiValidation",
+};
+//# sourceMappingURL=treatmentVariables.js.map

package/build/common/treatmentVariables.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"treatmentVariables.js","sourceRoot":"","sources":["../../src/common/treatmentVariables.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,kBAAkB,GAAG;IAChC,YAAY,EAAE,QAAQ;IACtB,aAAa,EAAE,eAAe;CACtB,CAAC"}

package/build/common/wrappedAxiosClient.d.ts

@@ -1,4 +1,4 @@
-import { AxiosInstance, AxiosError, CreateAxiosDefaults, AxiosResponse, InternalAxiosRequestConfig } from "axios";
+import { AxiosError, AxiosInstance, AxiosResponse, CreateAxiosDefaults, InternalAxiosRequestConfig } from "axios";
 import { MOS3Api } from "../component/m365/serviceConstant";
 /**
  * This client will send telemetries to record API request trace
@@ -15,7 +15,7 @@ export declare class WrappedAxiosClient {
      * @param response
      * @returns
      */
-    static onResponse(response: AxiosResponse): AxiosResponse<any, any>;
+    static onResponse(response: AxiosResponse): AxiosResponse<any, any, {}>;
     /**
      * Send API failure telemetry
      * @param error
@@ -51,6 +51,15 @@ export declare class WrappedAxiosClient {
      * @returns
      */
     private static isTDPApi;
+    /**
+     * Check if it's Graph Api
+     * @param baseUrl
+     * @returns
+     */
+    private static isGraphApi;
+    private static isMOSApi;
+    private static isTeamsGraphApi;
+    private static extractMOSPath;
     private static getEventName;
     /**
      * Flattern query parameters to string, e.g. {a: 1, b: 2} => a:1;b:2

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,OAAO,EAAE,OAAO,EAAsB,MAAM,mCAAmC,CAAC;AAEhF;;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,MAAM,CAAC,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAUvF;;;;;;;OAOG;WACW,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAyI3E;;;;;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,UAAU,EACV,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,0BAA0B,EAC3B,MAAM,OAAO,CAAC;AAWf,OAAO,EAAE,OAAO,EAAsB,MAAM,mCAAmC,CAAC;AAOhF;;GAEG;AACH,qBAAa,kBAAkB;WACf,MAAM,CAAC,MAAM,CAAC,EAAE,mBAAmB,GAAG,aAAa;IAajE;;;OAGG;WACW,SAAS,CAAC,OAAO,EAAE,0BAA0B;IAgB3D;;;;OAIG;WACW,UAAU,CAAC,QAAQ,EAAE,aAAa;IAmBhD;;;;OAIG;WACW,UAAU,CAAC,KAAK,EAAE,UAAU;IA+E1C,MAAM,CAAC,8BAA8B,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;IAWvF;;;;;;;OAOG;WACW,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAsL3E;;;;;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,UAAU;IAMzB,OAAO,CAAC,MAAM,CAAC,QAAQ;IAOvB,OAAO,CAAC,MAAM,CAAC,eAAe;IAO9B,OAAO,CAAC,MAAM,CAAC,cAAc;IAM7B,OAAO,CAAC,MAAM,CAAC,YAAY;IAkB3B;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAUlC"}

package/build/common/wrappedAxiosClient.js

@@ -5,14 +5,15 @@ 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 commonConstant_1 = require("../component/constant/commonConstant");
 const constants_1 = require("../component/driver/teamsApp/constants");
 const telemetry_1 = require("../component/driver/teamsApp/utils/telemetry");
-const telemetry_2 = require("./telemetry");
+const serviceConstant_1 = require("../component/m365/serviceConstant");
 const teamsApp_1 = require("../error/teamsApp");
-const commonConstant_1 = require("../component/constant/commonConstant");
+const globalVars_1 = require("./globalVars");
 const localizeUtils_1 = require("./localizeUtils");
-const serviceConstant_1 = require("../component/m365/serviceConstant");
+const teamsGraphApiNames_1 = require("./teamsGraphApiNames");
+const telemetry_2 = require("./telemetry");
 /**
  * This client will send telemetries to record API request trace
  */
@@ -20,7 +21,6 @@ class WrappedAxiosClient {
     static create(config) {
         const instance = axios_1.default.create(config);
         instance.interceptors.request.use((request) => this.onRequest(request));
-        // eslint-disable-next-line prettier/prettier
         instance.interceptors.response.use((response) => this.onResponse(response), (error) => this.onRejected(error));
         return instance;
     }
@@ -49,7 +49,7 @@ class WrappedAxiosClient {
      */
     static onResponse(response) {
         const method = response.request.method;
-        const fullPath = `${response.request.host ?? ""}${response.request.path ?? ""}`;
+        const fullPath = `${response.config.baseURL ?? ""}${response.config.url ?? ""}`;
         const apiName = this.convertUrlToApiName(fullPath, method);
         const properties = {
             url: `<${apiName}-url>`,
@@ -69,54 +69,75 @@ class WrappedAxiosClient {
      * @returns
      */
     static onRejected(error) {
-        const method = error.request.method;
-        const fullPath = `${error.request.host ?? ""}${error.request.path ?? ""}`;
-        const apiName = this.convertUrlToApiName(fullPath, method);
-        let requestData;
-        if (error.config?.data && typeof error.config.data === "string") {
-            try {
-                requestData = JSON.parse(error.config.data);
+        // Telemetry must never throw, otherwise the synthetic error will mask the
+        // real transport-level failure (TLS handshake, ECONNRESET on a kept-alive
+        // socket, etc.) returned to the caller. See AB#37640864.
+        try {
+            const method = (error.request?.method ?? error.config?.method ?? "").toString();
+            const fullPath = `${error.config?.baseURL ?? ""}${error.config?.url ?? ""}`;
+            const apiName = this.convertUrlToApiName(fullPath, method);
+            let requestData;
+            if (error.config?.data && typeof error.config.data === "string") {
+                try {
+                    requestData = JSON.parse(error.config.data);
+                }
+                catch (error) {
+                    requestData = undefined;
+                }
             }
-            catch (error) {
-                requestData = undefined;
+            const properties = {
+                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
+                    ? JSON.stringify(error.response.data)
+                    : error.message ?? "undefined",
+                "status-code": error.response?.status.toString() ?? "undefined",
+                ...this.generateExtraProperties(fullPath, requestData),
+            };
+            const eventName = this.getEventName(fullPath);
+            if (eventName === telemetry_2.TelemetryEvent.AppStudioApi) {
+                const correlationId = (error.response?.headers
+                    ? error.response.headers[constants_1.Constants.CORRELATION_ID]
+                    : undefined) ?? "undefined";
+                const extraData = (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.reason.common", error.response?.data ? `data: ${JSON.stringify(error.response.data)}` : "");
+                const TDPApiFailedError = new teamsApp_1.DeveloperPortalAPIFailedSystemError(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;
             }
+            else if (eventName === telemetry_2.TelemetryEvent.MOSApi) {
+                const tracingId = (error.response?.headers?.traceresponse ?? "undefined");
+                const originalMessage = error.message;
+                const responseData = error.response?.data;
+                const innerError = responseData && typeof responseData === "object"
+                    ? responseData.error ?? { code: "", message: "" }
+                    : { code: "", message: "" };
+                const finalMessage = `${originalMessage} (tracingId: ${tracingId}) ${innerError.code ?? ""}: ${innerError.message ?? ""} `;
+                properties[telemetry_2.TelemetryProperty.ErrorMessage] = finalMessage;
+                properties[telemetry_2.TelemetryProperty.MOSTraceId] = tracingId;
+            }
+            else if (eventName === telemetry_2.TelemetryEvent.TeamsGraphApi) {
+                const correlationId = error.response?.headers?.["x-correlation-id"] ??
+                    error.response?.headers?.["request-id"] ??
+                    error.response?.headers?.["x-ms-request-id"] ??
+                    "undefined";
+                properties[telemetry_2.TelemetryProperty.TeamsGraphTraceId] = correlationId;
+            }
+            globalVars_1.TOOLS?.telemetryReporter?.sendTelemetryErrorEvent(eventName, properties);
         }
-        const properties = {
-            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
-                ? JSON.stringify(error.response.data)
-                : error.message ?? "undefined",
-            "status-code": error.response?.status.toString() ?? "undefined",
-            ...this.generateExtraProperties(fullPath, requestData),
-        };
-        const eventName = this.getEventName(fullPath);
-        if (eventName === telemetry_2.TelemetryEvent.AppStudioApi) {
-            const correlationId = error.response?.headers[constants_1.Constants.CORRELATION_ID] ?? "undefined";
-            const extraData = (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.reason.common", error.response?.data ? `data: ${JSON.stringify(error.response.data)}` : "");
-            const TDPApiFailedError = new teamsApp_1.DeveloperPortalAPIFailedSystemError(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;
-        }
-        else if (eventName === telemetry_2.TelemetryEvent.MOSApi) {
-            const tracingId = (error.response?.headers?.traceresponse ?? "undefined");
-            const originalMessage = error.message;
-            const innerError = (error.response?.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;
+        catch {
+            // Swallow telemetry errors so we always reject with the original error.
         }
-        globalVars_1.TOOLS?.telemetryReporter?.sendTelemetryErrorEvent(eventName, properties);
         return Promise.reject(error);
     }
     static convertMethodUrlToApiDefForMOS(method, url) {
+        const upperMethod = (method ?? "").toUpperCase();
         for (const key of Object.keys(serviceConstant_1.MOS3ApiDefinitions)) {
             const api = serviceConstant_1.MOS3ApiDefinitions[key];
-            if (api.method === method.toUpperCase() && url.match(api.path)) {
+            if (api.method === upperMethod && url.match(api.path)) {
                 return api;
             }
         }
@@ -131,6 +152,7 @@ class WrappedAxiosClient {
      * @returns
      */
     static convertUrlToApiName(fullPath, method) {
+        const upperMethod = (method ?? "").toUpperCase();
         if (this.isTDPApi(fullPath)) {
             if (fullPath.match(new RegExp("/api/aadapp/v2"))) {
                 return constants_1.APP_STUDIO_API_NAMES.CREATE_AAD_APP;
@@ -151,10 +173,10 @@ class WrappedAxiosClient {
                 return constants_1.APP_STUDIO_API_NAMES.UPDATE_OWNER;
             }
             if (fullPath.match(new RegExp(/\/api\/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}/))) {
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
+                if (upperMethod === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.GET_APP;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.DELETE) {
+                if (upperMethod === commonConstant_1.HttpMethod.DELETE) {
                     return constants_1.APP_STUDIO_API_NAMES.DELETE_APP;
                 }
             }
@@ -174,10 +196,10 @@ class WrappedAxiosClient {
                 return constants_1.APP_STUDIO_API_NAMES.CHECK_SIDELOADING_STATUS;
             }
             if (fullPath.match(new RegExp("/api/v1.0/apiSecretRegistrations/.*"))) {
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
+                if (upperMethod === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.GET_API_KEY;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.PATCH) {
+                if (upperMethod === commonConstant_1.HttpMethod.PATCH) {
                     return constants_1.APP_STUDIO_API_NAMES.UPDATE_API_KEY;
                 }
             }
@@ -185,21 +207,21 @@ class WrappedAxiosClient {
                 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) {
+                if (upperMethod === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.GET_BOT;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.POST) {
+                if (upperMethod === commonConstant_1.HttpMethod.POST) {
                     return constants_1.APP_STUDIO_API_NAMES.UPDATE_BOT;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.DELETE) {
+                if (upperMethod === commonConstant_1.HttpMethod.DELETE) {
                     return constants_1.APP_STUDIO_API_NAMES.DELETE_BOT;
                 }
             }
             if (fullPath.match(new RegExp("/api/botframework"))) {
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
+                if (upperMethod === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.LIST_BOT;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.POST) {
+                if (upperMethod === commonConstant_1.HttpMethod.POST) {
                     return constants_1.APP_STUDIO_API_NAMES.CREATE_BOT;
                 }
             }
@@ -213,10 +235,10 @@ class WrappedAxiosClient {
                 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) {
+                if (upperMethod === commonConstant_1.HttpMethod.GET) {
                     return constants_1.APP_STUDIO_API_NAMES.GET_OAUTH;
                 }
-                if (method.toUpperCase() === commonConstant_1.HttpMethod.PATCH) {
+                if (upperMethod === commonConstant_1.HttpMethod.PATCH) {
                     return constants_1.APP_STUDIO_API_NAMES.UPDATE_OAUTH;
                 }
             }
@@ -224,9 +246,24 @@ class WrappedAxiosClient {
                 return constants_1.APP_STUDIO_API_NAMES.CREATE_OAUTH;
             }
         }
-        else if (fullPath.includes("titles.prod.mos.microsoft.com")) {
+        else if (this.isGraphApi(fullPath)) {
+            if (fullPath.match(new RegExp(/\/appCatalogs\/teamsApps\/[^/?]+\/appDefinitions/i)) &&
+                upperMethod === commonConstant_1.HttpMethod.POST) {
+                return constants_1.GRAPH_API_NAMES.UPDATE_PUBLISHED_APP;
+            }
+            if (fullPath.match(new RegExp(/\/appCatalogs\/teamsApps(\?.*)?$/i)) &&
+                upperMethod === commonConstant_1.HttpMethod.POST) {
+                return constants_1.GRAPH_API_NAMES.PUBLISH_APP;
+            }
+            if ((fullPath.match(new RegExp(/\/appCatalogs\/teamsApps(\?.*)?$/i)) ||
+                fullPath.match(new RegExp(/\/appCatalogs\/teamsApps\/[^/?]+(\?.*)?$/i))) &&
+                upperMethod === commonConstant_1.HttpMethod.GET) {
+                return constants_1.GRAPH_API_NAMES.GET_PUBLISHED_APP;
+            }
+        }
+        else if (this.isMOSApi(fullPath)) {
             // MOS API
-            const relativePath = fullPath.split("titles.prod.mos.microsoft.com")[1];
+            const relativePath = this.extractMOSPath(fullPath);
             const mosApiDef = this.convertMethodUrlToApiDefForMOS(method, relativePath);
             if (mosApiDef) {
                 return `mos_${mosApiDef.key}`;
@@ -235,6 +272,30 @@ class WrappedAxiosClient {
                 return `mos_unclassified_${relativePath.replace(/\//g, "_")}`;
             }
         }
+        else if (this.isTeamsGraphApi(fullPath)) {
+            if (fullPath.match(new RegExp("/v1\\.0/apiSecretRegistrations/.*"))) {
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
+                    return teamsGraphApiNames_1.TEAMS_GRAPH_API_NAMES.GET_API_KEY;
+                }
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.PATCH) {
+                    return teamsGraphApiNames_1.TEAMS_GRAPH_API_NAMES.UPDATE_API_KEY;
+                }
+            }
+            if (fullPath.match(new RegExp("/v1\\.0/apiSecretRegistrations"))) {
+                return teamsGraphApiNames_1.TEAMS_GRAPH_API_NAMES.CREATE_API_KEY;
+            }
+            if (fullPath.match(new RegExp("/v1\\.0/oAuthConfigurations/.*"))) {
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.GET) {
+                    return teamsGraphApiNames_1.TEAMS_GRAPH_API_NAMES.GET_OAUTH;
+                }
+                if (method.toUpperCase() === commonConstant_1.HttpMethod.PATCH) {
+                    return teamsGraphApiNames_1.TEAMS_GRAPH_API_NAMES.UPDATE_OAUTH;
+                }
+            }
+            if (fullPath.match(new RegExp("/v1\\.0/oAuthConfigurations"))) {
+                return teamsGraphApiNames_1.TEAMS_GRAPH_API_NAMES.CREATE_OAUTH;
+            }
+        }
         if (fullPath.match(new RegExp(/(^https:\/\/)?authsvc\.teams\.microsoft\.com\/v1\.0\/users\/region/))) {
             return "get-region";
         }
@@ -288,13 +349,40 @@ class WrappedAxiosClient {
         const matches = regex.exec(baseUrl);
         return matches != null && matches.length > 0;
     }
+    /**
+     * Check if it's Graph Api
+     * @param baseUrl
+     * @returns
+     */
+    static isGraphApi(baseUrl) {
+        const regex = /(^https:\/\/)?([\w.-]+\.)?graph\.microsoft\.(com|us)(:\d+)?(\/|$)/i;
+        const matches = regex.exec(baseUrl);
+        return matches != null && matches.length > 0;
+    }
+    static isMOSApi(baseUrl) {
+        const mosRegex = /(^https:\/\/)?titles\.(prod|gccm)\.mos\.microsoft\.com|(^https:\/\/)?titles\.(gcch|dod)\.mos\.svc\.usgovcloud\.microsoft/;
+        const matches = mosRegex.exec(baseUrl);
+        return matches != null && matches.length > 0;
+    }
+    static isTeamsGraphApi(baseUrl) {
+        const regex = /(^https:\/\/)?(teams\.microsoft\.com\/(gcc\/)?api\/platform|gov\.teams\.microsoft\.us\/api\/platform|dod\.teams\.microsoft\.us\/api\/platform)/;
+        const matches = regex.exec(baseUrl);
+        return matches != null && matches.length > 0;
+    }
+    static extractMOSPath(fullPath) {
+        const mosRegex = /(^https:\/\/)?titles\.(prod|gccm)\.mos\.microsoft\.com|(^https:\/\/)?titles\.(gcch|dod)\.mos\.svc\.usgovcloud\.microsoft/;
+        return fullPath.replace(mosRegex, "");
+    }
     static getEventName(baseUrl) {
         if (this.isTDPApi(baseUrl)) {
             return telemetry_2.TelemetryEvent.AppStudioApi;
         }
-        else if (baseUrl.includes("titles.prod.mos.microsoft.com")) {
+        else if (this.isMOSApi(baseUrl)) {
             return telemetry_2.TelemetryEvent.MOSApi;
         }
+        else if (this.isTeamsGraphApi(baseUrl)) {
+            return telemetry_2.TelemetryEvent.TeamsGraphApi;
+        }
         else {
             return telemetry_2.TelemetryEvent.DependencyApi;
         }