@microsoft/teamsfx-core 3.1.3 → 3.1.4-alpha.26ce7a8dda.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/templates-config.json +4 -4
- package/build/component/configManager/actionInjector.d.ts +13 -3
- package/build/component/configManager/actionInjector.d.ts.map +1 -1
- package/build/component/configManager/actionInjector.js +88 -5
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.d.ts.map +1 -1
- package/build/component/driver/teamsApp/utils/utils.js +1 -18
- package/build/component/driver/teamsApp/utils/utils.js.map +1 -1
- package/build/component/generator/openApiSpec/helper.d.ts +2 -2
- package/build/component/generator/openApiSpec/helper.d.ts.map +1 -1
- package/build/component/generator/openApiSpec/helper.js +65 -5
- package/build/component/generator/openApiSpec/helper.js.map +1 -1
- package/build/component/generator/openPlugin/authResolver.d.ts +2 -2
- package/build/component/generator/openPlugin/authResolver.d.ts.map +1 -1
- package/build/component/generator/openPlugin/authResolver.js +17 -7
- package/build/component/generator/openPlugin/authResolver.js.map +1 -1
- package/build/component/generator/openPlugin/errors.d.ts +4 -0
- package/build/component/generator/openPlugin/errors.d.ts.map +1 -0
- package/build/component/generator/openPlugin/errors.js +13 -0
- package/build/component/generator/openPlugin/errors.js.map +1 -0
- package/build/component/generator/openPlugin/exporter.d.ts +9 -6
- package/build/component/generator/openPlugin/exporter.d.ts.map +1 -1
- package/build/component/generator/openPlugin/exporter.js +502 -53
- package/build/component/generator/openPlugin/exporter.js.map +1 -1
- package/build/component/generator/openPlugin/fileSystem.d.ts +28 -0
- package/build/component/generator/openPlugin/fileSystem.d.ts.map +1 -0
- package/build/component/generator/openPlugin/fileSystem.js +181 -0
- package/build/component/generator/openPlugin/fileSystem.js.map +1 -0
- package/build/component/generator/openPlugin/iconStrategy.d.ts.map +1 -1
- package/build/component/generator/openPlugin/iconStrategy.js +30 -14
- package/build/component/generator/openPlugin/iconStrategy.js.map +1 -1
- package/build/component/generator/openPlugin/importer.d.ts.map +1 -1
- package/build/component/generator/openPlugin/importer.js +75 -12
- package/build/component/generator/openPlugin/importer.js.map +1 -1
- package/build/component/generator/openPlugin/mapper.d.ts +3 -2
- package/build/component/generator/openPlugin/mapper.d.ts.map +1 -1
- package/build/component/generator/openPlugin/mapper.js +188 -29
- package/build/component/generator/openPlugin/mapper.js.map +1 -1
- package/build/component/generator/openPlugin/parser.d.ts.map +1 -1
- package/build/component/generator/openPlugin/parser.js +264 -70
- package/build/component/generator/openPlugin/parser.js.map +1 -1
- package/build/component/generator/openPlugin/skillValidation.d.ts +2 -0
- package/build/component/generator/openPlugin/skillValidation.d.ts.map +1 -0
- package/build/component/generator/openPlugin/skillValidation.js +63 -0
- package/build/component/generator/openPlugin/skillValidation.js.map +1 -0
- package/build/component/generator/openPlugin/spec.d.ts +67 -0
- package/build/component/generator/openPlugin/spec.d.ts.map +1 -0
- package/build/component/generator/openPlugin/spec.js +157 -0
- package/build/component/generator/openPlugin/spec.js.map +1 -0
- package/build/component/generator/openPlugin/textUtils.d.ts +1 -1
- package/build/component/generator/openPlugin/textUtils.d.ts.map +1 -1
- package/build/component/generator/openPlugin/textUtils.js +8 -7
- package/build/component/generator/openPlugin/textUtils.js.map +1 -1
- package/build/component/generator/openPlugin/types.d.ts +76 -14
- package/build/component/generator/openPlugin/types.d.ts.map +1 -1
- package/build/component/generator/openPlugin/validation.d.ts +17 -0
- package/build/component/generator/openPlugin/validation.d.ts.map +1 -0
- package/build/component/generator/openPlugin/validation.js +563 -0
- package/build/component/generator/openPlugin/validation.js.map +1 -0
- package/build/component/utils/common.d.ts +1 -9
- package/build/component/utils/common.d.ts.map +1 -1
- package/build/component/utils/common.js +7 -37
- package/build/component/utils/common.js.map +1 -1
- package/build/component/utils/envFunctionUtils.d.ts +3 -8
- package/build/component/utils/envFunctionUtils.d.ts.map +1 -1
- package/build/component/utils/envFunctionUtils.js +46 -131
- package/build/component/utils/envFunctionUtils.js.map +1 -1
- package/build/component/utils/envUtil.d.ts.map +1 -1
- package/build/component/utils/envUtil.js +7 -6
- package/build/component/utils/envUtil.js.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.d.ts +6 -0
- package/build/component/utils/mcpAuthScaffolder.d.ts.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.js +17 -7
- package/build/component/utils/mcpAuthScaffolder.js.map +1 -1
- package/build/core/FxCore.d.ts +3 -2
- package/build/core/FxCore.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.d.ts +8 -2
- package/build/core/FxCore.declarativeAgent.d.ts.map +1 -1
- package/build/core/FxCore.declarativeAgent.js +109 -6
- package/build/core/FxCore.declarativeAgent.js.map +1 -1
- package/build/core/FxCore.js +42 -3
- package/build/core/FxCore.js.map +1 -1
- package/build/core/FxCore.openPlugin.d.ts +7 -6
- package/build/core/FxCore.openPlugin.d.ts.map +1 -1
- package/build/core/FxCore.openPlugin.js +7 -6
- package/build/core/FxCore.openPlugin.js.map +1 -1
- package/build/error/common.d.ts +9 -0
- package/build/error/common.d.ts.map +1 -1
- package/build/error/common.js +40 -1
- package/build/error/common.js.map +1 -1
- package/build/question/generator.d.ts.map +1 -1
- package/build/question/generator.js +9 -9
- package/build/question/generator.js.map +1 -1
- package/build/question/inputs/AddAuthActionInputs.d.ts +6 -0
- package/build/question/inputs/AddAuthActionInputs.d.ts.map +1 -1
- package/build/question/inputs/AddPluginInputs.d.ts +15 -1
- package/build/question/inputs/AddPluginInputs.d.ts.map +1 -1
- package/build/question/options/AddAuthActionOptions.d.ts.map +1 -1
- package/build/question/options/AddAuthActionOptions.js +19 -0
- package/build/question/options/AddAuthActionOptions.js.map +1 -1
- package/build/question/options/AddPluginOptions.d.ts.map +1 -1
- package/build/question/options/AddPluginOptions.js +45 -1
- package/build/question/options/AddPluginOptions.js.map +1 -1
- package/build/question/options/ExportOpenPluginOptions.js +2 -2
- package/build/question/options/ExportOpenPluginOptions.js.map +1 -1
- package/build/question/options/ImportOpenPluginOptions.js +4 -4
- package/build/question/options/ImportOpenPluginOptions.js.map +1 -1
- package/build/question/other.d.ts +2 -0
- package/build/question/other.d.ts.map +1 -1
- package/build/question/other.js +174 -8
- package/build/question/other.js.map +1 -1
- package/build/question/questionNames.d.ts +6 -0
- package/build/question/questionNames.d.ts.map +1 -1
- package/build/question/questionNames.js +6 -0
- package/build/question/questionNames.js.map +1 -1
- package/build/question/scaffold/vsc/rootNode.js +1 -1
- package/build/question/scaffold/vsc/rootNode.js.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts +2 -0
- package/build/question/scaffold/vsc/teamsProjectTypeNode.d.ts.map +1 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js +31 -1
- package/build/question/scaffold/vsc/teamsProjectTypeNode.js.map +1 -1
- package/build/ui/visitor.d.ts.map +1 -1
- package/build/ui/visitor.js +1 -0
- package/build/ui/visitor.js.map +1 -1
- package/build/v4/mcp/mcpAuthAction.d.ts +2 -1
- package/build/v4/mcp/mcpAuthAction.d.ts.map +1 -1
- package/build/v4/mcp/mcpAuthAction.js +32 -5
- package/build/v4/mcp/mcpAuthAction.js.map +1 -1
- package/build/v4/mcp/mcpAuthScaffold.d.ts +3 -0
- package/build/v4/mcp/mcpAuthScaffold.d.ts.map +1 -1
- package/build/v4/mcp/mcpAuthScaffold.js +61 -38
- package/build/v4/mcp/mcpAuthScaffold.js.map +1 -1
- package/build/v4/runtime/steps/mcpAuth.d.ts.map +1 -1
- package/build/v4/runtime/steps/mcpAuth.js +15 -4
- package/build/v4/runtime/steps/mcpAuth.js.map +1 -1
- package/package.json +37 -37
- package/resource/package.nls.json +30 -0
- package/templates/configs/local/typescript/.gitignore +1 -0
- package/templates/configs/playground/typescript/.gitignore +4 -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/floor.json +1 -1
- package/templates/v4/templates-metadata.zip +0 -0
- package/templates/v4/templates.zip +0 -0
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// Copyright (c) Microsoft Corporation.
|
|
3
3
|
// Licensed under the MIT license.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
+
exports.getEnvironmentVariables = exports.expandEnvironmentVariable = void 0;
|
|
5
6
|
exports.checkMissingArgs = checkMissingArgs;
|
|
6
7
|
exports.asOptional = asOptional;
|
|
7
8
|
exports.asBoolean = asBoolean;
|
|
@@ -10,8 +11,6 @@ exports.asFactory = asFactory;
|
|
|
10
11
|
exports.wrapRun = wrapRun;
|
|
11
12
|
exports.errorHandle = errorHandle;
|
|
12
13
|
exports.wrapSummary = wrapSummary;
|
|
13
|
-
exports.expandEnvironmentVariable = expandEnvironmentVariable;
|
|
14
|
-
exports.getEnvironmentVariables = getEnvironmentVariables;
|
|
15
14
|
exports.getAbsolutePath = getAbsolutePath;
|
|
16
15
|
exports.outputScaffoldingWarningMessage = outputScaffoldingWarningMessage;
|
|
17
16
|
const tslib_1 = require("tslib");
|
|
@@ -21,7 +20,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
|
|
|
21
20
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
22
21
|
const constant_1 = require("../configManager/constant");
|
|
23
22
|
const os_1 = require("os");
|
|
24
|
-
const placeholderRegex = /\${{ *[a-zA-Z_][a-zA-Z0-9_]* *}}/g;
|
|
25
23
|
/**
|
|
26
24
|
* check parameter, throw error if value is null or undefined
|
|
27
25
|
* @param name parameter name
|
|
@@ -103,40 +101,12 @@ async function wrapSummary(exec, summary) {
|
|
|
103
101
|
return { result, summaries };
|
|
104
102
|
}
|
|
105
103
|
}
|
|
106
|
-
//
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
const envValue = envs ? envs[envName] : process.env[envName];
|
|
113
|
-
if (envName === "APP_NAME_SUFFIX") {
|
|
114
|
-
if (envValue !== undefined && envValue !== null) {
|
|
115
|
-
content = content.replace(placeholder, envValue);
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
else {
|
|
119
|
-
if (envValue) {
|
|
120
|
-
content = content.replace(placeholder, envValue);
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
return content;
|
|
126
|
-
}
|
|
127
|
-
/**
|
|
128
|
-
* Expand environment variables in content. The format of referencing environment variable is: ${{ENV_NAME}}
|
|
129
|
-
* @return An array of environment variables
|
|
130
|
-
*/
|
|
131
|
-
function getEnvironmentVariables(content) {
|
|
132
|
-
const placeholders = content.match(placeholderRegex);
|
|
133
|
-
if (placeholders) {
|
|
134
|
-
const variables = placeholders.map((placeholder) => placeholder.slice(3, -2).trim()); // removes `${{` and `}}`)
|
|
135
|
-
// remove duplicates
|
|
136
|
-
return [...new Set(variables)];
|
|
137
|
-
}
|
|
138
|
-
return [];
|
|
139
|
-
}
|
|
104
|
+
// Manifest env-variable (`${{ENV_NAME}}`) expansion lives in @microsoft/app-manifest
|
|
105
|
+
// (re-exported via @microsoft/teamsfx-api) so hosts can resolve manifests without
|
|
106
|
+
// fx-core. Re-exported here to keep the existing import path for fx-core call sites.
|
|
107
|
+
var teamsfx_api_2 = require("@microsoft/teamsfx-api");
|
|
108
|
+
Object.defineProperty(exports, "expandEnvironmentVariable", { enumerable: true, get: function () { return teamsfx_api_2.expandEnvironmentVariable; } });
|
|
109
|
+
Object.defineProperty(exports, "getEnvironmentVariables", { enumerable: true, get: function () { return teamsfx_api_2.getEnvironmentVariables; } });
|
|
140
110
|
function getAbsolutePath(relativeOrAbsolutePath, projectPath) {
|
|
141
111
|
relativeOrAbsolutePath = relativeOrAbsolutePath || "";
|
|
142
112
|
projectPath = projectPath || "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/component/utils/common.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,8 @@
|
|
|
1
|
-
import { FxError, Result } from "@microsoft/teamsfx-api";
|
|
1
|
+
import { FxError, Result, ManifestType } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { DriverContext } from "../driver/interface/commonArgs";
|
|
3
|
-
export
|
|
4
|
-
TeamsManifest = "teams-manifest",
|
|
5
|
-
PluginManifest = "plugin-manifest",
|
|
6
|
-
DeclarativeCopilotManifest = "declarative-copilot-manifest",
|
|
7
|
-
ApiSpec = "api-spec",
|
|
8
|
-
EmbeddedKnowledgeFile = "embedded-knowledge-file"
|
|
9
|
-
}
|
|
3
|
+
export { ManifestType };
|
|
10
4
|
export declare function expandVariableWithFunction(content: string, ctx: DriverContext, envs: {
|
|
11
5
|
[key in string]: string;
|
|
12
6
|
} | undefined, isJson: boolean, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
|
|
7
|
+
export declare function resolveManifestWithContext(content: string, ctx: DriverContext, manifestType: ManifestType, fromPath: string): Promise<Result<string, FxError>>;
|
|
13
8
|
//# sourceMappingURL=envFunctionUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,
|
|
1
|
+
{"version":3,"file":"envFunctionUtils.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,OAAO,EAGP,MAAM,EAGN,YAAY,EAWb,MAAM,wBAAwB,CAAC;AAGhC,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAY/D,OAAO,EAAE,YAAY,EAAE,CAAC;AA+ExB,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE;KAAG,GAAG,IAAI,MAAM,GAAG,MAAM;CAAE,GAAG,SAAS,EAC7C,MAAM,EAAE,OAAO,EACf,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC;AAID,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,aAAa,EAClB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAMlC"}
|
|
@@ -2,15 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ManifestType = void 0;
|
|
4
4
|
exports.expandVariableWithFunction = expandVariableWithFunction;
|
|
5
|
-
|
|
5
|
+
exports.resolveManifestWithContext = resolveManifestWithContext;
|
|
6
6
|
// Copyright (c) Microsoft Corporation.
|
|
7
7
|
// Licensed under the MIT license.
|
|
8
8
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
9
|
-
|
|
10
|
-
const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
|
|
11
|
-
const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
9
|
+
Object.defineProperty(exports, "ManifestType", { enumerable: true, get: function () { return teamsfx_api_1.ManifestType; } });
|
|
12
10
|
const error_1 = require("../../error");
|
|
13
|
-
const common_1 = require("./common");
|
|
14
11
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
15
12
|
const source = "ResolveManifestFunction";
|
|
16
13
|
const telemetryEvent = "manifest-with-function";
|
|
@@ -20,146 +17,64 @@ var TelemetryPropertyKey;
|
|
|
20
17
|
TelemetryPropertyKey["manifestType"] = "manifest-type";
|
|
21
18
|
TelemetryPropertyKey["functionCount"] = "function-count";
|
|
22
19
|
})(TelemetryPropertyKey || (TelemetryPropertyKey = {}));
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
ManifestType["EmbeddedKnowledgeFile"] = "embedded-knowledge-file";
|
|
30
|
-
})(ManifestType || (exports.ManifestType = ManifestType = {}));
|
|
31
|
-
async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
|
|
32
|
-
const regex = /\$\[ *[a-zA-Z][a-zA-Z]*\([^\]]*\) *\]/g;
|
|
33
|
-
const matches = content.match(regex);
|
|
34
|
-
if (!matches) {
|
|
35
|
-
return (0, teamsfx_api_1.ok)(content); // no function
|
|
36
|
-
}
|
|
37
|
-
let count = 0;
|
|
38
|
-
for (const placeholder of matches) {
|
|
39
|
-
const processedRes = await processFunction(placeholder.slice(2, -1).trim(), ctx, envs, fromPath);
|
|
40
|
-
if (processedRes.isErr()) {
|
|
41
|
-
return (0, teamsfx_api_1.err)(processedRes.error);
|
|
42
|
-
}
|
|
43
|
-
let value = processedRes.value;
|
|
44
|
-
if (isJson && value) {
|
|
45
|
-
value = JSON.stringify(value).slice(1, -1);
|
|
46
|
-
}
|
|
47
|
-
if (value) {
|
|
48
|
-
count += 1;
|
|
49
|
-
content = content.replace(placeholder, value);
|
|
50
|
-
}
|
|
20
|
+
// Map a plain error thrown by @microsoft/app-manifest's resolver to the localized
|
|
21
|
+
// FxError surface fx-core drivers expect, emitting the same diagnostic logs as before.
|
|
22
|
+
function toFxError(e, ctx) {
|
|
23
|
+
if (e instanceof teamsfx_api_1.UnsupportedFileFormatError) {
|
|
24
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", e.filePath, "txt"));
|
|
25
|
+
return new UnsupportedFileFormatError(ctx.platform);
|
|
51
26
|
}
|
|
52
|
-
if (
|
|
53
|
-
ctx.
|
|
54
|
-
|
|
55
|
-
[TelemetryPropertyKey.functionCount]: count.toString(),
|
|
56
|
-
});
|
|
27
|
+
if (e instanceof teamsfx_api_1.InvalidFunctionError) {
|
|
28
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", e.token, "file"));
|
|
29
|
+
return new InvalidFunctionError(ctx.platform);
|
|
57
30
|
}
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
const firstTrimmedContent = content.trim();
|
|
62
|
-
if (!firstTrimmedContent.startsWith("file(") || !firstTrimmedContent.endsWith(")")) {
|
|
63
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFunction.errorLog", firstTrimmedContent, "file"));
|
|
64
|
-
return (0, teamsfx_api_1.err)(new InvalidFunctionError(ctx.platform));
|
|
31
|
+
if (e instanceof teamsfx_api_1.InvalidFunctionParameterError) {
|
|
32
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", e.token, "file"));
|
|
33
|
+
return new InvalidFunctionParameter(ctx.platform);
|
|
65
34
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
// static string as function parameter
|
|
70
|
-
const res = await readFileContent(trimmedParameter.substring(1, trimmedParameter.length - 1), ctx, envs, path);
|
|
71
|
-
return res;
|
|
35
|
+
if (e instanceof teamsfx_api_1.ReadFileError) {
|
|
36
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", e.filePath, e.cause?.toString()));
|
|
37
|
+
return new ReadFileError(ctx.platform, e.filePath);
|
|
72
38
|
}
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
const resolvedParameter = (0, common_1.expandEnvironmentVariable)(trimmedParameter, envs);
|
|
76
|
-
const res = readFileContent(resolvedParameter, ctx, envs, path);
|
|
77
|
-
return res;
|
|
39
|
+
if (e instanceof teamsfx_api_1.FileNotFoundError) {
|
|
40
|
+
return new error_1.FileNotFoundError(source, e.filePath);
|
|
78
41
|
}
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
if (processsedRes.isErr()) {
|
|
83
|
-
return (0, teamsfx_api_1.err)(processsedRes.error);
|
|
84
|
-
}
|
|
85
|
-
const readFileRes = await readFileContent(processsedRes.value, ctx, envs, path);
|
|
86
|
-
return readFileRes;
|
|
42
|
+
if (e instanceof teamsfx_api_1.FileReferenceOutsideManifestDirectoryError) {
|
|
43
|
+
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.fileReferenceOutsideManifestDirectory.errorLog.local", e.fileReference, e.resolvedPath, e.manifestDirectory, "$[file()]"));
|
|
44
|
+
return new FileReferenceOutsideManifestDirectoryError(e.fileReference, e.resolvedPath, e.manifestDirectory);
|
|
87
45
|
}
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.invalidFunctionParameter.errorLog", trimmedParameter, "file"));
|
|
91
|
-
return (0, teamsfx_api_1.err)(new InvalidFunctionParameter(ctx.platform));
|
|
46
|
+
if (e instanceof teamsfx_api_1.MissingEnvironmentVariablesError) {
|
|
47
|
+
return new error_1.MissingEnvironmentVariablesError("manifest", e.names, e.fromPath);
|
|
92
48
|
}
|
|
49
|
+
// Anything else is unexpected; wrap it so the Result<T, FxError> contract holds.
|
|
50
|
+
return (0, error_1.assembleError)(e, source);
|
|
93
51
|
}
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
if (!isPathContained(manifestDirectory, absolutePath)) {
|
|
99
|
-
return fileReferenceOutsideManifestDirectory(ctx, filePath, absolutePath, manifestDirectory);
|
|
100
|
-
}
|
|
101
|
-
if (!isSupportedFileFormat(filePath)) {
|
|
102
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.unsupportedFile.errorLog", safeFileReference, "txt"));
|
|
103
|
-
return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
|
|
104
|
-
}
|
|
105
|
-
let realManifestDirectory;
|
|
106
|
-
let realFilePath;
|
|
52
|
+
// Run a resolver that yields { content, functionCount }, mapping thrown
|
|
53
|
+
// ManifestTemplateErrors to localized FxError and emitting function-count telemetry.
|
|
54
|
+
async function runManifestResolver(resolve, ctx, manifestType) {
|
|
55
|
+
let resolved;
|
|
107
56
|
try {
|
|
108
|
-
|
|
109
|
-
realFilePath = await fs_extra_1.default.realpath(absolutePath);
|
|
110
|
-
}
|
|
111
|
-
catch (error) {
|
|
112
|
-
if (isFileNotFoundError(error)) {
|
|
113
|
-
return (0, teamsfx_api_1.err)(new error_1.FileNotFoundError(source, safeFileReference));
|
|
114
|
-
}
|
|
115
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", safeFileReference, getFileSystemErrorCode(error)));
|
|
116
|
-
return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, safeFileReference));
|
|
117
|
-
}
|
|
118
|
-
if (!isPathContained(realManifestDirectory, realFilePath)) {
|
|
119
|
-
return fileReferenceOutsideManifestDirectory(ctx, filePath, realFilePath, manifestDirectory);
|
|
57
|
+
resolved = await resolve();
|
|
120
58
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
return (0, teamsfx_api_1.err)(new UnsupportedFileFormatError(ctx.platform));
|
|
59
|
+
catch (e) {
|
|
60
|
+
return (0, teamsfx_api_1.err)(toFxError(e, ctx));
|
|
124
61
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
return (0, teamsfx_api_1.ok)(processedFileContent);
|
|
131
|
-
}
|
|
132
|
-
catch (error) {
|
|
133
|
-
ctx.logProvider.error((0, localizeUtils_1.getLocalizedString)("core.envFunc.readFile.errorLog", safeFileReference, getFileSystemErrorCode(error)));
|
|
134
|
-
return (0, teamsfx_api_1.err)(new ReadFileError(ctx.platform, safeFileReference));
|
|
62
|
+
if (resolved.functionCount > 0) {
|
|
63
|
+
ctx.telemetryReporter?.sendTelemetryEvent(telemetryEvent, {
|
|
64
|
+
[TelemetryPropertyKey.manifestType]: manifestType.toString(),
|
|
65
|
+
[TelemetryPropertyKey.functionCount]: resolved.functionCount.toString(),
|
|
66
|
+
});
|
|
135
67
|
}
|
|
68
|
+
return (0, teamsfx_api_1.ok)(resolved.content);
|
|
136
69
|
}
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
return (
|
|
140
|
-
(relativePath !== ".." &&
|
|
141
|
-
!relativePath.startsWith(`..${path_1.default.sep}`) &&
|
|
142
|
-
!path_1.default.isAbsolute(relativePath)));
|
|
143
|
-
}
|
|
144
|
-
function isSupportedFileFormat(filePath) {
|
|
145
|
-
const extension = path_1.default.extname(filePath).toLowerCase();
|
|
146
|
-
return extension === ".txt" || extension === ".md";
|
|
147
|
-
}
|
|
148
|
-
function isFileNotFoundError(error) {
|
|
149
|
-
return getFileSystemErrorCode(error) === "ENOENT";
|
|
150
|
-
}
|
|
151
|
-
function getFileSystemErrorCode(error) {
|
|
152
|
-
return typeof error === "object" &&
|
|
153
|
-
error !== null &&
|
|
154
|
-
"code" in error &&
|
|
155
|
-
typeof error.code === "string"
|
|
156
|
-
? error.code
|
|
157
|
-
: "UNKNOWN";
|
|
70
|
+
// Expand only `$[file()]` macros, leaving `${{ENV}}` substitution to the caller.
|
|
71
|
+
async function expandVariableWithFunction(content, ctx, envs, isJson, manifestType, fromPath) {
|
|
72
|
+
return runManifestResolver(() => (0, teamsfx_api_1.expandFileFunctionMacros)(content, isJson, { envs, fromPath }), ctx, manifestType);
|
|
158
73
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
return (0, teamsfx_api_1.
|
|
74
|
+
// Fully resolve a manifest via @microsoft/app-manifest's resolveManifest (shared
|
|
75
|
+
// file()+env logic), adding the fx-core concerns it is agnostic to.
|
|
76
|
+
async function resolveManifestWithContext(content, ctx, manifestType, fromPath) {
|
|
77
|
+
return runManifestResolver(() => (0, teamsfx_api_1.resolveManifest)(content, { manifestType, fromPath }), ctx, manifestType);
|
|
163
78
|
}
|
|
164
79
|
class UnsupportedFileFormatError extends teamsfx_api_1.UserError {
|
|
165
80
|
constructor(platform) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"envFunctionUtils.js","sourceRoot":"","sources":["../../../src/component/utils/envFunctionUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IASjF,QAAQ,CACN,qBAAqB,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,EACvD,oBAAoB,EAAE,YAAY;IASpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"envUtil.d.ts","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAelE,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;CACrB,CAAC;AAeF,cAAM,OAAO;IACX;;;;;;;;;OASG;IACG,OAAO,CACX,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,gBAAgB,UAAO,EACvB,MAAM,UAAO,GACZ,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IAkFnC,WAAW,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IASjF,QAAQ,CACN,qBAAqB,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,EACvD,oBAAoB,EAAE,YAAY;IASpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,WAAW,EAAE,MAAM,EACnB,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAmEhC,OAAO,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAc1F,UAAU,CAAC,GAAG,EAAE,YAAY,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC;IAOlD,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,YAAY;IAQlD,0BAA0B,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAO/D,QAAQ,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAY/E,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAW7E;AAED,eAAO,MAAM,OAAO,SAAgB,CAAC;AAGrC,KAAK,gBAAgB,GACnB,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,GAAG,GAAG,GAAG,CAAA;CAAE,CAAC;AAC/E,UAAU,iBAAiB;IACzB,KAAK,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAC3B,GAAG,EAAE,YAAY,CAAC;CACnB;AAED,cAAM,UAAU;IACd,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,iBAAiB;IA6CpD,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,MAAM;CAmC7C;AAED,eAAO,MAAM,UAAU,YAAmB,CAAC"}
|
|
@@ -146,12 +146,13 @@ class EnvUtil {
|
|
|
146
146
|
const secretEnv = {};
|
|
147
147
|
for (const key of Object.keys(envs)) {
|
|
148
148
|
let value = envs[key];
|
|
149
|
-
if (
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
149
|
+
if (key.startsWith("SECRET_")) {
|
|
150
|
+
if (value) {
|
|
151
|
+
const res = cryptoProvider.encrypt(value);
|
|
152
|
+
if (res.isErr())
|
|
153
|
+
return (0, teamsfx_api_1.err)(res.error);
|
|
154
|
+
value = res.value;
|
|
155
|
+
}
|
|
155
156
|
secretEnv[key] = value;
|
|
156
157
|
}
|
|
157
158
|
else if (key === configure_1.internalOutputNames.teamsAppUpdateTime) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"envUtil.js","sourceRoot":"","sources":["../../../src/component/utils/envUtil.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,6 +31,9 @@ export interface ResolvedMCPAuthEndpoints {
|
|
|
31
31
|
export declare function deriveMCPManifestOAuth(authType: string | undefined, registrationId: string | undefined): {
|
|
32
32
|
type: "OAuthPluginVault";
|
|
33
33
|
reference_id: string;
|
|
34
|
+
} | {
|
|
35
|
+
type: "ApiKeyPluginVault";
|
|
36
|
+
reference_id: string;
|
|
34
37
|
} | undefined;
|
|
35
38
|
/**
|
|
36
39
|
* Resolve OAuth endpoints based on the user's `mcp-da-auth-type` choice.
|
|
@@ -110,6 +113,7 @@ export declare function injectMCPAuthActionToYml(args: {
|
|
|
110
113
|
persistCredentialEnvRefs?: boolean;
|
|
111
114
|
serverName?: string;
|
|
112
115
|
scopes?: string;
|
|
116
|
+
apiKey?: string;
|
|
113
117
|
}): Promise<InjectMCPAuthActionResult>;
|
|
114
118
|
/**
|
|
115
119
|
* Persist user-provided MCP OAuth credentials into env files so the
|
|
@@ -122,6 +126,7 @@ export declare function injectMCPAuthActionToYml(args: {
|
|
|
122
126
|
* to `env/.env.<env>.user`.
|
|
123
127
|
* - `entra-sso`: writes only `MCP_DA_OAUTH_CLIENT_ID_<NAME>`.
|
|
124
128
|
* - `oauth-dynamic` / `none`: no-op.
|
|
129
|
+
* Omitted static credentials are written as empty placeholders.
|
|
125
130
|
*
|
|
126
131
|
* Writes to every env folder entry returned by `envUtil.listEnv` (typically
|
|
127
132
|
* `dev` for fresh scaffolds; multiple envs for existing projects).
|
|
@@ -133,5 +138,6 @@ export declare function persistMCPAuthCredentialEnvVars(args: {
|
|
|
133
138
|
clientId?: string;
|
|
134
139
|
clientSecret?: string;
|
|
135
140
|
scopes?: string;
|
|
141
|
+
apiKey?: string;
|
|
136
142
|
}): Promise<void>;
|
|
137
143
|
//# sourceMappingURL=mcpAuthScaffolder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthScaffolder.d.ts","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;GAKG;AAEH;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;CAEjC,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"mcpAuthScaffolder.d.ts","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAKhD,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAE3D;;;;;GAKG;AAEH;;;;GAIG;AACH,eAAO,MAAM,qBAAqB;;CAEjC,CAAC;AAEF,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,GAEhC;IAAE,IAAI,EAAE,kBAAkB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GAClD;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACnD,SAAS,CAQZ;AAED;;;;;;;GAOG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,wBAAwB,CAAC,CAenC;AAED;;;;;GAKG;AACH,eAAO,MAAM,kCAAkC,yDACS,CAAC;AAEzD;;;;;;GAMG;AACH,eAAO,MAAM,uCAAuC,uCAAuC,CAAC;AAC5F,eAAO,MAAM,+BAA+B,+BAA+B,CAAC;AAE5E;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAEvE;AAED;;;;GAIG;AACH,eAAO,MAAM,kCAAkC,UAG9C,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC;+CAC2C;IAC3C,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC;wDACoD;IACpD,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,wBAAwB,CAAC;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAiErC;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,+BAA+B,CAAC,IAAI,EAAE;IAC1D,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6BhB"}
|
|
@@ -37,7 +37,7 @@ exports.mcpAuthScaffolderDeps = {
|
|
|
37
37
|
function deriveMCPManifestOAuth(authType, registrationId) {
|
|
38
38
|
if (authType && authType !== "none" && registrationId) {
|
|
39
39
|
return {
|
|
40
|
-
type: "OAuthPluginVault",
|
|
40
|
+
type: authType === "bearer-token" ? "ApiKeyPluginVault" : "OAuthPluginVault",
|
|
41
41
|
reference_id: `\${{${registrationId}}}`,
|
|
42
42
|
};
|
|
43
43
|
}
|
|
@@ -120,6 +120,12 @@ exports.MCP_AUTH_PLACEHOLDER_WARNING_TYPES = [
|
|
|
120
120
|
async function injectMCPAuthActionToYml(args) {
|
|
121
121
|
if (args.authType === "none")
|
|
122
122
|
return {};
|
|
123
|
+
if (args.authType === "bearer-token") {
|
|
124
|
+
await actionInjector_1.ActionInjector.injectCreateAPIKeyActionForMCP(args.ymlPath, args.authName, args.registrationId, args.mcpServerUrl, args.persistCredentialEnvRefs && args.serverName
|
|
125
|
+
? `SECRET_MCP_DA_API_KEY_${args.serverName}`
|
|
126
|
+
: undefined);
|
|
127
|
+
return {};
|
|
128
|
+
}
|
|
123
129
|
if (args.authType === "oauth-dynamic") {
|
|
124
130
|
const placeholderUsed = !args.endpoints.wellKnownUrl;
|
|
125
131
|
const wellKnownUrl = args.endpoints.wellKnownUrl ?? exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER;
|
|
@@ -166,25 +172,29 @@ async function injectMCPAuthActionToYml(args) {
|
|
|
166
172
|
* to `env/.env.<env>.user`.
|
|
167
173
|
* - `entra-sso`: writes only `MCP_DA_OAUTH_CLIENT_ID_<NAME>`.
|
|
168
174
|
* - `oauth-dynamic` / `none`: no-op.
|
|
175
|
+
* Omitted static credentials are written as empty placeholders.
|
|
169
176
|
*
|
|
170
177
|
* Writes to every env folder entry returned by `envUtil.listEnv` (typically
|
|
171
178
|
* `dev` for fresh scaffolds; multiple envs for existing projects).
|
|
172
179
|
*/
|
|
173
180
|
async function persistMCPAuthCredentialEnvVars(args) {
|
|
174
|
-
if (args.authType !== "oauth" &&
|
|
181
|
+
if (args.authType !== "oauth" &&
|
|
182
|
+
args.authType !== "entra-sso" &&
|
|
183
|
+
args.authType !== "bearer-token")
|
|
175
184
|
return;
|
|
176
185
|
const envs = {};
|
|
177
|
-
if (args.
|
|
178
|
-
envs[`MCP_DA_OAUTH_CLIENT_ID_${args.serverName}`] = args.clientId;
|
|
186
|
+
if (args.authType === "oauth" || args.authType === "entra-sso") {
|
|
187
|
+
envs[`MCP_DA_OAUTH_CLIENT_ID_${args.serverName}`] = args.clientId ?? "";
|
|
179
188
|
}
|
|
180
189
|
if (args.authType === "oauth") {
|
|
181
|
-
|
|
182
|
-
envs[`SECRET_MCP_DA_OAUTH_CLIENT_SECRET_${args.serverName}`] = args.clientSecret;
|
|
183
|
-
}
|
|
190
|
+
envs[`SECRET_MCP_DA_OAUTH_CLIENT_SECRET_${args.serverName}`] = args.clientSecret ?? "";
|
|
184
191
|
if (args.scopes) {
|
|
185
192
|
envs[`MCP_DA_OAUTH_SCOPE_${args.serverName}`] = args.scopes;
|
|
186
193
|
}
|
|
187
194
|
}
|
|
195
|
+
else if (args.authType === "bearer-token") {
|
|
196
|
+
envs[`SECRET_MCP_DA_API_KEY_${args.serverName}`] = args.apiKey?.trim() ?? "";
|
|
197
|
+
}
|
|
188
198
|
if (Object.keys(envs).length === 0)
|
|
189
199
|
return;
|
|
190
200
|
const listRes = await envUtil_1.envUtil.listEnv(args.projectPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthScaffolder.js","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAwClC,
|
|
1
|
+
{"version":3,"file":"mcpAuthScaffolder.js","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"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"}
|