@microsoft/teamsfx-core 3.0.14-alpha.bf866b5185.0 → 3.0.14-alpha.c972dbf0a4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/common/mcpToolFetcher.d.ts +31 -0
- package/build/common/mcpToolFetcher.d.ts.map +1 -0
- package/build/common/mcpToolFetcher.js +182 -0
- package/build/common/mcpToolFetcher.js.map +1 -0
- package/build/common/odrProvider.d.ts +43 -0
- package/build/common/odrProvider.d.ts.map +1 -0
- package/build/common/odrProvider.js +154 -0
- package/build/common/odrProvider.js.map +1 -0
- package/build/common/openApiParserOptions.d.ts +3 -0
- package/build/common/openApiParserOptions.d.ts.map +1 -0
- package/build/common/openApiParserOptions.js +61 -0
- package/build/common/openApiParserOptions.js.map +1 -0
- package/build/common/secretmasker/dict.d.ts.map +1 -1
- package/build/common/secretmasker/dict.js +5 -2
- package/build/common/secretmasker/dict.js.map +1 -1
- package/build/common/templates-config.json +1 -1
- package/build/component/generator/openApiSpec/helper.d.ts +2 -3
- package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/helper.js +6 -56
- package/build/component/generator/openApiSpec/helper.js.map +1 -1
- package/build/component/generator/v4TemplateBridge.d.ts +4 -1
- package/build/component/generator/v4TemplateBridge.d.ts.map +1 -1
- package/build/component/generator/v4TemplateBridge.js +11 -3
- package/build/component/generator/v4TemplateBridge.js.map +1 -1
- package/build/component/utils/mcpToolFetcher.d.ts +1 -72
- package/build/component/utils/mcpToolFetcher.d.ts.map +1 -1
- package/build/component/utils/mcpToolFetcher.js +1 -227
- package/build/component/utils/mcpToolFetcher.js.map +1 -1
- package/build/component/utils/odrProvider.d.ts +1 -55
- package/build/component/utils/odrProvider.d.ts.map +1 -1
- package/build/component/utils/odrProvider.js +1 -101
- package/build/component/utils/odrProvider.js.map +1 -1
- package/build/core/createFrontDoorAdapters.d.ts.map +1 -1
- package/build/core/createFrontDoorAdapters.js +3 -1
- package/build/core/createFrontDoorAdapters.js.map +1 -1
- package/build/core/createProjectFrontDoor.d.ts +3 -3
- package/build/core/createProjectFrontDoor.d.ts.map +1 -1
- package/build/core/createProjectFrontDoor.js +131 -85
- package/build/core/createProjectFrontDoor.js.map +1 -1
- package/build/v4/buildTarget/resolveBuildTarget.d.ts +16 -1
- package/build/v4/buildTarget/resolveBuildTarget.d.ts.map +1 -1
- package/build/v4/buildTarget/resolveBuildTarget.js +16 -7
- package/build/v4/buildTarget/resolveBuildTarget.js.map +1 -1
- package/build/v4/collectInputs/collectInputs.d.ts +46 -2
- package/build/v4/collectInputs/collectInputs.d.ts.map +1 -1
- package/build/v4/collectInputs/collectInputs.js +274 -48
- package/build/v4/collectInputs/collectInputs.js.map +1 -1
- package/build/v4/engineVersion.d.ts +7 -0
- package/build/v4/engineVersion.d.ts.map +1 -0
- package/build/v4/engineVersion.js +12 -0
- package/build/v4/engineVersion.js.map +1 -0
- package/build/v4/index.d.ts +5 -0
- package/build/v4/index.d.ts.map +1 -1
- package/build/v4/index.js +5 -0
- package/build/v4/index.js.map +1 -1
- package/build/v4/mcp/mcpAuthAction.d.ts +23 -0
- package/build/v4/mcp/mcpAuthAction.d.ts.map +1 -0
- package/build/v4/mcp/mcpAuthAction.js +151 -0
- package/build/v4/mcp/mcpAuthAction.js.map +1 -0
- package/build/v4/mcp/mcpAuthScaffold.d.ts +28 -0
- package/build/v4/mcp/mcpAuthScaffold.d.ts.map +1 -0
- package/build/v4/mcp/mcpAuthScaffold.js +124 -0
- package/build/v4/mcp/mcpAuthScaffold.js.map +1 -0
- package/build/v4/model/dataModel.d.ts +1 -1
- package/build/v4/model/dataModel.d.ts.map +1 -1
- package/build/v4/pipeline/runScaffoldPipeline.d.ts +5 -1
- package/build/v4/pipeline/runScaffoldPipeline.d.ts.map +1 -1
- package/build/v4/pipeline/runScaffoldPipeline.js +11 -3
- package/build/v4/pipeline/runScaffoldPipeline.js.map +1 -1
- package/build/v4/providers/createOptionsProviders.d.ts +2 -2
- package/build/v4/providers/createOptionsProviders.d.ts.map +1 -1
- package/build/v4/providers/createOptionsProviders.js +17 -26
- package/build/v4/providers/createOptionsProviders.js.map +1 -1
- package/build/v4/renderContext/buildRenderContext.d.ts.map +1 -1
- package/build/v4/renderContext/buildRenderContext.js +1 -2
- package/build/v4/renderContext/buildRenderContext.js.map +1 -1
- package/build/v4/runtime/generalSensitivityLabel.d.ts +5 -0
- package/build/v4/runtime/generalSensitivityLabel.d.ts.map +1 -0
- package/build/v4/runtime/generalSensitivityLabel.js +36 -0
- package/build/v4/runtime/generalSensitivityLabel.js.map +1 -0
- package/build/v4/runtime/inMemoryRuntime.d.ts +2 -1
- package/build/v4/runtime/inMemoryRuntime.d.ts.map +1 -1
- package/build/v4/runtime/inMemoryRuntime.js +2 -2
- package/build/v4/runtime/inMemoryRuntime.js.map +1 -1
- package/build/v4/runtime/realRuntime.d.ts +2 -1
- package/build/v4/runtime/realRuntime.d.ts.map +1 -1
- package/build/v4/runtime/realRuntime.js +2 -2
- package/build/v4/runtime/realRuntime.js.map +1 -1
- package/build/v4/runtime/renderMustache.d.ts.map +1 -1
- package/build/v4/runtime/renderMustache.js +12 -3
- package/build/v4/runtime/renderMustache.js.map +1 -1
- package/build/v4/runtime/runtimeRegistry.d.ts +8 -3
- package/build/v4/runtime/runtimeRegistry.d.ts.map +1 -1
- package/build/v4/runtime/runtimeRegistry.js +122 -17
- package/build/v4/runtime/runtimeRegistry.js.map +1 -1
- package/build/v4/runtime/steps/daAction.d.ts.map +1 -1
- package/build/v4/runtime/steps/daAction.js +3 -111
- package/build/v4/runtime/steps/daAction.js.map +1 -1
- package/build/v4/runtime/steps/daSensitivity.d.ts +14 -0
- package/build/v4/runtime/steps/daSensitivity.d.ts.map +1 -0
- package/build/v4/runtime/steps/daSensitivity.js +50 -0
- package/build/v4/runtime/steps/daSensitivity.js.map +1 -0
- package/build/v4/runtime/steps/mcpAuth.d.ts +5 -2
- package/build/v4/runtime/steps/mcpAuth.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpAuth.js +13 -63
- package/build/v4/runtime/steps/mcpAuth.js.map +1 -1
- package/build/v4/runtime/steps/mcpLocal.d.ts +0 -4
- package/build/v4/runtime/steps/mcpLocal.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpLocal.js +11 -31
- package/build/v4/runtime/steps/mcpLocal.js.map +1 -1
- package/build/v4/runtime/steps/mcpStatic.d.ts +1 -1
- package/build/v4/runtime/steps/mcpStatic.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpStatic.js +14 -32
- package/build/v4/runtime/steps/mcpStatic.js.map +1 -1
- package/build/v4/runtime/steps/metaOs.d.ts.map +1 -1
- package/build/v4/runtime/steps/metaOs.js +39 -51
- package/build/v4/runtime/steps/metaOs.js.map +1 -1
- package/build/v4/runtime/steps/officeAddin.d.ts.map +1 -1
- package/build/v4/runtime/steps/officeAddin.js +7 -12
- package/build/v4/runtime/steps/officeAddin.js.map +1 -1
- package/build/v4/runtime/steps/openApi.d.ts.map +1 -1
- package/build/v4/runtime/steps/openApi.js +47 -555
- package/build/v4/runtime/steps/openApi.js.map +1 -1
- package/build/v4/runtime/steps/openApiCustomApi.d.ts +5 -0
- package/build/v4/runtime/steps/openApiCustomApi.d.ts.map +1 -0
- package/build/v4/runtime/steps/openApiCustomApi.js +385 -0
- package/build/v4/runtime/steps/openApiCustomApi.js.map +1 -0
- package/build/v4/runtime/withTempDirectory.d.ts +10 -0
- package/build/v4/runtime/withTempDirectory.d.ts.map +1 -0
- package/build/v4/runtime/withTempDirectory.js +41 -0
- package/build/v4/runtime/withTempDirectory.js.map +1 -0
- package/build/v4/surface/createInputs.d.ts +25 -3
- package/build/v4/surface/createInputs.d.ts.map +1 -1
- package/build/v4/surface/createInputs.js +46 -13
- package/build/v4/surface/createInputs.js.map +1 -1
- package/build/v4/surface/createSelectorWalk.d.ts +7 -2
- package/build/v4/surface/createSelectorWalk.d.ts.map +1 -1
- package/build/v4/surface/createSelectorWalk.js +3 -1
- package/build/v4/surface/createSelectorWalk.js.map +1 -1
- package/build/v4/surface/uiPromptUI.d.ts.map +1 -1
- package/build/v4/surface/uiPromptUI.js +6 -0
- package/build/v4/surface/uiPromptUI.js.map +1 -1
- package/build/v4/validation/capabilityCatalog.d.ts +8 -0
- package/build/v4/validation/capabilityCatalog.d.ts.map +1 -0
- package/build/v4/validation/capabilityCatalog.js +58 -0
- package/build/v4/validation/capabilityCatalog.js.map +1 -0
- package/build/v4/validation/templateArchiveValidation.d.ts +15 -0
- package/build/v4/validation/templateArchiveValidation.d.ts.map +1 -0
- package/build/v4/validation/templateArchiveValidation.js +297 -0
- package/build/v4/validation/templateArchiveValidation.js.map +1 -0
- package/build/v4/validation/validateTemplatePackage.d.ts +21 -2
- package/build/v4/validation/validateTemplatePackage.d.ts.map +1 -1
- package/build/v4/validation/validateTemplatePackage.js +155 -31
- package/build/v4/validation/validateTemplatePackage.js.map +1 -1
- package/package.json +4 -4
- package/resource/package.nls.json +1 -0
- package/templates/fallback/common.zip +0 -0
- package/templates/fallback/csharp.zip +0 -0
- package/templates/fallback/js.zip +0 -0
- package/templates/fallback/python.zip +0 -0
- package/templates/fallback/ts.zip +0 -0
- package/templates/metadata.zip +0 -0
- package/templates/v4/templates-metadata.zip +0 -0
- package/templates/v4/templates.zip +0 -0
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
export interface MCPTool {
|
|
2
|
+
name: string;
|
|
3
|
+
description: string;
|
|
4
|
+
inputSchema: any;
|
|
5
|
+
outputSchema?: any;
|
|
6
|
+
tags?: string[];
|
|
7
|
+
}
|
|
8
|
+
export interface MCPFetchResult {
|
|
9
|
+
requiresAuth: boolean;
|
|
10
|
+
tools: MCPTool[];
|
|
11
|
+
authMetadataUrl?: string;
|
|
12
|
+
}
|
|
13
|
+
/** Fetch MCP tool definitions from a remote MCP server. */
|
|
14
|
+
export declare function fetchMCPTools(serverUrl: string): Promise<MCPFetchResult>;
|
|
15
|
+
/** Read MCP tool definitions from a wrapped or raw JSON array. */
|
|
16
|
+
export declare function readMCPToolsFromFile(filePath: string): Promise<MCPTool[]>;
|
|
17
|
+
export interface MCPAuthProbeResult {
|
|
18
|
+
requiresAuth: boolean;
|
|
19
|
+
authMetadataUrl?: string;
|
|
20
|
+
}
|
|
21
|
+
/** Probe an MCP streamable-HTTP endpoint for an OAuth challenge. */
|
|
22
|
+
export declare function probeMCPServerAuth(serverUrl: string): Promise<MCPAuthProbeResult>;
|
|
23
|
+
export interface MCPOAuthMetadata {
|
|
24
|
+
authorizationUrl: string;
|
|
25
|
+
tokenUrl: string;
|
|
26
|
+
refreshUrl?: string;
|
|
27
|
+
wellKnownUrl: string;
|
|
28
|
+
}
|
|
29
|
+
/** Resolve OAuth endpoints from MCP resource or authorization-server metadata. */
|
|
30
|
+
export declare function resolveMCPOAuthMetadata(authMetadataUrl?: string, wellKnownUrl?: string): Promise<MCPOAuthMetadata>;
|
|
31
|
+
//# sourceMappingURL=mcpToolFetcher.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcpToolFetcher.d.ts","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"AAOA,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,GAAG,CAAC;IACjB,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,2DAA2D;AAC3D,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CA0E9E;AAED,kEAAkE;AAClE,wBAAsB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CA8B/E;AAED,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,OAAO,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,oEAAoE;AACpE,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAkCvF;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,kFAAkF;AAClF,wBAAsB,uBAAuB,CAC3C,eAAe,CAAC,EAAE,MAAM,EACxB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,gBAAgB,CAAC,CAkC3B"}
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.fetchMCPTools = fetchMCPTools;
|
|
6
|
+
exports.readMCPToolsFromFile = readMCPToolsFromFile;
|
|
7
|
+
exports.probeMCPServerAuth = probeMCPServerAuth;
|
|
8
|
+
exports.resolveMCPOAuthMetadata = resolveMCPOAuthMetadata;
|
|
9
|
+
const tslib_1 = require("tslib");
|
|
10
|
+
const axios_1 = tslib_1.__importDefault(require("axios"));
|
|
11
|
+
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
12
|
+
const localizeUtils_1 = require("./localizeUtils");
|
|
13
|
+
/** Fetch MCP tool definitions from a remote MCP server. */
|
|
14
|
+
async function fetchMCPTools(serverUrl) {
|
|
15
|
+
let authMetadataUrl;
|
|
16
|
+
try {
|
|
17
|
+
await axios_1.default.get(serverUrl, { timeout: 10000 });
|
|
18
|
+
}
|
|
19
|
+
catch (error) {
|
|
20
|
+
if (error?.response?.status === 401 || error?.status === 401) {
|
|
21
|
+
const wwwAuth = error?.response?.headers?.["www-authenticate"];
|
|
22
|
+
if (wwwAuth) {
|
|
23
|
+
const match = wwwAuth.match(/resource_metadata=\s*"([^"]+)"/);
|
|
24
|
+
if (match) {
|
|
25
|
+
authMetadataUrl = match[1];
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return { requiresAuth: true, tools: [], authMetadataUrl };
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
try {
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
33
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
34
|
+
const { Client } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/index.js")));
|
|
35
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
36
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
37
|
+
const { StreamableHTTPClientTransport } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/streamableHttp.js")));
|
|
38
|
+
const transport = new StreamableHTTPClientTransport(new URL(serverUrl));
|
|
39
|
+
const client = new Client({ name: "atk-cli", version: "1.0.0" });
|
|
40
|
+
try {
|
|
41
|
+
await client.connect(transport);
|
|
42
|
+
const result = await client.listTools();
|
|
43
|
+
const tools = result.tools.map((tool) => ({
|
|
44
|
+
...tool,
|
|
45
|
+
description: tool.description ?? "",
|
|
46
|
+
}));
|
|
47
|
+
return { requiresAuth: false, tools };
|
|
48
|
+
}
|
|
49
|
+
finally {
|
|
50
|
+
await client.close();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
catch (error) {
|
|
54
|
+
try {
|
|
55
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
56
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
57
|
+
const { Client } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/index.js")));
|
|
58
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
59
|
+
// @ts-ignore - dynamic import of MCP SDK subpath
|
|
60
|
+
const { SSEClientTransport } = await Promise.resolve().then(() => tslib_1.__importStar(require("@modelcontextprotocol/sdk/client/sse.js")));
|
|
61
|
+
const transport = new SSEClientTransport(new URL(serverUrl));
|
|
62
|
+
const client = new Client({ name: "atk-cli", version: "1.0.0" });
|
|
63
|
+
try {
|
|
64
|
+
await client.connect(transport);
|
|
65
|
+
const result = await client.listTools();
|
|
66
|
+
const tools = result.tools.map((tool) => ({
|
|
67
|
+
...tool,
|
|
68
|
+
description: tool.description ?? "",
|
|
69
|
+
}));
|
|
70
|
+
return { requiresAuth: false, tools };
|
|
71
|
+
}
|
|
72
|
+
finally {
|
|
73
|
+
await client.close();
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
if (error?.message?.includes("401") ||
|
|
78
|
+
error?.message?.includes("Unauthorized") ||
|
|
79
|
+
error?.message?.includes("auth")) {
|
|
80
|
+
return { requiresAuth: true, tools: [] };
|
|
81
|
+
}
|
|
82
|
+
return { requiresAuth: false, tools: [] };
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
/** Read MCP tool definitions from a wrapped or raw JSON array. */
|
|
87
|
+
async function readMCPToolsFromFile(filePath) {
|
|
88
|
+
if (!(await fs_extra_1.default.pathExists(filePath))) {
|
|
89
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileNotFound", filePath));
|
|
90
|
+
}
|
|
91
|
+
const content = await fs_extra_1.default.readJSON(filePath);
|
|
92
|
+
let rawTools;
|
|
93
|
+
if (Array.isArray(content)) {
|
|
94
|
+
rawTools = content;
|
|
95
|
+
}
|
|
96
|
+
else if (content && Array.isArray(content.tools)) {
|
|
97
|
+
rawTools = content.tools;
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileInvalidFormat", '{ "tools": [...] }', filePath));
|
|
101
|
+
}
|
|
102
|
+
return rawTools.map((tool) => {
|
|
103
|
+
if (!tool.name) {
|
|
104
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.toolsFileMissingName", '"name"', filePath));
|
|
105
|
+
}
|
|
106
|
+
return {
|
|
107
|
+
name: tool.name,
|
|
108
|
+
description: tool.description ?? "",
|
|
109
|
+
inputSchema: tool.inputSchema ?? tool.input_schema ?? { type: "object", properties: {} },
|
|
110
|
+
outputSchema: tool.outputSchema ?? tool.output_schema,
|
|
111
|
+
tags: tool.tags,
|
|
112
|
+
};
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
/** Probe an MCP streamable-HTTP endpoint for an OAuth challenge. */
|
|
116
|
+
async function probeMCPServerAuth(serverUrl) {
|
|
117
|
+
const initializeBody = {
|
|
118
|
+
jsonrpc: "2.0",
|
|
119
|
+
id: 1,
|
|
120
|
+
method: "initialize",
|
|
121
|
+
params: {
|
|
122
|
+
protocolVersion: "2025-03-26",
|
|
123
|
+
capabilities: {},
|
|
124
|
+
clientInfo: { name: "atk-probe", version: "1.0.0" },
|
|
125
|
+
},
|
|
126
|
+
};
|
|
127
|
+
try {
|
|
128
|
+
await axios_1.default.post(serverUrl, initializeBody, {
|
|
129
|
+
timeout: 10000,
|
|
130
|
+
headers: {
|
|
131
|
+
"Content-Type": "application/json",
|
|
132
|
+
Accept: "application/json, text/event-stream",
|
|
133
|
+
},
|
|
134
|
+
});
|
|
135
|
+
return { requiresAuth: false };
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
if (error?.response?.status === 401 || error?.status === 401) {
|
|
139
|
+
const wwwAuth = error?.response?.headers?.["www-authenticate"];
|
|
140
|
+
let authMetadataUrl;
|
|
141
|
+
if (wwwAuth) {
|
|
142
|
+
const match = wwwAuth.match(/resource_metadata=\s*"([^"]+)"/);
|
|
143
|
+
if (match) {
|
|
144
|
+
authMetadataUrl = match[1];
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return { requiresAuth: true, authMetadataUrl };
|
|
148
|
+
}
|
|
149
|
+
return { requiresAuth: false };
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
/** Resolve OAuth endpoints from MCP resource or authorization-server metadata. */
|
|
153
|
+
async function resolveMCPOAuthMetadata(authMetadataUrl, wellKnownUrl) {
|
|
154
|
+
let resolvedWellKnownUrl = wellKnownUrl;
|
|
155
|
+
if (!resolvedWellKnownUrl) {
|
|
156
|
+
if (!authMetadataUrl) {
|
|
157
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthMetadataUrlNotFound"));
|
|
158
|
+
}
|
|
159
|
+
const response = await axios_1.default.get(authMetadataUrl);
|
|
160
|
+
if (response.status === 200 &&
|
|
161
|
+
response.data &&
|
|
162
|
+
response.data.authorization_servers &&
|
|
163
|
+
response.data.authorization_servers.length > 0) {
|
|
164
|
+
const mcpServerMetadataUrl = response.data.authorization_servers[0];
|
|
165
|
+
const serverUrl = new URL(mcpServerMetadataUrl);
|
|
166
|
+
const serverPath = serverUrl.pathname === "/" ? "" : serverUrl.pathname;
|
|
167
|
+
resolvedWellKnownUrl = `${serverUrl.protocol}//${serverUrl.host}/.well-known/oauth-authorization-server${serverPath}`;
|
|
168
|
+
}
|
|
169
|
+
else {
|
|
170
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpServerMetadataUrlNotFound"));
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
const metadataResponse = await axios_1.default.get(resolvedWellKnownUrl);
|
|
174
|
+
const authorizationUrl = metadataResponse.data?.authorization_endpoint;
|
|
175
|
+
const tokenUrl = metadataResponse.data?.token_endpoint;
|
|
176
|
+
const refreshUrl = metadataResponse.data?.refresh_endpoint;
|
|
177
|
+
if (!authorizationUrl || !tokenUrl) {
|
|
178
|
+
throw new Error((0, localizeUtils_1.getLocalizedString)("core.MCPForDA.authUrlNotFound"));
|
|
179
|
+
}
|
|
180
|
+
return { authorizationUrl, tokenUrl, refreshUrl, wellKnownUrl: resolvedWellKnownUrl };
|
|
181
|
+
}
|
|
182
|
+
//# sourceMappingURL=mcpToolFetcher.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mcpToolFetcher.js","sourceRoot":"","sources":["../../src/common/mcpToolFetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import * as childProcess from "child_process";
|
|
2
|
+
export declare const odrProviderDeps: {
|
|
3
|
+
getPlatform: () => string;
|
|
4
|
+
exec: typeof childProcess.exec;
|
|
5
|
+
logError: (...args: unknown[]) => void;
|
|
6
|
+
};
|
|
7
|
+
export declare const logError: (...args: unknown[]) => void;
|
|
8
|
+
export interface ODRServer {
|
|
9
|
+
name: string;
|
|
10
|
+
display_name: string;
|
|
11
|
+
description: string;
|
|
12
|
+
version: string;
|
|
13
|
+
identifier: string;
|
|
14
|
+
tools: ODRTool[];
|
|
15
|
+
packageFamily: string;
|
|
16
|
+
command: string;
|
|
17
|
+
args: string[];
|
|
18
|
+
}
|
|
19
|
+
export interface ODRTool {
|
|
20
|
+
name: string;
|
|
21
|
+
description: string;
|
|
22
|
+
inputSchema: ODRToolSchema;
|
|
23
|
+
outputSchema?: ODRToolSchema;
|
|
24
|
+
_meta?: unknown;
|
|
25
|
+
}
|
|
26
|
+
export interface ODRToolSchema {
|
|
27
|
+
type: "object";
|
|
28
|
+
properties?: Record<string, ODRToolParameterSchema>;
|
|
29
|
+
required?: string[];
|
|
30
|
+
[key: string]: unknown;
|
|
31
|
+
}
|
|
32
|
+
export interface ODRToolParameterSchema {
|
|
33
|
+
type?: string;
|
|
34
|
+
enum?: unknown[];
|
|
35
|
+
[key: string]: unknown;
|
|
36
|
+
}
|
|
37
|
+
export declare class ODRProvider {
|
|
38
|
+
static isODRServer(serverConfig: unknown): boolean;
|
|
39
|
+
static parseODRListOutput(jsonOutput: unknown): ODRServer[];
|
|
40
|
+
static listServers(): Promise<ODRServer[]>;
|
|
41
|
+
static getToolsForODRServer(command: string, args?: string[]): Promise<ODRTool[]>;
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=odrProvider.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"odrProvider.d.ts","sourceRoot":"","sources":["../../src/common/odrProvider.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,YAAY,MAAM,eAAe,CAAC;AAG9C,eAAO,MAAM,eAAe;uBACT,MAAM;;wBAEH,OAAO,EAAE,KAAG,IAAI;CACrC,CAAC;AAEF,eAAO,MAAM,QAAQ,GAAI,GAAG,MAAM,OAAO,EAAE,KAAG,IAAyC,CAAC;AAExF,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,EAAE,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,aAAa,CAAC;IAC3B,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;IACpD,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,OAAO,EAAE,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAkHD,qBAAa,WAAW;IACtB,MAAM,CAAC,WAAW,CAAC,YAAY,EAAE,OAAO,GAAG,OAAO;IAUlD,MAAM,CAAC,kBAAkB,CAAC,UAAU,EAAE,OAAO,GAAG,SAAS,EAAE;WAS9C,WAAW,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;WAkBnC,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;CAQ5F"}
|
|
@@ -0,0 +1,154 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.ODRProvider = exports.logError = exports.odrProviderDeps = void 0;
|
|
6
|
+
const tslib_1 = require("tslib");
|
|
7
|
+
const childProcess = tslib_1.__importStar(require("child_process"));
|
|
8
|
+
const util_1 = require("util");
|
|
9
|
+
exports.odrProviderDeps = {
|
|
10
|
+
getPlatform: () => process.platform,
|
|
11
|
+
exec: childProcess.exec,
|
|
12
|
+
logError: (...args) => console.error(...args),
|
|
13
|
+
};
|
|
14
|
+
const logError = (...args) => exports.odrProviderDeps.logError(...args);
|
|
15
|
+
exports.logError = logError;
|
|
16
|
+
function isRecord(value) {
|
|
17
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
18
|
+
}
|
|
19
|
+
function recordProperty(value, key) {
|
|
20
|
+
if (!isRecord(value)) {
|
|
21
|
+
return undefined;
|
|
22
|
+
}
|
|
23
|
+
const property = value[key];
|
|
24
|
+
return isRecord(property) ? property : undefined;
|
|
25
|
+
}
|
|
26
|
+
function stringProperty(value, key) {
|
|
27
|
+
if (!isRecord(value)) {
|
|
28
|
+
return undefined;
|
|
29
|
+
}
|
|
30
|
+
const property = value[key];
|
|
31
|
+
return typeof property === "string" ? property : undefined;
|
|
32
|
+
}
|
|
33
|
+
function stringArray(value) {
|
|
34
|
+
return Array.isArray(value)
|
|
35
|
+
? value.filter((item) => typeof item === "string")
|
|
36
|
+
: [];
|
|
37
|
+
}
|
|
38
|
+
function parameterSchema(value) {
|
|
39
|
+
if (!isRecord(value)) {
|
|
40
|
+
return {};
|
|
41
|
+
}
|
|
42
|
+
return {
|
|
43
|
+
...value,
|
|
44
|
+
type: typeof value.type === "string" ? value.type : undefined,
|
|
45
|
+
enum: Array.isArray(value.enum) ? value.enum : undefined,
|
|
46
|
+
};
|
|
47
|
+
}
|
|
48
|
+
function schemaProperties(value) {
|
|
49
|
+
if (!isRecord(value)) {
|
|
50
|
+
return undefined;
|
|
51
|
+
}
|
|
52
|
+
return Object.fromEntries(Object.entries(value).map(([name, schema]) => [name, parameterSchema(schema)]));
|
|
53
|
+
}
|
|
54
|
+
function toolSchema(value) {
|
|
55
|
+
if (!isRecord(value)) {
|
|
56
|
+
return { type: "object" };
|
|
57
|
+
}
|
|
58
|
+
return {
|
|
59
|
+
...value,
|
|
60
|
+
type: "object",
|
|
61
|
+
properties: schemaProperties(value.properties),
|
|
62
|
+
required: Array.isArray(value.required) ? stringArray(value.required) : undefined,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
65
|
+
function parseTool(value) {
|
|
66
|
+
const name = stringProperty(value, "name");
|
|
67
|
+
if (!name || !isRecord(value)) {
|
|
68
|
+
return undefined;
|
|
69
|
+
}
|
|
70
|
+
return {
|
|
71
|
+
name,
|
|
72
|
+
description: stringProperty(value, "description") ?? "",
|
|
73
|
+
inputSchema: toolSchema(value.inputSchema),
|
|
74
|
+
outputSchema: isRecord(value.outputSchema) ? toolSchema(value.outputSchema) : undefined,
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
function parseServer(value) {
|
|
78
|
+
if (!isRecord(value)) {
|
|
79
|
+
return undefined;
|
|
80
|
+
}
|
|
81
|
+
const publisherMeta = recordProperty(recordProperty(value, "_meta"), "io.modelcontextprotocol.registry/publisher-provided");
|
|
82
|
+
const windowsMeta = recordProperty(publisherMeta, "com.microsoft.windows");
|
|
83
|
+
const manifest = recordProperty(windowsMeta, "manifest");
|
|
84
|
+
const manifestMeta = recordProperty(manifest, "_meta");
|
|
85
|
+
const manifestWindowsMeta = recordProperty(manifestMeta, "com.microsoft.windows");
|
|
86
|
+
const packageFamily = stringProperty(manifestWindowsMeta, "package_family_name");
|
|
87
|
+
const server = recordProperty(manifest, "server");
|
|
88
|
+
const mcpConfig = recordProperty(server, "mcp_config");
|
|
89
|
+
if (!packageFamily || !mcpConfig) {
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
const staticResponses = recordProperty(manifestWindowsMeta, "static_responses");
|
|
93
|
+
const toolsResponse = recordProperty(staticResponses, "tools/list");
|
|
94
|
+
const rawTools = toolsResponse?.tools;
|
|
95
|
+
const tools = Array.isArray(rawTools)
|
|
96
|
+
? rawTools.map(parseTool).filter((tool) => tool !== undefined)
|
|
97
|
+
: [];
|
|
98
|
+
const packages = Array.isArray(value.packages) ? value.packages : [];
|
|
99
|
+
const name = stringProperty(value, "name") ?? "";
|
|
100
|
+
return {
|
|
101
|
+
name,
|
|
102
|
+
packageFamily,
|
|
103
|
+
display_name: stringProperty(manifest, "display_name") ?? name,
|
|
104
|
+
description: stringProperty(value, "description") ?? "",
|
|
105
|
+
version: stringProperty(value, "version") ?? "1.0.0",
|
|
106
|
+
identifier: stringProperty(packages[0], "identifier") ?? "",
|
|
107
|
+
command: stringProperty(mcpConfig, "command") ?? "",
|
|
108
|
+
args: stringArray(mcpConfig.args),
|
|
109
|
+
tools,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
class ODRProvider {
|
|
113
|
+
static isODRServer(serverConfig) {
|
|
114
|
+
const type = stringProperty(serverConfig, "type");
|
|
115
|
+
const command = stringProperty(serverConfig, "command");
|
|
116
|
+
if (type !== "stdio" || !command) {
|
|
117
|
+
return false;
|
|
118
|
+
}
|
|
119
|
+
const configCommand = command.toLowerCase();
|
|
120
|
+
return configCommand === "odr" || configCommand.endsWith("odr.exe");
|
|
121
|
+
}
|
|
122
|
+
static parseODRListOutput(jsonOutput) {
|
|
123
|
+
if (!isRecord(jsonOutput) || !Array.isArray(jsonOutput.servers)) {
|
|
124
|
+
return [];
|
|
125
|
+
}
|
|
126
|
+
return jsonOutput.servers
|
|
127
|
+
.map(parseServer)
|
|
128
|
+
.filter((server) => server !== undefined);
|
|
129
|
+
}
|
|
130
|
+
static async listServers() {
|
|
131
|
+
if (exports.odrProviderDeps.getPlatform() !== "win32") {
|
|
132
|
+
return [];
|
|
133
|
+
}
|
|
134
|
+
const execAsync = (0, util_1.promisify)(exports.odrProviderDeps.exec);
|
|
135
|
+
try {
|
|
136
|
+
const { stdout } = await execAsync("odr list");
|
|
137
|
+
if (!stdout) {
|
|
138
|
+
return [];
|
|
139
|
+
}
|
|
140
|
+
return ODRProvider.parseODRListOutput(JSON.parse(stdout));
|
|
141
|
+
}
|
|
142
|
+
catch (error) {
|
|
143
|
+
exports.odrProviderDeps.logError("Error executing odr list:", error);
|
|
144
|
+
return [];
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
static async getToolsForODRServer(command, args = []) {
|
|
148
|
+
const odrServers = await ODRProvider.listServers();
|
|
149
|
+
const matchingServer = odrServers.find((odrServer) => odrServer.command === command && JSON.stringify(odrServer.args) === JSON.stringify(args));
|
|
150
|
+
return matchingServer?.tools ?? [];
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
exports.ODRProvider = ODRProvider;
|
|
154
|
+
//# sourceMappingURL=odrProvider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"odrProvider.js","sourceRoot":"","sources":["../../src/common/odrProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openApiParserOptions.d.ts","sourceRoot":"","sources":["../../src/common/openApiParserOptions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAIxE,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,EACjB,kBAAkB,CAAC,EAAE,OAAO,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,YAAY,CAmDd"}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// Copyright (c) Microsoft Corporation.
|
|
3
|
+
// Licensed under the MIT license.
|
|
4
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.getParserOptions = getParserOptions;
|
|
6
|
+
const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
|
|
7
|
+
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
|
+
const featureFlags_1 = require("./featureFlags");
|
|
9
|
+
function getParserOptions(type, isDeclarativeAgent, platform) {
|
|
10
|
+
return type === m365_spec_parser_1.ProjectType.Copilot
|
|
11
|
+
? {
|
|
12
|
+
isGptPlugin: isDeclarativeAgent,
|
|
13
|
+
allowAPIKeyAuth: false,
|
|
14
|
+
allowBearerTokenAuth: platform !== teamsfx_api_1.Platform.VS,
|
|
15
|
+
allowMultipleParameters: true,
|
|
16
|
+
allowOauth2: platform !== teamsfx_api_1.Platform.VS,
|
|
17
|
+
projectType: m365_spec_parser_1.ProjectType.Copilot,
|
|
18
|
+
allowMissingId: true,
|
|
19
|
+
allowSwagger: true,
|
|
20
|
+
allowMethods: [
|
|
21
|
+
"get",
|
|
22
|
+
"post",
|
|
23
|
+
"put",
|
|
24
|
+
"delete",
|
|
25
|
+
"patch",
|
|
26
|
+
"head",
|
|
27
|
+
"connect",
|
|
28
|
+
"options",
|
|
29
|
+
"trace",
|
|
30
|
+
],
|
|
31
|
+
allowResponseSemantics: true,
|
|
32
|
+
allowConversationStarters: false,
|
|
33
|
+
allowConfirmation: false,
|
|
34
|
+
}
|
|
35
|
+
: type === m365_spec_parser_1.ProjectType.TeamsAi
|
|
36
|
+
? {
|
|
37
|
+
allowAPIKeyAuth: true,
|
|
38
|
+
allowBearerTokenAuth: true,
|
|
39
|
+
allowMultipleParameters: true,
|
|
40
|
+
allowOauth2: true,
|
|
41
|
+
projectType: m365_spec_parser_1.ProjectType.TeamsAi,
|
|
42
|
+
allowMethods: [
|
|
43
|
+
"get",
|
|
44
|
+
"post",
|
|
45
|
+
"put",
|
|
46
|
+
"delete",
|
|
47
|
+
"patch",
|
|
48
|
+
"head",
|
|
49
|
+
"connect",
|
|
50
|
+
"options",
|
|
51
|
+
"trace",
|
|
52
|
+
],
|
|
53
|
+
}
|
|
54
|
+
: {
|
|
55
|
+
projectType: type,
|
|
56
|
+
allowBearerTokenAuth: platform !== teamsfx_api_1.Platform.VS,
|
|
57
|
+
allowMultipleParameters: true,
|
|
58
|
+
allowOauth2: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.SMEOAuth),
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
//# sourceMappingURL=openApiParserOptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openApiParserOptions.js","sourceRoot":"","sources":["../../src/common/openApiParserOptions.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAMlC,4CAuDC;AA3DD,kEAAwE;AACxE,wDAAkD;AAClD,iDAAkE;AAElE,SAAgB,gBAAgB,CAC9B,IAAiB,EACjB,kBAA4B,EAC5B,QAAiB;IAEjB,OAAO,IAAI,KAAK,8BAAW,CAAC,OAAO;QACjC,CAAC,CAAC;YACE,WAAW,EAAE,kBAAkB;YAC/B,eAAe,EAAE,KAAK;YACtB,oBAAoB,EAAE,QAAQ,KAAK,sBAAQ,CAAC,EAAE;YAC9C,uBAAuB,EAAE,IAAI;YAC7B,WAAW,EAAE,QAAQ,KAAK,sBAAQ,CAAC,EAAE;YACrC,WAAW,EAAE,8BAAW,CAAC,OAAO;YAChC,cAAc,EAAE,IAAI;YACpB,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE;gBACZ,KAAK;gBACL,MAAM;gBACN,KAAK;gBACL,QAAQ;gBACR,OAAO;gBACP,MAAM;gBACN,SAAS;gBACT,SAAS;gBACT,OAAO;aACR;YACD,sBAAsB,EAAE,IAAI;YAC5B,yBAAyB,EAAE,KAAK;YAChC,iBAAiB,EAAE,KAAK;SACzB;QACH,CAAC,CAAC,IAAI,KAAK,8BAAW,CAAC,OAAO;YAC5B,CAAC,CAAC;gBACE,eAAe,EAAE,IAAI;gBACrB,oBAAoB,EAAE,IAAI;gBAC1B,uBAAuB,EAAE,IAAI;gBAC7B,WAAW,EAAE,IAAI;gBACjB,WAAW,EAAE,8BAAW,CAAC,OAAO;gBAChC,YAAY,EAAE;oBACZ,KAAK;oBACL,MAAM;oBACN,KAAK;oBACL,QAAQ;oBACR,OAAO;oBACP,MAAM;oBACN,SAAS;oBACT,SAAS;oBACT,OAAO;iBACR;aACF;YACH,CAAC,CAAC;gBACE,WAAW,EAAE,IAAI;gBACjB,oBAAoB,EAAE,QAAQ,KAAK,sBAAQ,CAAC,EAAE;gBAC9C,uBAAuB,EAAE,IAAI;gBAC7B,WAAW,EAAE,iCAAkB,CAAC,eAAe,CAAC,2BAAY,CAAC,QAAQ,CAAC;aACvE,CAAC;AACV,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../../src/common/secretmasker/dict.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,gBAAgB,CAAK;;IAM7B,OAAO,CAAC,IAAI;IAML,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOvB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAqBxB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;CAmBhE;AAED,cAAM,iBAAiB;IACrB,WAAW,EAAE,WAAW,CAAC;;IAIzB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM;CAOnD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"dict.d.ts","sourceRoot":"","sources":["../../../src/common/secretmasker/dict.ts"],"names":[],"mappings":"AAQA;;GAEG;AACH,qBAAa,WAAW;IACtB,OAAO,CAAC,IAAI,CAAa;IACzB,OAAO,CAAC,QAAQ,CAAa;IAC7B,OAAO,CAAC,gBAAgB,CAAK;;IAM7B,OAAO,CAAC,IAAI;IAML,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAOvB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;WAqBxB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW;CAmBhE;AAED,cAAM,iBAAiB;IACrB,WAAW,EAAE,WAAW,CAAC;;IAIzB,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM;CAOnD;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAM1D;AAED,eAAO,MAAM,WAAW,mBAA0B,CAAC"}
|
|
@@ -78,8 +78,11 @@ class DictionaryMatcher {
|
|
|
78
78
|
}
|
|
79
79
|
}
|
|
80
80
|
function trimNonAlphabetChars(token) {
|
|
81
|
-
// Regular expression to match non-alphabet characters at the beginning and end
|
|
82
|
-
|
|
81
|
+
// Regular expression to match non-alphabet characters at the beginning and end.
|
|
82
|
+
// The positive lookbehind (?<=[a-zA-Z]) pins the trailing match to start right after
|
|
83
|
+
// an alphabet char, removing the start-position ambiguity that caused quadratic
|
|
84
|
+
// backtracking (ReDoS) on long runs of trailing non-alphabet characters.
|
|
85
|
+
return token.replace(/^[^a-zA-Z]+|(?<=[a-zA-Z])[^a-zA-Z]+$/g, "");
|
|
83
86
|
}
|
|
84
87
|
exports.dictMatcher = new DictionaryMatcher();
|
|
85
88
|
//# sourceMappingURL=dict.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dict.js","sourceRoot":"","sources":["../../../src/common/secretmasker/dict.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAwFlC,
|
|
1
|
+
{"version":3,"file":"dict.js","sourceRoot":"","sources":["../../../src/common/secretmasker/dict.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @author yuqzho@microsoft.com
|
|
3
3
|
*/
|
|
4
|
-
import { ErrorResult as ApiSpecErrorResult, ErrorType as ApiSpecErrorType, AuthType,
|
|
4
|
+
import { ErrorResult as ApiSpecErrorResult, ErrorType as ApiSpecErrorType, AuthType, ProjectType, SpecParser, SpecParserError, WarningResult } from "@microsoft/m365-spec-parser";
|
|
5
5
|
import { ApiOperation, Context, FxError, Inputs, Result, TeamsAppManifest, Warning } from "@microsoft/teamsfx-api";
|
|
6
6
|
import { OpenAPIV3 } from "openapi-types";
|
|
7
7
|
import { AuthActionInjectResult } from "../../configManager/actionInjector";
|
|
8
|
-
export
|
|
8
|
+
export { getParserOptions } from "../../../common/openApiParserOptions";
|
|
9
9
|
export declare const specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
|
|
10
10
|
export declare const specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
|
|
11
11
|
export declare const specParserGenerateResultWarningsTelemetryProperty = "warnings";
|
|
@@ -50,5 +50,4 @@ export declare function updateForCustomApi(spec: OpenAPIV3.Document, language: s
|
|
|
50
50
|
export declare function getEnvName(authName: string): string;
|
|
51
51
|
export declare function copyKiotaFolder(specPath: string, projectPath: string): Promise<void>;
|
|
52
52
|
export declare function generateAdaptiveCardInPluginManifestForKiota(pluginManifestPath: string, specPath: string, context: Context): Promise<void>;
|
|
53
|
-
export {};
|
|
54
53
|
//# sourceMappingURL=helper.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/helper.ts"],"names":[],"mappings":"AAGA;;GAEG;AAEH,OAAO,EAGL,WAAW,IAAI,kBAAkB,EACjC,SAAS,IAAI,gBAAgB,EAC7B,QAAQ,EAKR,
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/helper.ts"],"names":[],"mappings":"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"}
|