@microsoft/teamsfx-core 3.1.3-rc.0 → 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
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "
|
|
3
|
-
"localVersion": "6.16.0
|
|
2
|
+
"version": "~6.16",
|
|
3
|
+
"localVersion": "6.16.0",
|
|
4
4
|
"tagPrefix": "templates@",
|
|
5
5
|
"v4tagPrefix": "templates-v4@",
|
|
6
6
|
"vstagPrefix": "templates-vs@",
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
"templateExt": ".zip",
|
|
15
15
|
"useLocalTemplate": true,
|
|
16
16
|
"v4": {
|
|
17
|
-
"range": "~6.
|
|
17
|
+
"range": "~6.10",
|
|
18
18
|
"bundled": true,
|
|
19
|
-
"localVersion": "6.
|
|
19
|
+
"localVersion": "6.10.2"
|
|
20
20
|
}
|
|
21
21
|
}
|
|
@@ -1,16 +1,17 @@
|
|
|
1
1
|
export declare class ActionInjector {
|
|
2
2
|
static hasActionWithName(provisionNode: any, action: string, name: string, specRelativePath: string): any;
|
|
3
3
|
static getTeamsAppIdEnvName(provisionNode: any): string | undefined;
|
|
4
|
-
static generateAuthAction(actionName: string, authName: string, teamsAppIdEnvName: string, specRelativePath: string, envName: string, flow?: string, isMicrosoftEntra?: boolean, enablePKCE?: boolean): any;
|
|
4
|
+
static generateAuthAction(actionName: string, authName: string, teamsAppIdEnvName: string, specRelativePath: string, envName: string, flow?: string, isMicrosoftEntra?: boolean, enablePKCE?: boolean, primaryClientSecret?: string, oauthCredentialEnvNames?: OAuthCredentialEnvNames): any;
|
|
5
5
|
static injectCreateOAuthAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean, // If it from add plugin, then we will add another CreateOAuthAction
|
|
6
|
-
isMicrosoftEntra: boolean, enablePKCE?: boolean, registrationId?: string): Promise<AuthActionInjectResult | undefined>;
|
|
6
|
+
isMicrosoftEntra: boolean, enablePKCE?: boolean, registrationId?: string, oauthCredentialEnvNames?: OAuthCredentialEnvNames): Promise<AuthActionInjectResult | undefined>;
|
|
7
7
|
static injectCreateAPIKeyAction(ymlPath: string, authName: string, specRelativePath: string, forceToAddNew: boolean, // If it from add plugin, then we will add another CreateApiKeyAction
|
|
8
|
-
registrationId?: string): Promise<AuthActionInjectResult | undefined>;
|
|
8
|
+
registrationId?: string, primaryClientSecret?: string): Promise<AuthActionInjectResult | undefined>;
|
|
9
9
|
static injectCreateOAuthActionForMCP(ymlPath: string, authType: string, authName: string, registrationId: string, mcpServerUrl: string, authorizationUrl?: string, tokenUrl?: string, refreshUrl?: string, credentialEnvNames?: {
|
|
10
10
|
clientIdEnvName: string;
|
|
11
11
|
clientSecretEnvName?: string;
|
|
12
12
|
scopeEnvName?: string;
|
|
13
13
|
}): Promise<AuthActionInjectResult | undefined>;
|
|
14
|
+
static injectCreateAPIKeyActionForMCP(ymlPath: string, authName: string, registrationId: string, mcpServerUrl: string, apiKeyEnvName?: string): Promise<AuthActionInjectResult | undefined>;
|
|
14
15
|
/**
|
|
15
16
|
* Inject a `dcr/register` action for MCP `oauth-dynamic` flow. Idempotent on
|
|
16
17
|
* (action name + configurationId). Writes a single configurationId env var.
|
|
@@ -27,5 +28,14 @@ export declare class ActionInjector {
|
|
|
27
28
|
export interface AuthActionInjectResult {
|
|
28
29
|
defaultRegistrationIdEnvName: string | undefined;
|
|
29
30
|
registrationIdEnvName: string | undefined;
|
|
31
|
+
primaryClientSecretEnvName?: string;
|
|
32
|
+
clientIdEnvName?: string;
|
|
33
|
+
clientSecretEnvName?: string;
|
|
34
|
+
scopeEnvName?: string;
|
|
35
|
+
}
|
|
36
|
+
export interface OAuthCredentialEnvNames {
|
|
37
|
+
clientId: string;
|
|
38
|
+
clientSecret?: string;
|
|
39
|
+
scope?: string;
|
|
30
40
|
}
|
|
31
41
|
//# sourceMappingURL=actionInjector.d.ts.map
|
|
@@ -1 +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,
|
|
1
|
+
{"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ class ActionInjector {
|
|
|
25
25
|
}
|
|
26
26
|
return undefined;
|
|
27
27
|
}
|
|
28
|
-
static generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, envName, flow, isMicrosoftEntra, enablePKCE) {
|
|
28
|
+
static generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, envName, flow, isMicrosoftEntra, enablePKCE, primaryClientSecret, oauthCredentialEnvNames) {
|
|
29
29
|
const result = {
|
|
30
30
|
uses: actionName,
|
|
31
31
|
with: {
|
|
@@ -48,6 +48,18 @@ class ActionInjector {
|
|
|
48
48
|
if (enablePKCE) {
|
|
49
49
|
result.with.isPKCEEnabled = true;
|
|
50
50
|
}
|
|
51
|
+
if (primaryClientSecret) {
|
|
52
|
+
result.with.primaryClientSecret = `\${{${primaryClientSecret}}}`;
|
|
53
|
+
}
|
|
54
|
+
if (oauthCredentialEnvNames) {
|
|
55
|
+
result.with.clientId = `\${{${oauthCredentialEnvNames.clientId}}}`;
|
|
56
|
+
if (oauthCredentialEnvNames.clientSecret) {
|
|
57
|
+
result.with.clientSecret = `\${{${oauthCredentialEnvNames.clientSecret}}}`;
|
|
58
|
+
}
|
|
59
|
+
if (oauthCredentialEnvNames.scope) {
|
|
60
|
+
result.with.scope = `\${{${oauthCredentialEnvNames.scope}}}`;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
51
63
|
if (isMicrosoftEntra) {
|
|
52
64
|
result.with.identityProvider = constant_1.MicrosoftEntraAuthType;
|
|
53
65
|
result.writeToEnvironmentFile.applicationIdUri = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_APPLICATION_ID_URI`);
|
|
@@ -55,7 +67,7 @@ class ActionInjector {
|
|
|
55
67
|
return result;
|
|
56
68
|
}
|
|
57
69
|
static async injectCreateOAuthAction(ymlPath, authName, specRelativePath, forceToAddNew, // If it from add plugin, then we will add another CreateOAuthAction
|
|
58
|
-
isMicrosoftEntra, enablePKCE, registrationId) {
|
|
70
|
+
isMicrosoftEntra, enablePKCE, registrationId, oauthCredentialEnvNames) {
|
|
59
71
|
const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
|
|
60
72
|
const actionName = "oauth/register";
|
|
61
73
|
const document = (0, yaml_1.parseDocument)(ymlContent);
|
|
@@ -87,11 +99,27 @@ class ActionInjector {
|
|
|
87
99
|
const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${m365_spec_parser_1.ConstantString.RegistrationIdPostfix}`);
|
|
88
100
|
const registrationIdEnvName = registrationId ??
|
|
89
101
|
this.findNextAvailableEnvName(defaultEnvName, existingConfigurationIdEnvNames);
|
|
102
|
+
const registrationIdSuffix = registrationIdEnvName.startsWith(defaultEnvName)
|
|
103
|
+
? registrationIdEnvName.slice(defaultEnvName.length)
|
|
104
|
+
: "";
|
|
105
|
+
const resolvedOAuthCredentialEnvNames = oauthCredentialEnvNames
|
|
106
|
+
? {
|
|
107
|
+
clientId: `${oauthCredentialEnvNames.clientId}${registrationIdSuffix}`,
|
|
108
|
+
...(oauthCredentialEnvNames.clientSecret
|
|
109
|
+
? {
|
|
110
|
+
clientSecret: `${oauthCredentialEnvNames.clientSecret}${registrationIdSuffix}`,
|
|
111
|
+
}
|
|
112
|
+
: {}),
|
|
113
|
+
...(oauthCredentialEnvNames.scope
|
|
114
|
+
? { scope: `${oauthCredentialEnvNames.scope}${registrationIdSuffix}` }
|
|
115
|
+
: {}),
|
|
116
|
+
}
|
|
117
|
+
: undefined;
|
|
90
118
|
const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
|
|
91
119
|
if (teamsAppIdEnvName) {
|
|
92
120
|
const index = provisionNode.items.findIndex((item) => item.get("uses") === "teamsApp/create");
|
|
93
121
|
const flow = "authorizationCode";
|
|
94
|
-
const action = ActionInjector.generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, registrationIdEnvName, flow, isMicrosoftEntra, enablePKCE);
|
|
122
|
+
const action = ActionInjector.generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, registrationIdEnvName, flow, isMicrosoftEntra, enablePKCE, undefined, resolvedOAuthCredentialEnvNames);
|
|
95
123
|
provisionNode.items.splice(index + 1, 0, action);
|
|
96
124
|
}
|
|
97
125
|
else {
|
|
@@ -101,6 +129,17 @@ class ActionInjector {
|
|
|
101
129
|
return {
|
|
102
130
|
defaultRegistrationIdEnvName: defaultEnvName,
|
|
103
131
|
registrationIdEnvName: registrationIdEnvName,
|
|
132
|
+
...(resolvedOAuthCredentialEnvNames
|
|
133
|
+
? {
|
|
134
|
+
clientIdEnvName: resolvedOAuthCredentialEnvNames.clientId,
|
|
135
|
+
...(resolvedOAuthCredentialEnvNames.clientSecret
|
|
136
|
+
? { clientSecretEnvName: resolvedOAuthCredentialEnvNames.clientSecret }
|
|
137
|
+
: {}),
|
|
138
|
+
...(resolvedOAuthCredentialEnvNames.scope
|
|
139
|
+
? { scopeEnvName: resolvedOAuthCredentialEnvNames.scope }
|
|
140
|
+
: {}),
|
|
141
|
+
}
|
|
142
|
+
: {}),
|
|
104
143
|
};
|
|
105
144
|
}
|
|
106
145
|
}
|
|
@@ -110,7 +149,7 @@ class ActionInjector {
|
|
|
110
149
|
return undefined;
|
|
111
150
|
}
|
|
112
151
|
static async injectCreateAPIKeyAction(ymlPath, authName, specRelativePath, forceToAddNew, // If it from add plugin, then we will add another CreateApiKeyAction
|
|
113
|
-
registrationId) {
|
|
152
|
+
registrationId, primaryClientSecret) {
|
|
114
153
|
const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
|
|
115
154
|
const actionName = "apiKey/register";
|
|
116
155
|
const document = (0, yaml_1.parseDocument)(ymlContent);
|
|
@@ -143,9 +182,15 @@ class ActionInjector {
|
|
|
143
182
|
const defaultEnvName = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_${m365_spec_parser_1.ConstantString.RegistrationIdPostfix}`);
|
|
144
183
|
const registrationIdEnvName = registrationId ??
|
|
145
184
|
this.findNextAvailableEnvName(defaultEnvName, existingRegistrationIdEnvNames);
|
|
185
|
+
const registrationIdSuffix = registrationIdEnvName.startsWith(defaultEnvName)
|
|
186
|
+
? registrationIdEnvName.slice(defaultEnvName.length)
|
|
187
|
+
: "";
|
|
188
|
+
const primaryClientSecretEnvName = primaryClientSecret
|
|
189
|
+
? `${primaryClientSecret}${registrationIdSuffix}`
|
|
190
|
+
: undefined;
|
|
146
191
|
if (teamsAppIdEnvName) {
|
|
147
192
|
const index = provisionNode.items.findIndex((item) => item.get("uses") === "teamsApp/create");
|
|
148
|
-
const action = ActionInjector.generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, registrationIdEnvName);
|
|
193
|
+
const action = ActionInjector.generateAuthAction(actionName, authName, teamsAppIdEnvName, specRelativePath, registrationIdEnvName, undefined, undefined, undefined, primaryClientSecretEnvName);
|
|
149
194
|
provisionNode.items.splice(index + 1, 0, action);
|
|
150
195
|
}
|
|
151
196
|
else {
|
|
@@ -155,6 +200,7 @@ class ActionInjector {
|
|
|
155
200
|
return {
|
|
156
201
|
defaultRegistrationIdEnvName: defaultEnvName,
|
|
157
202
|
registrationIdEnvName: registrationIdEnvName,
|
|
203
|
+
...(primaryClientSecretEnvName ? { primaryClientSecretEnvName } : {}),
|
|
158
204
|
};
|
|
159
205
|
}
|
|
160
206
|
}
|
|
@@ -239,6 +285,43 @@ class ActionInjector {
|
|
|
239
285
|
throw new common_1.InjectOAuthActionFailedError();
|
|
240
286
|
}
|
|
241
287
|
}
|
|
288
|
+
static async injectCreateAPIKeyActionForMCP(ymlPath, authName, registrationId, mcpServerUrl, apiKeyEnvName) {
|
|
289
|
+
const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
|
|
290
|
+
const document = (0, yaml_1.parseDocument)(ymlContent);
|
|
291
|
+
const provisionNode = document.get("provision");
|
|
292
|
+
if (!provisionNode) {
|
|
293
|
+
throw new common_1.InjectAPIKeyActionFailedError();
|
|
294
|
+
}
|
|
295
|
+
const alreadyRegistered = provisionNode.items.some((item) => item.get("uses") === "apiKey/register" &&
|
|
296
|
+
!!item.get("writeToEnvironmentFile") &&
|
|
297
|
+
item.get("writeToEnvironmentFile").get("registrationId") === registrationId);
|
|
298
|
+
if (alreadyRegistered) {
|
|
299
|
+
return undefined;
|
|
300
|
+
}
|
|
301
|
+
provisionNode.items = provisionNode.items.filter((item) => item.get("uses"));
|
|
302
|
+
const teamsAppIdEnvName = ActionInjector.getTeamsAppIdEnvName(provisionNode);
|
|
303
|
+
if (!teamsAppIdEnvName) {
|
|
304
|
+
throw new common_1.InjectAPIKeyActionFailedError();
|
|
305
|
+
}
|
|
306
|
+
const teamsAppIndex = provisionNode.items.findIndex((item) => item.get("uses") === "teamsApp/create");
|
|
307
|
+
provisionNode.items.splice(teamsAppIndex + 1, 0, {
|
|
308
|
+
uses: "apiKey/register",
|
|
309
|
+
with: {
|
|
310
|
+
name: authName,
|
|
311
|
+
appId: `\${{${teamsAppIdEnvName}}}`,
|
|
312
|
+
baseUrl: mcpServerUrl,
|
|
313
|
+
...(apiKeyEnvName ? { primaryClientSecret: `\${{${apiKeyEnvName}}}` } : {}),
|
|
314
|
+
},
|
|
315
|
+
writeToEnvironmentFile: {
|
|
316
|
+
registrationId,
|
|
317
|
+
},
|
|
318
|
+
});
|
|
319
|
+
await fs_extra_1.default.writeFile(ymlPath, document.toString(), "utf8");
|
|
320
|
+
return {
|
|
321
|
+
defaultRegistrationIdEnvName: registrationId,
|
|
322
|
+
registrationIdEnvName: registrationId,
|
|
323
|
+
};
|
|
324
|
+
}
|
|
242
325
|
/**
|
|
243
326
|
* Inject a `dcr/register` action for MCP `oauth-dynamic` flow. Idempotent on
|
|
244
327
|
* (action name + configurationId). Writes a single configurationId env var.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"actionInjector.js","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"actionInjector.js","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAI3E,OAAO,EAAE,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,4CAA4C,CAAC;AAI3E,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAA8B,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAE/D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,MAAM,EAAE,CAmBzE;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,MAAM,CAKxE;AAED,wBAAgB,aAAa,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAgBnE;AAED,wBAAgB,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMhE;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEvE;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAED,wBAAgB,KAAK,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAE3D;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMtF;AACD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEhF;AAED,wBAAgB,gCAAgC,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEtF;AAED,wBAAgB,WAAW,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAEjE;AAUD,wBAAgB,0BAA0B,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAYhF;AAED,wBAAgB,4BAA4B,CAAC,aAAa,EAAE,aAAa,GAAG,MAAM,EAAE,CAwBnF;AAED,wBAAgB,mBAAmB,CAAC,aAAa,EAAE,aAAa,GAAG,OAAO,CAMzE;AAgCD,oBAAY,YAAY;IACtB,IAAI,SAAS;IACb,QAAQ,aAAa;IACrB,SAAS,cAAc;CACxB;AAED,oBAAY,eAAe;IACzB,UAAU,eAAe;IACzB,cAAc,mBAAmB;IACjC,SAAS,qBAAqB;IAC9B,YAAY,iBAAiB;IAC7B,UAAU,sBAAsB;IAChC,OAAO,mBAAmB;CAC3B;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,CAE5E;AAED,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,YAAY,EAC1B,GAAG,EAAE,aAAa,GACjB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAyBlC"}
|
|
@@ -24,8 +24,6 @@ const lodash_1 = require("lodash");
|
|
|
24
24
|
const mustache_1 = tslib_1.__importDefault(require("mustache"));
|
|
25
25
|
const common_1 = require("../../../utils/common");
|
|
26
26
|
const wrapUtil_1 = require("../../util/wrapUtil");
|
|
27
|
-
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
28
|
-
const error_1 = require("../../../../error");
|
|
29
27
|
const telemetry_1 = require("./telemetry");
|
|
30
28
|
const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
|
|
31
29
|
var retryHandler_1 = require("../../../../common/retryHandler");
|
|
@@ -199,21 +197,6 @@ async function getResolvedManifest(content, path, manifestType, ctx) {
|
|
|
199
197
|
[telemetryKey]: vars.join(";"),
|
|
200
198
|
});
|
|
201
199
|
}
|
|
202
|
-
|
|
203
|
-
if (manifestType !== envFunctionUtils_1.ManifestType.ApiSpec) {
|
|
204
|
-
const processedFunctionRes = await (0, envFunctionUtils_1.expandVariableWithFunction)(content, ctx, undefined, true, manifestType, path);
|
|
205
|
-
if (processedFunctionRes.isErr()) {
|
|
206
|
-
return processedFunctionRes;
|
|
207
|
-
}
|
|
208
|
-
value = (0, common_1.expandEnvironmentVariable)(processedFunctionRes.value);
|
|
209
|
-
}
|
|
210
|
-
else {
|
|
211
|
-
value = (0, common_1.expandEnvironmentVariable)(value);
|
|
212
|
-
}
|
|
213
|
-
const notExpandedVars = (0, common_1.getEnvironmentVariables)(value);
|
|
214
|
-
if (notExpandedVars.length > 0) {
|
|
215
|
-
return (0, teamsfx_api_1.err)(new error_1.MissingEnvironmentVariablesError("manifest", notExpandedVars.join(","), path));
|
|
216
|
-
}
|
|
217
|
-
return (0, teamsfx_api_1.ok)(value);
|
|
200
|
+
return (0, envFunctionUtils_1.resolveManifestWithContext)(content, ctx, manifestType, path);
|
|
218
201
|
}
|
|
219
202
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @author yuqzho@microsoft.com
|
|
3
3
|
*/
|
|
4
4
|
import { ErrorResult as ApiSpecErrorResult, ErrorType as ApiSpecErrorType, AuthType, ProjectType, SpecParser, SpecParserError, WarningResult } from "@microsoft/m365-spec-parser";
|
|
5
|
-
import { ApiOperation, Context, FxError, Inputs, Result, TeamsAppManifest, Warning } from "@microsoft/teamsfx-api";
|
|
5
|
+
import { ApiOperation, AuthCredentialSource, 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
8
|
export { getParserOptions } from "../../../common/openApiParserOptions";
|
|
@@ -33,7 +33,7 @@ interface SpecParserGenerateResult {
|
|
|
33
33
|
}
|
|
34
34
|
export declare function generateFromApiSpec(specParser: SpecParser | undefined, teamsManifestPath: string, inputs: Inputs, context: Context, sourceComponent: string, projectType: ProjectType, outputFilePath: SpecParserOutputFilePath, specPath: string, updateExistingPlugin?: boolean): Promise<Result<SpecParserGenerateResult, FxError>>;
|
|
35
35
|
export declare function logValidationResults(projectType: ProjectType, errors: ErrorResult[], warnings: WarningResult[], context: Context, shouldLogWarning: boolean, shouldSkipTelemetry: boolean, specHash?: string, existingCorrelationId?: string): void;
|
|
36
|
-
export declare function injectAuthAction(projectPath: string, authName: string, authScheme: AuthType | undefined, outputApiSpecPath: string, forceToAddNew: boolean, authType?: string, enablePKCE?: boolean, registrationId?: string): Promise<AuthActionInjectResult | undefined>;
|
|
36
|
+
export declare function injectAuthAction(projectPath: string, authName: string, authScheme: AuthType | undefined, outputApiSpecPath: string, forceToAddNew: boolean, authType?: string, enablePKCE?: boolean, registrationId?: string, apiKey?: string, authCredentialSource?: AuthCredentialSource, oauthClientId?: string, oauthClientSecret?: string, oauthScopes?: string): Promise<AuthActionInjectResult | undefined>;
|
|
37
37
|
/**
|
|
38
38
|
* Generate scaffolding warning summary.
|
|
39
39
|
* @param warnings warnings returned from spec-parser.
|
|
@@ -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,WAAW,EACX,UAAU,EACV,eAAe,EAIf,aAAa,EAEd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,YAAY,EAEZ,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAGN,gBAAgB,EAEhB,OAAO,EACR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAoB1C,OAAO,EAAkB,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ const PluginManifestUtils_1 = require("../../driver/teamsApp/utils/PluginManifes
|
|
|
39
39
|
const daSpecParser_1 = require("../../../common/daSpecParser");
|
|
40
40
|
const mcpAuthScaffolder_1 = require("../../utils/mcpAuthScaffolder");
|
|
41
41
|
const pathUtils_1 = require("../../utils/pathUtils");
|
|
42
|
+
const envUtil_1 = require("../../utils/envUtil");
|
|
42
43
|
var openApiParserOptions_2 = require("../../../common/openApiParserOptions");
|
|
43
44
|
Object.defineProperty(exports, "getParserOptions", { enumerable: true, get: function () { return openApiParserOptions_2.getParserOptions; } });
|
|
44
45
|
exports.specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
|
|
@@ -357,25 +358,84 @@ function logValidationResults(projectType, errors, warnings, context, shouldLogW
|
|
|
357
358
|
(0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.validate.apiSpec.summary", summaryStr.join(", "), errorMessage, warningMessage);
|
|
358
359
|
void context.logProvider.info(outputMessage);
|
|
359
360
|
}
|
|
360
|
-
async function injectAuthAction(projectPath, authName, authScheme, outputApiSpecPath, forceToAddNew, authType, enablePKCE, registrationId) {
|
|
361
|
+
async function injectAuthAction(projectPath, authName, authScheme, outputApiSpecPath, forceToAddNew, authType, enablePKCE, registrationId, apiKey, authCredentialSource = "provision", oauthClientId, oauthClientSecret, oauthScopes) {
|
|
361
362
|
const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath);
|
|
362
363
|
const localYamlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "local", true);
|
|
363
364
|
const relativeSpecPath = `./${path_1.default.relative(projectPath, outputApiSpecPath).replace(/\\/g, "/")}`;
|
|
364
365
|
if ((!!authScheme &&
|
|
365
366
|
(m365_spec_parser_1.Utils.isBearerTokenAuth(authScheme) || m365_spec_parser_1.Utils.isAPIKeyAuthButNotInCookie(authScheme))) ||
|
|
366
367
|
authType === constant_1.APIKeyAuthType) {
|
|
367
|
-
const
|
|
368
|
+
const normalizedApiKey = apiKey?.trim();
|
|
369
|
+
const apiKeyEnvName = normalizedApiKey || authCredentialSource === "environment"
|
|
370
|
+
? `SECRET_${m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_API_KEY`)}`
|
|
371
|
+
: undefined;
|
|
372
|
+
const res = await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(ymlPath, authName, relativeSpecPath, forceToAddNew, registrationId, apiKeyEnvName);
|
|
368
373
|
if (!!localYamlPath && (await fs_extra_1.default.pathExists(localYamlPath))) {
|
|
369
|
-
await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(localYamlPath, authName, relativeSpecPath, forceToAddNew,
|
|
374
|
+
await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(localYamlPath, authName, relativeSpecPath, forceToAddNew, res?.registrationIdEnvName, apiKeyEnvName);
|
|
375
|
+
}
|
|
376
|
+
if (res?.primaryClientSecretEnvName &&
|
|
377
|
+
(authCredentialSource === "environment" || normalizedApiKey)) {
|
|
378
|
+
const envListRes = await envUtil_1.envUtil.listEnv(projectPath);
|
|
379
|
+
if (envListRes.isErr()) {
|
|
380
|
+
throw envListRes.error;
|
|
381
|
+
}
|
|
382
|
+
const environments = envListRes.value.length > 0 ? envListRes.value : ["dev"];
|
|
383
|
+
for (const environment of environments) {
|
|
384
|
+
const writeEnvRes = await envUtil_1.envUtil.writeEnv(projectPath, environment, {
|
|
385
|
+
[res.primaryClientSecretEnvName]: normalizedApiKey ?? "",
|
|
386
|
+
});
|
|
387
|
+
if (writeEnvRes.isErr()) {
|
|
388
|
+
throw writeEnvRes.error;
|
|
389
|
+
}
|
|
390
|
+
}
|
|
370
391
|
}
|
|
371
392
|
return res;
|
|
372
393
|
}
|
|
373
394
|
else if ((!!authScheme && m365_spec_parser_1.Utils.isOAuthWithAuthCodeFlow(authScheme)) ||
|
|
374
395
|
authType === constant_1.OAuthAuthType ||
|
|
375
396
|
authType === constant_1.MicrosoftEntraAuthType) {
|
|
376
|
-
const
|
|
397
|
+
const normalizedClientId = oauthClientId?.trim() ?? "";
|
|
398
|
+
const normalizedClientSecret = oauthClientSecret?.trim() ?? "";
|
|
399
|
+
const normalizedScopes = oauthScopes?.trim() ?? "";
|
|
400
|
+
const isMicrosoftEntra = authType === constant_1.MicrosoftEntraAuthType;
|
|
401
|
+
const oauthCredentialEnvNames = authCredentialSource === "environment"
|
|
402
|
+
? {
|
|
403
|
+
clientId: m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_CLIENT_ID`),
|
|
404
|
+
...(!isMicrosoftEntra && !enablePKCE
|
|
405
|
+
? {
|
|
406
|
+
clientSecret: `SECRET_${m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_CLIENT_SECRET`)}`,
|
|
407
|
+
}
|
|
408
|
+
: {}),
|
|
409
|
+
...(!isMicrosoftEntra && normalizedScopes
|
|
410
|
+
? { scope: m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_SCOPE`) }
|
|
411
|
+
: {}),
|
|
412
|
+
}
|
|
413
|
+
: undefined;
|
|
414
|
+
const res = await actionInjector_1.ActionInjector.injectCreateOAuthAction(ymlPath, authName, relativeSpecPath, forceToAddNew, isMicrosoftEntra, isMicrosoftEntra ? undefined : enablePKCE, registrationId, oauthCredentialEnvNames);
|
|
377
415
|
if (!!localYamlPath && (await fs_extra_1.default.pathExists(localYamlPath))) {
|
|
378
|
-
await actionInjector_1.ActionInjector.injectCreateOAuthAction(localYamlPath, authName, relativeSpecPath, forceToAddNew,
|
|
416
|
+
await actionInjector_1.ActionInjector.injectCreateOAuthAction(localYamlPath, authName, relativeSpecPath, forceToAddNew, isMicrosoftEntra, isMicrosoftEntra ? undefined : enablePKCE, res?.registrationIdEnvName, oauthCredentialEnvNames);
|
|
417
|
+
}
|
|
418
|
+
if (res?.clientIdEnvName) {
|
|
419
|
+
const envs = {
|
|
420
|
+
[res.clientIdEnvName]: normalizedClientId,
|
|
421
|
+
};
|
|
422
|
+
if (res.clientSecretEnvName) {
|
|
423
|
+
envs[res.clientSecretEnvName] = normalizedClientSecret;
|
|
424
|
+
}
|
|
425
|
+
if (res.scopeEnvName) {
|
|
426
|
+
envs[res.scopeEnvName] = normalizedScopes;
|
|
427
|
+
}
|
|
428
|
+
const envListRes = await envUtil_1.envUtil.listEnv(projectPath);
|
|
429
|
+
if (envListRes.isErr()) {
|
|
430
|
+
throw envListRes.error;
|
|
431
|
+
}
|
|
432
|
+
const environments = envListRes.value.length > 0 ? envListRes.value : ["dev"];
|
|
433
|
+
for (const environment of environments) {
|
|
434
|
+
const writeEnvRes = await envUtil_1.envUtil.writeEnv(projectPath, environment, envs);
|
|
435
|
+
if (writeEnvRes.isErr()) {
|
|
436
|
+
throw writeEnvRes.error;
|
|
437
|
+
}
|
|
438
|
+
}
|
|
379
439
|
}
|
|
380
440
|
return res;
|
|
381
441
|
}
|