@microsoft/teamsfx-core 3.1.0 → 3.1.1

package/build/common/templates-config.json

@@ -1,14 +1,21 @@
 {
-    "version": "~6.7",
-    "localVersion": "6.7.0",
+    "version": "~6.14",
+    "localVersion": "6.14.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": false,
+    "v4": {
+        "range": "~6.14",
+        "bundled": false,
+        "localVersion": "6.14.0"
+    }
 }

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

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;
         }

package/build/common/wrappedAxiosClient.js.map

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

package/build/component/configManager/actionInjector.d.ts

@@ -6,8 +6,23 @@ export declare class ActionInjector {
     isMicrosoftEntra: boolean, enablePKCE?: boolean, registrationId?: string): Promise<AuthActionInjectResult | undefined>;
     static injectCreateAPIKeyAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean, // If it from add plugin, then we will add another CreateApiKeyAction
     registrationId?: string): Promise<AuthActionInjectResult | undefined>;
-    static injectCreateOAuthActionForMCP(ymlPath: string, authType: string, authName: string, registrationId: string, mcpServerUrl: string, authorizationUrl?: string, tokenUrl?: string, refreshUrl?: string): Promise<AuthActionInjectResult | undefined>;
+    static injectCreateOAuthActionForMCP(ymlPath: string, authType: string, authName: string, registrationId: string, mcpServerUrl: string, authorizationUrl?: string, tokenUrl?: string, refreshUrl?: string, credentialEnvNames?: {
+        clientIdEnvName: string;
+        clientSecretEnvName?: string;
+        scopeEnvName?: string;
+    }): Promise<AuthActionInjectResult | undefined>;
+    /**
+     * Inject a `dcr/register` action for MCP `oauth-dynamic` flow. Idempotent on
+     * (action name + configurationId). Writes a single configurationId env var.
+     */
+    static injectCreateDcrActionForMCP(ymlPath: string, authName: string, registrationId: string, mcpServerUrl: string, wellKnownAuthorizationServer: string): Promise<AuthActionInjectResult | undefined>;
     static findNextAvailableEnvName(baseEnvName: string, existingEnvNames: string[]): string;
+    /**
+     * Ensure the parsed yml document's top-level `version` is at least `minVersion`.
+     * Supports `vX.Y` and `X.Y.Z` formats. No-op when current >= minVersion or
+     * when the version field is missing/unparseable.
+     */
+    static ensureMinimumYamlVersion(document: any, minVersion: string): void;
 }
 export interface AuthActionInjectResult {
     defaultRegistrationIdEnvName: string | undefined;

package/build/component/configManager/actionInjector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"AASA,qBAAa,cAAc;IACzB,MAAM,CAAC,iBAAiB,CACtB,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,GACvB,GAAG;IAWN,MAAM,CAAC,oBAAoB,CAAC,aAAa,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAUnE,MAAM,CAAC,kBAAkB,CACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,EACb,gBAAgB,CAAC,EAAE,OAAO,EAC1B,UAAU,CAAC,EAAE,OAAO,GACnB,GAAG;WAmCO,uBAAuB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,oEAAoE;IAC5F,gBAAgB,EAAE,OAAO,EACzB,UAAU,CAAC,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WA6EjC,wBAAwB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,qEAAqE;IAC7F,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WAyEjC,6BAA6B,CACxC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAiE9C,MAAM,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM;CASzF;AAED,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C"}
+{"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"AASA,qBAAa,cAAc;IACzB,MAAM,CAAC,iBAAiB,CACtB,aAAa,EAAE,GAAG,EAClB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,GACvB,GAAG;IAWN,MAAM,CAAC,oBAAoB,CAAC,aAAa,EAAE,GAAG,GAAG,MAAM,GAAG,SAAS;IAUnE,MAAM,CAAC,kBAAkB,CACvB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,iBAAiB,EAAE,MAAM,EACzB,gBAAgB,EAAE,MAAM,EACxB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,EACb,gBAAgB,CAAC,EAAE,OAAO,EAC1B,UAAU,CAAC,EAAE,OAAO,GACnB,GAAG;WAmCO,uBAAuB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,oEAAoE;IAC5F,gBAAgB,EAAE,OAAO,EACzB,UAAU,CAAC,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WA6EjC,wBAAwB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,qEAAqE;IAC7F,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WAyEjC,6BAA6B,CACxC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,kBAAkB,CAAC,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GACA,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IAqF9C;;;OAGG;WACU,2BAA2B,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,4BAA4B,EAAE,MAAM,GACnC,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IA4D9C,MAAM,CAAC,wBAAwB,CAAC,WAAW,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM;IAUxF;;;;OAIG;IACH,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI;CAsBzE;AAED,MAAM,WAAW,sBAAsB;IACrC,4BAA4B,EAAE,MAAM,GAAG,SAAS,CAAC;IACjD,qBAAqB,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C"}