@microsoft/teamsfx-core 3.1.4 → 3.1.5-alpha.46aaa82df3.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 +2 -2
- package/build/component/configManager/actionInjector.d.ts +1 -1
- package/build/component/configManager/actionInjector.d.ts.map +1 -1
- package/build/component/configManager/actionInjector.js +2 -2
- package/build/component/configManager/actionInjector.js.map +1 -1
- package/build/component/driver/dcr/create.d.ts.map +1 -1
- package/build/component/driver/dcr/create.js +38 -15
- package/build/component/driver/dcr/create.js.map +1 -1
- package/build/component/driver/dcr/interface/createDcrArgs.d.ts +4 -2
- package/build/component/driver/dcr/interface/createDcrArgs.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/DcrRegistration.d.ts +3 -1
- package/build/component/driver/teamsApp/interfaces/DcrRegistration.d.ts.map +1 -1
- package/build/component/m365/packageService.d.ts.map +1 -1
- package/build/component/m365/packageService.js +2 -19
- package/build/component/m365/packageService.js.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.d.ts +5 -20
- package/build/component/utils/mcpAuthScaffolder.d.ts.map +1 -1
- package/build/component/utils/mcpAuthScaffolder.js +9 -24
- package/build/component/utils/mcpAuthScaffolder.js.map +1 -1
- package/build/v4/mcp/mcpAuthAction.d.ts +0 -1
- package/build/v4/mcp/mcpAuthAction.d.ts.map +1 -1
- package/build/v4/mcp/mcpAuthAction.js +5 -7
- package/build/v4/mcp/mcpAuthAction.js.map +1 -1
- package/build/v4/mcp/mcpAuthScaffold.d.ts.map +1 -1
- package/build/v4/mcp/mcpAuthScaffold.js +4 -12
- package/build/v4/mcp/mcpAuthScaffold.js.map +1 -1
- package/package.json +7 -7
- package/resource/yaml-schema/v1.13/yaml.schema.json +29 -12
- package/resource/yaml-schema/yaml.schema.json +29 -12
- 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
- package/build/common/treatmentVariables.d.ts +0 -5
- package/build/common/treatmentVariables.d.ts.map +0 -1
- package/build/common/treatmentVariables.js +0 -10
- package/build/common/treatmentVariables.js.map +0 -1
|
@@ -16,7 +16,7 @@ export declare class ActionInjector {
|
|
|
16
16
|
* Inject a `dcr/register` action for MCP `oauth-dynamic` flow. Idempotent on
|
|
17
17
|
* (action name + configurationId). Writes a single configurationId env var.
|
|
18
18
|
*/
|
|
19
|
-
static injectCreateDcrActionForMCP(ymlPath: string, authName: string, registrationId: string, mcpServerUrl: string,
|
|
19
|
+
static injectCreateDcrActionForMCP(ymlPath: string, authName: string, registrationId: string, mcpServerUrl: string, _wellKnownAuthorizationServer?: string): Promise<AuthActionInjectResult | undefined>;
|
|
20
20
|
static findNextAvailableEnvName(baseEnvName: string, existingEnvNames: string[]): string;
|
|
21
21
|
/**
|
|
22
22
|
* Ensure the parsed yml document's top-level `version` is at least `minVersion`.
|
|
@@ -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,EACpB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,GAAG;WAiDO,uBAAuB,CAClC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,oEAAoE;IAC5F,gBAAgB,EAAE,OAAO,EACzB,UAAU,CAAC,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,EACvB,uBAAuB,CAAC,EAAE,uBAAuB,GAChD,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WA0GjC,wBAAwB,CACnC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,OAAO,EAAE,qEAAqE;IAC7F,cAAc,CAAC,EAAE,MAAM,EACvB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WAoFjC,6BAA6B,CACxC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,MAAM,EACnB,kBAAkB,CAAC,EAAE;QACnB,eAAe,EAAE,MAAM,CAAC;QACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GACA,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;WAqFjC,8BAA8B,CACzC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC;IA8C9C;;;OAGG;WACU,2BAA2B,CACtC,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,EAChB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,
|
|
1
|
+
{"version":3,"file":"actionInjector.d.ts","sourceRoot":"","sources":["../../../src/component/configManager/actionInjector.ts"],"names":[],"mappings":"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"}
|
|
@@ -326,7 +326,7 @@ class ActionInjector {
|
|
|
326
326
|
* Inject a `dcr/register` action for MCP `oauth-dynamic` flow. Idempotent on
|
|
327
327
|
* (action name + configurationId). Writes a single configurationId env var.
|
|
328
328
|
*/
|
|
329
|
-
static async injectCreateDcrActionForMCP(ymlPath, authName, registrationId, mcpServerUrl,
|
|
329
|
+
static async injectCreateDcrActionForMCP(ymlPath, authName, registrationId, mcpServerUrl, _wellKnownAuthorizationServer) {
|
|
330
330
|
const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
|
|
331
331
|
const document = (0, yaml_1.parseDocument)(ymlContent);
|
|
332
332
|
const provisionNode = document.get("provision");
|
|
@@ -352,7 +352,7 @@ class ActionInjector {
|
|
|
352
352
|
appId: `\${{${teamsAppIdEnvName}}}`,
|
|
353
353
|
applicableToApps: "AnyApp",
|
|
354
354
|
targetAudience: "HomeTenant",
|
|
355
|
-
|
|
355
|
+
mcpResourceUrl: mcpServerUrl,
|
|
356
356
|
targetUrlsShouldStartWith: [mcpServerUrl],
|
|
357
357
|
},
|
|
358
358
|
writeToEnvironmentFile: {
|
|
@@ -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":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/dcr/create.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAUtE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO1D,qBACa,eAAgB,YAAW,UAAU;IAChD,WAAW,SAAuD;IAClE,QAAQ,CAAC,aAAa,SAAiD;IAG1D,OAAO,CAClB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/dcr/create.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAUtE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAO1D,qBACa,eAAgB,YAAW,UAAU;IAChD,WAAW,SAAuD;IAClE,QAAQ,CAAC,aAAa,SAAiD;IAG1D,OAAO,CAClB,IAAI,EAAE,aAAa,EACnB,OAAO,EAAE,aAAa,EACtB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;IAkG3B,OAAO,CAAC,YAAY;CAiFrB"}
|
|
@@ -54,11 +54,15 @@ let CreateDcrDriver = class CreateDcrDriver {
|
|
|
54
54
|
: OauthRegistration_1.OauthRegistrationTargetAudience.HomeTenant;
|
|
55
55
|
const dcrRegistration = {
|
|
56
56
|
clientName: args.name,
|
|
57
|
-
m365AppId: applicableToApps === OauthRegistration_1.OauthRegistrationAppType.SpecificApp ? args.appId ?? "" : "",
|
|
57
|
+
m365AppId: applicableToApps === OauthRegistration_1.OauthRegistrationAppType.SpecificApp ? (args.appId ?? "") : "",
|
|
58
58
|
applicableToApps: applicableToApps,
|
|
59
59
|
targetAudience: targetAudience,
|
|
60
|
-
targetUrlsShouldStartWith: args.targetUrlsShouldStartWith
|
|
61
|
-
|
|
60
|
+
targetUrlsShouldStartWith: args.targetUrlsShouldStartWith,
|
|
61
|
+
...(args.mcpResourceUrl !== undefined ? { mcpResourceUrl: args.mcpResourceUrl } : {}),
|
|
62
|
+
...(args.wellKnownAuthorizationServer !== undefined
|
|
63
|
+
? { wellKnownAuthorizationServer: args.wellKnownAuthorizationServer }
|
|
64
|
+
: {}),
|
|
65
|
+
...(args.resource !== undefined ? { resource: args.resource } : {}),
|
|
62
66
|
};
|
|
63
67
|
const oauthRegistrationRes = await teamsGraphClient_1.teamsGraphClient.createDcrRegistration(appStudioToken, dcrRegistration);
|
|
64
68
|
outputs.set(outputEnvVarNames.get(createDcrOutputs_1.OutputKeys.configurationId), oauthRegistrationRes.configurationRegistrationId.oAuthConfigId);
|
|
@@ -99,12 +103,33 @@ let CreateDcrDriver = class CreateDcrDriver {
|
|
|
99
103
|
(typeof args.appId !== "string" || !args.appId)) {
|
|
100
104
|
invalidParameters.push("appId");
|
|
101
105
|
}
|
|
102
|
-
if (
|
|
103
|
-
|
|
104
|
-
invalidParameters.push("wellKnownAuthorizationServer");
|
|
106
|
+
if (args.mcpResourceUrl === undefined && args.wellKnownAuthorizationServer === undefined) {
|
|
107
|
+
invalidParameters.push("mcpResourceUrl", "wellKnownAuthorizationServer");
|
|
105
108
|
}
|
|
106
|
-
|
|
107
|
-
|
|
109
|
+
if (args.mcpResourceUrl !== undefined &&
|
|
110
|
+
(typeof args.mcpResourceUrl !== "string" || !(0, utility_1.validateUrl)(args.mcpResourceUrl))) {
|
|
111
|
+
invalidParameters.push("mcpResourceUrl");
|
|
112
|
+
}
|
|
113
|
+
if (args.wellKnownAuthorizationServer !== undefined) {
|
|
114
|
+
if (typeof args.wellKnownAuthorizationServer !== "string" ||
|
|
115
|
+
!args.wellKnownAuthorizationServer) {
|
|
116
|
+
invalidParameters.push("wellKnownAuthorizationServer");
|
|
117
|
+
}
|
|
118
|
+
else if (!(0, utility_1.validateUrl)(args.wellKnownAuthorizationServer)) {
|
|
119
|
+
throw new dcrWellKnownInvalid_1.DcrWellKnownInvalidError(actionName);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
if (args.resource !== undefined) {
|
|
123
|
+
try {
|
|
124
|
+
if (typeof args.resource !== "string" ||
|
|
125
|
+
args.resource.includes("#") ||
|
|
126
|
+
!new URL(args.resource).protocol) {
|
|
127
|
+
invalidParameters.push("resource");
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
catch {
|
|
131
|
+
invalidParameters.push("resource");
|
|
132
|
+
}
|
|
108
133
|
}
|
|
109
134
|
if (args.applicableToApps &&
|
|
110
135
|
args.applicableToApps !== OauthRegistration_1.OauthRegistrationAppType.AnyApp &&
|
|
@@ -116,13 +141,11 @@ let CreateDcrDriver = class CreateDcrDriver {
|
|
|
116
141
|
args.targetAudience !== OauthRegistration_1.OauthRegistrationTargetAudience.HomeTenant) {
|
|
117
142
|
invalidParameters.push("targetAudience");
|
|
118
143
|
}
|
|
119
|
-
if (args.targetUrlsShouldStartWith)
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
}
|
|
144
|
+
if (!Array.isArray(args.targetUrlsShouldStartWith) ||
|
|
145
|
+
args.targetUrlsShouldStartWith.length !== 1 ||
|
|
146
|
+
typeof args.targetUrlsShouldStartWith[0] !== "string" ||
|
|
147
|
+
!(0, utility_1.validateUrl)(args.targetUrlsShouldStartWith[0])) {
|
|
148
|
+
invalidParameters.push("targetUrlsShouldStartWith");
|
|
126
149
|
}
|
|
127
150
|
if (invalidParameters.length > 0) {
|
|
128
151
|
throw new common_1.InvalidActionInputError(actionName, invalidParameters);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/dcr/create.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,6CAA0C;AAC1C,wDAAyE;AACzE,mCAAiC;AACjC,uEAAoE;AACpE,yDAA6D;AAC7D,iEAAmE;AACnE,kDAA+E;AAC/E,8GAA2G;AAG3G,mFAAgF;AAChF,gFAGkD;AAElD,yCAAiD;AACjD,2DAA6D;AAC7D,qEAAuE;AAEvE,mEAA4E;AAC5E,mDAAqD;AACrD,sDAAuD;AAEvD,MAAM,UAAU,GAAG,cAAc,CAAC,CAAC,yBAAyB;AAGrD,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,WAAW,GAAG,IAAA,kCAAkB,EAAC,+BAA+B,CAAC,CAAC;IACzD,aAAa,GAAG,IAAA,kCAAkB,EAAC,yBAAyB,CAAC,CAAC;IAG1D,AAAN,KAAK,CAAC,OAAO,CAClB,IAAmB,EACnB,OAAsB,EACtB,iBAAuC;QAEvC,MAAM,SAAS,GAAa,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAwB,IAAI,GAAG,EAAkB,CAAC;QAE/D,IAAI,CAAC;YACH,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,IAAA,kCAAkB,EAAC,0BAAc,CAAC,kBAAkB,EAAE,UAAU,CAAC,CAAC,CAAC;YAE7F,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,MAAM,IAAI,iFAAuC,CAAC,UAAU,CAAC,CAAC;YAChE,CAAC;YAED,MAAM,KAAK,GAAG,IAAA,wBAAgB,EAAC,iBAAiB,CAAqB,CAAC;YAEtE,IAAI,KAAK,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBACnC,gFAAgF;gBAChF,OAAO,CAAC,WAAW,EAAE,IAAI,CACvB,IAAA,kCAAkB,EAChB,0BAAc,CAAC,aAAa,EAC5B,iBAAiB,CAAC,GAAG,CAAC,6BAAU,CAAC,eAAe,CAAC,CAClD,CACF,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,MAAM,iBAAiB,GAAG,MAAM,OAAO,CAAC,iBAAiB,CAAC,cAAc,CAAC;oBACvE,MAAM,EAAE,IAAA,4BAAgB,GAAE;iBAC3B,CAAC,CAAC;gBACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE,CAAC;oBAC9B,MAAM,iBAAiB,CAAC,KAAK,CAAC;gBAChC,CAAC;gBACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;gBAE/C,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;gBAExB,MAAM,gBAAgB,GAAG,IAAI,CAAC,gBAAgB;oBAC5C,CAAC,CAAE,IAAI,CAAC,gBAA6C;oBACrD,CAAC,CAAC,4CAAwB,CAAC,MAAM,CAAC;gBAEpC,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc;oBACxC,CAAC,CAAE,IAAI,CAAC,cAAkD;oBAC1D,CAAC,CAAC,mDAA+B,CAAC,UAAU,CAAC;gBAE/C,MAAM,eAAe,GAAoB;oBACvC,UAAU,EAAE,IAAI,CAAC,IAAI;oBACrB,SAAS,EACP,gBAAgB,KAAK,4CAAwB,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/component/driver/dcr/create.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
export interface CreateDcrArgs {
|
|
2
2
|
name: string;
|
|
3
3
|
appId?: string;
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
mcpResourceUrl?: string;
|
|
5
|
+
wellKnownAuthorizationServer?: string;
|
|
6
|
+
resource?: string;
|
|
7
|
+
targetUrlsShouldStartWith: string[];
|
|
6
8
|
applicableToApps?: string;
|
|
7
9
|
targetAudience?: string;
|
|
8
10
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createDcrArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/dcr/interface/createDcrArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4BAA4B,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"createDcrArgs.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/dcr/interface/createDcrArgs.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB"}
|
|
@@ -5,6 +5,8 @@ export interface DcrRegistration {
|
|
|
5
5
|
applicableToApps: OauthRegistrationAppType;
|
|
6
6
|
targetAudience: OauthRegistrationTargetAudience;
|
|
7
7
|
targetUrlsShouldStartWith: string[];
|
|
8
|
-
|
|
8
|
+
mcpResourceUrl?: string;
|
|
9
|
+
wellKnownAuthorizationServer?: string;
|
|
10
|
+
resource?: string;
|
|
9
11
|
}
|
|
10
12
|
//# sourceMappingURL=DcrRegistration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DcrRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/DcrRegistration.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAEhG,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,cAAc,EAAE,+BAA+B,CAAC;IAChD,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,4BAA4B,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"DcrRegistration.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/interfaces/DcrRegistration.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AAEhG,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,wBAAwB,CAAC;IAC3C,cAAc,EAAE,+BAA+B,CAAC;IAChD,yBAAyB,EAAE,MAAM,EAAE,CAAC;IACpC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4BAA4B,CAAC,EAAE,MAAM,CAAC;IACtC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAQnB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAIP,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,WAAW,EAEX,MAAM,EAIP,MAAM,wBAAwB,CAAC;AAoBhC,OAAO,EAAE,OAAO,EAAE,MAAM,sDAAsD,CAAC;AAO/E,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQ/D,oBAAY,QAAQ;IAClB,QAAQ,aAAa;IACrB,MAAM,WAAW;IACjB,MAAM,WAAW;CAClB;AAED,eAAO,MAAM,eAAe;;;;CAI3B,CAAC;AAuBF,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,cAAc,CAAiB;IAE9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;WAEnC,iBAAiB,IAAI,cAAc;gBAU9B,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;YAQ3C,gBAAgB;IAmBjB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA0BlD,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAkEnF,WAAW,CACtB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,QAAQ,WAAoB,GAC3B,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAoBvB,aAAa,CACxB,KAAK,EAAE,MAAM,EACb,YAAY,EAAE,MAAM,EACpB,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwF5B;;;OAGG;IAEU,YAAY,CACvB,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,QAAQ,GAAE,QAA4B,GACrC,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAcvB,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAsB7D,yBAAyB,CACpC,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,GAAG,CAAC;IAwDF,eAAe,CAC1B,KAAK,EAAE,MAAM,EACb,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,MAAM,CAAC;IASL,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQ7E,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAqC9E,sBAAsB,CACjC,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,OAAO,CAAC;IA8BN,oBAAoB,CAC/B,KAAK,EAAE,MAAM,EACb,cAAc,UAAQ,GACrB,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;IAyCnB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAoCzB,QAAQ,CACnB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,OAAO,GACZ,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA8CzB,eAAe,CAC1B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA8BzB,cAAc,CACzB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,EAAE,OAAO,CAAC,CAAC;IA4B/B,cAAc,CACzB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,MAAM,EACf,KAAK,CAAC,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAgCzB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAwB5E,UAAU,CACrB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAqBjC,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,cAAc,UAAQ,GACrB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IA+B/B,OAAO,CAAC,cAAc;IAatB,OAAO,CAAC,UAAU;IAwClB,OAAO,CAAC,QAAQ;IAUhB,OAAO,CAAC,mBAAmB;IAkB3B,OAAO,CAAC,kBAAkB;CAU3B"}
|
|
@@ -14,7 +14,6 @@ const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
|
|
|
14
14
|
const constants_1 = require("../../common/constants");
|
|
15
15
|
const globalVars_1 = require("../../common/globalVars");
|
|
16
16
|
const localizeUtils_1 = require("../../common/localizeUtils");
|
|
17
|
-
const treatmentVariables_1 = require("../../common/treatmentVariables");
|
|
18
17
|
const telemetry_1 = require("../../common/telemetry");
|
|
19
18
|
const utils_1 = require("../../common/utils");
|
|
20
19
|
const wrappedAxiosClient_1 = require("../../common/wrappedAxiosClient");
|
|
@@ -192,16 +191,12 @@ class PackageService {
|
|
|
192
191
|
this.logger?.debug(`"Uploading package with sideLoading V2 in ${appScope} scope ..."`);
|
|
193
192
|
const uploadHeaders = content.getHeaders();
|
|
194
193
|
uploadHeaders["Authorization"] = `Bearer ${token}`;
|
|
195
|
-
const forceRaiValidationEnabled = process.env.TEAMSFX_RAI_VALIDATION_ENABLED;
|
|
196
|
-
const isRaiValidationEnabled = forceRaiValidationEnabled === undefined
|
|
197
|
-
? ((await globalVars_1.TOOLS.expServiceProvider?.getTreatmentVariableAsync(treatmentVariables_1.TreatmentVariables.VSCodeConfig, treatmentVariables_1.TreatmentVariables.RaiValidation, true)) ?? false)
|
|
198
|
-
: forceRaiValidationEnabled === "true" || forceRaiValidationEnabled === "1";
|
|
199
194
|
const uploadResponse = await this.withNetworkRetry(() => this.axiosInstance.post("/builder/v1/users/packages", content, {
|
|
200
195
|
baseURL: serviceUrl,
|
|
201
196
|
headers: uploadHeaders,
|
|
202
197
|
params: {
|
|
203
198
|
scope: appScope,
|
|
204
|
-
|
|
199
|
+
isRAIValidationAsync: true,
|
|
205
200
|
},
|
|
206
201
|
}));
|
|
207
202
|
const { statusId } = uploadResponse.data;
|
|
@@ -213,22 +208,10 @@ class PackageService {
|
|
|
213
208
|
const statusResponse = await this.axiosInstance.get(`/builder/v1/users/packages/status/${statusId}`, {
|
|
214
209
|
baseURL: serviceUrl,
|
|
215
210
|
headers: { Authorization: `Bearer ${token}` },
|
|
216
|
-
|
|
211
|
+
params: { isRAIValidationAsync: true },
|
|
217
212
|
});
|
|
218
213
|
const resCode = statusResponse.status;
|
|
219
214
|
this.logger?.debug(`Package status: ${resCode} ...`);
|
|
220
|
-
if (!isRaiValidationEnabled) {
|
|
221
|
-
if (resCode === 200) {
|
|
222
|
-
const titleId = statusResponse.data.titleId;
|
|
223
|
-
const appId = statusResponse.data.appId;
|
|
224
|
-
this.logger?.info(`TitleId: ${titleId}`);
|
|
225
|
-
this.logger?.info(`AppId: ${appId}`);
|
|
226
|
-
this.logger?.verbose("Sideloading done.");
|
|
227
|
-
return [titleId, appId];
|
|
228
|
-
}
|
|
229
|
-
await (0, utils_1.waitSeconds)(7);
|
|
230
|
-
continue;
|
|
231
|
-
}
|
|
232
215
|
const statusResult = statusResponse.data;
|
|
233
216
|
const validationInfo = statusResult?.validationInfo;
|
|
234
217
|
if (!validationInfo ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/component/m365/packageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,7 @@ import { resolveMCPOAuthMetadata } from "./mcpToolFetcher";
|
|
|
8
8
|
*/
|
|
9
9
|
/**
|
|
10
10
|
* Resolved authorization-server endpoints relevant to the MCP scaffolder.
|
|
11
|
-
*
|
|
12
|
-
* `wellKnownAuthorizationServer`; static `oauth` ignores it.
|
|
11
|
+
* Dynamic registration delegates metadata discovery to TGS.
|
|
13
12
|
*/
|
|
14
13
|
export declare const mcpAuthScaffolderDeps: {
|
|
15
14
|
resolveMCPOAuthMetadata: typeof resolveMCPOAuthMetadata;
|
|
@@ -38,25 +37,16 @@ export declare function deriveMCPManifestOAuth(authType: string | undefined, reg
|
|
|
38
37
|
/**
|
|
39
38
|
* Resolve OAuth endpoints based on the user's `mcp-da-auth-type` choice.
|
|
40
39
|
*
|
|
41
|
-
* - `oauth
|
|
40
|
+
* - `oauth`: probe `resource_metadata` /
|
|
42
41
|
* `.well-known/oauth-authorization-server` to discover authorization/token URLs.
|
|
43
|
-
*
|
|
44
|
-
* - `entra-sso` and `none`: returns empty (no static endpoints to resolve).
|
|
42
|
+
* - Other auth types return empty (no static endpoints to resolve).
|
|
45
43
|
*/
|
|
46
44
|
export declare function resolveMCPAuthEndpoints(authType: string | undefined, inputs: Inputs): Promise<ResolvedMCPAuthEndpoints>;
|
|
47
|
-
/**
|
|
48
|
-
* Placeholder written to `wellKnownAuthorizationServer` when the
|
|
49
|
-
* `oauth-dynamic` flow can't auto-discover the URL at scaffold time. The
|
|
50
|
-
* developer must replace this before provisioning. Surfaced via the
|
|
51
|
-
* `wellKnownUrlPlaceholderUsed` return flag so callers can emit a warning.
|
|
52
|
-
*/
|
|
53
|
-
export declare const MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_WELL_KNOWN_AUTHORIZATION_SERVER_URL>";
|
|
54
45
|
/**
|
|
55
46
|
* Placeholders written to `oauth/register` when endpoint discovery can't produce the
|
|
56
47
|
* authorization / token URLs for a static `oauth` (`identityProvider: Custom`) action.
|
|
57
48
|
* Omitting the fields instead would hide the gap entirely — the action looks complete but
|
|
58
|
-
* can never provision — so the placeholders make the missing values visible and editable
|
|
59
|
-
* mirroring the `dcr/register` contract above.
|
|
49
|
+
* can never provision — so the placeholders make the missing values visible and editable.
|
|
60
50
|
*/
|
|
61
51
|
export declare const MCP_OAUTH_AUTHORIZATION_URL_PLACEHOLDER = "<PLEASE_FILL_IN_AUTHORIZATION_URL>";
|
|
62
52
|
export declare const MCP_OAUTH_TOKEN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_TOKEN_URL>";
|
|
@@ -77,8 +67,6 @@ export declare function isMCPScaffoldWarning(warning: {
|
|
|
77
67
|
*/
|
|
78
68
|
export declare const MCP_AUTH_PLACEHOLDER_WARNING_TYPES: string[];
|
|
79
69
|
export interface InjectMCPAuthActionResult {
|
|
80
|
-
/** True when `oauth-dynamic` was injected with the placeholder URL because
|
|
81
|
-
* `endpoints.wellKnownUrl` was missing. */
|
|
82
70
|
wellKnownUrlPlaceholderUsed?: boolean;
|
|
83
71
|
/** True when `oauth` was injected with placeholder authorization / token URLs
|
|
84
72
|
* because endpoint discovery didn't return them. */
|
|
@@ -98,10 +86,7 @@ export interface InjectMCPAuthActionResult {
|
|
|
98
86
|
* reference is emitted only when `scopes` is non-empty, matching the conditional
|
|
99
87
|
* env-var write so provision never sees a dangling `${{...}}` reference.
|
|
100
88
|
*
|
|
101
|
-
* `oauth-dynamic`
|
|
102
|
-
* missing — a placeholder string is written instead so the action shows up in
|
|
103
|
-
* `m365agents.yml` for the developer to fix. The return flag tells the caller
|
|
104
|
-
* to emit a visible warning.
|
|
89
|
+
* `oauth-dynamic` passes the MCP endpoint to TGS for metadata discovery during provision.
|
|
105
90
|
*/
|
|
106
91
|
export declare function injectMCPAuthActionToYml(args: {
|
|
107
92
|
ymlPath: string;
|
|
@@ -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
|
|
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;;;GAGG;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;;;;;;GAMG;AACH,wBAAsB,uBAAuB,CAC3C,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,wBAAwB,CAAC,CAenC;AAED;;;;;GAKG;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,2BAA2B,CAAC,EAAE,OAAO,CAAC;IACtC;wDACoD;IACpD,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC;AAED;;;;;;;;;;;;;;;GAeG;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,CA8DrC;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"}
|
|
@@ -2,7 +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.MCP_AUTH_PLACEHOLDER_WARNING_TYPES = exports.MCP_OAUTH_TOKEN_URL_PLACEHOLDER = exports.MCP_OAUTH_AUTHORIZATION_URL_PLACEHOLDER = exports.
|
|
5
|
+
exports.MCP_AUTH_PLACEHOLDER_WARNING_TYPES = exports.MCP_OAUTH_TOKEN_URL_PLACEHOLDER = exports.MCP_OAUTH_AUTHORIZATION_URL_PLACEHOLDER = exports.mcpAuthScaffolderDeps = void 0;
|
|
6
6
|
exports.deriveMCPManifestOAuth = deriveMCPManifestOAuth;
|
|
7
7
|
exports.resolveMCPAuthEndpoints = resolveMCPAuthEndpoints;
|
|
8
8
|
exports.isMCPScaffoldWarning = isMCPScaffoldWarning;
|
|
@@ -20,8 +20,7 @@ const mcpToolFetcher_1 = require("./mcpToolFetcher");
|
|
|
20
20
|
*/
|
|
21
21
|
/**
|
|
22
22
|
* Resolved authorization-server endpoints relevant to the MCP scaffolder.
|
|
23
|
-
*
|
|
24
|
-
* `wellKnownAuthorizationServer`; static `oauth` ignores it.
|
|
23
|
+
* Dynamic registration delegates metadata discovery to TGS.
|
|
25
24
|
*/
|
|
26
25
|
exports.mcpAuthScaffolderDeps = {
|
|
27
26
|
resolveMCPOAuthMetadata: mcpToolFetcher_1.resolveMCPOAuthMetadata,
|
|
@@ -46,13 +45,12 @@ function deriveMCPManifestOAuth(authType, registrationId) {
|
|
|
46
45
|
/**
|
|
47
46
|
* Resolve OAuth endpoints based on the user's `mcp-da-auth-type` choice.
|
|
48
47
|
*
|
|
49
|
-
* - `oauth
|
|
48
|
+
* - `oauth`: probe `resource_metadata` /
|
|
50
49
|
* `.well-known/oauth-authorization-server` to discover authorization/token URLs.
|
|
51
|
-
*
|
|
52
|
-
* - `entra-sso` and `none`: returns empty (no static endpoints to resolve).
|
|
50
|
+
* - Other auth types return empty (no static endpoints to resolve).
|
|
53
51
|
*/
|
|
54
52
|
async function resolveMCPAuthEndpoints(authType, inputs) {
|
|
55
|
-
if (authType !== "oauth"
|
|
53
|
+
if (authType !== "oauth") {
|
|
56
54
|
return {};
|
|
57
55
|
}
|
|
58
56
|
const metadata = await exports.mcpAuthScaffolderDeps.resolveMCPOAuthMetadata(inputs[questionNames_1.QuestionNames.MCPForDAAuthMetadataUrl], inputs[questionNames_1.QuestionNames.MCPForDAAuthWellKnownUrl], inputs[questionNames_1.QuestionNames.MCPForDAServerUrl]);
|
|
@@ -63,19 +61,11 @@ async function resolveMCPAuthEndpoints(authType, inputs) {
|
|
|
63
61
|
wellKnownUrl: metadata.wellKnownUrl,
|
|
64
62
|
};
|
|
65
63
|
}
|
|
66
|
-
/**
|
|
67
|
-
* Placeholder written to `wellKnownAuthorizationServer` when the
|
|
68
|
-
* `oauth-dynamic` flow can't auto-discover the URL at scaffold time. The
|
|
69
|
-
* developer must replace this before provisioning. Surfaced via the
|
|
70
|
-
* `wellKnownUrlPlaceholderUsed` return flag so callers can emit a warning.
|
|
71
|
-
*/
|
|
72
|
-
exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_WELL_KNOWN_AUTHORIZATION_SERVER_URL>";
|
|
73
64
|
/**
|
|
74
65
|
* Placeholders written to `oauth/register` when endpoint discovery can't produce the
|
|
75
66
|
* authorization / token URLs for a static `oauth` (`identityProvider: Custom`) action.
|
|
76
67
|
* Omitting the fields instead would hide the gap entirely — the action looks complete but
|
|
77
|
-
* can never provision — so the placeholders make the missing values visible and editable
|
|
78
|
-
* mirroring the `dcr/register` contract above.
|
|
68
|
+
* can never provision — so the placeholders make the missing values visible and editable.
|
|
79
69
|
*/
|
|
80
70
|
exports.MCP_OAUTH_AUTHORIZATION_URL_PLACEHOLDER = "<PLEASE_FILL_IN_AUTHORIZATION_URL>";
|
|
81
71
|
exports.MCP_OAUTH_TOKEN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_TOKEN_URL>";
|
|
@@ -112,10 +102,7 @@ exports.MCP_AUTH_PLACEHOLDER_WARNING_TYPES = [
|
|
|
112
102
|
* reference is emitted only when `scopes` is non-empty, matching the conditional
|
|
113
103
|
* env-var write so provision never sees a dangling `${{...}}` reference.
|
|
114
104
|
*
|
|
115
|
-
* `oauth-dynamic`
|
|
116
|
-
* missing — a placeholder string is written instead so the action shows up in
|
|
117
|
-
* `m365agents.yml` for the developer to fix. The return flag tells the caller
|
|
118
|
-
* to emit a visible warning.
|
|
105
|
+
* `oauth-dynamic` passes the MCP endpoint to TGS for metadata discovery during provision.
|
|
119
106
|
*/
|
|
120
107
|
async function injectMCPAuthActionToYml(args) {
|
|
121
108
|
if (args.authType === "none")
|
|
@@ -127,10 +114,8 @@ async function injectMCPAuthActionToYml(args) {
|
|
|
127
114
|
return {};
|
|
128
115
|
}
|
|
129
116
|
if (args.authType === "oauth-dynamic") {
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
await actionInjector_1.ActionInjector.injectCreateDcrActionForMCP(args.ymlPath, args.authName, args.registrationId, args.mcpServerUrl, wellKnownUrl);
|
|
133
|
-
return placeholderUsed ? { wellKnownUrlPlaceholderUsed: true } : {};
|
|
117
|
+
await actionInjector_1.ActionInjector.injectCreateDcrActionForMCP(args.ymlPath, args.authName, args.registrationId, args.mcpServerUrl);
|
|
118
|
+
return {};
|
|
134
119
|
}
|
|
135
120
|
let credentialEnvNames;
|
|
136
121
|
if (args.persistCredentialEnvRefs && args.serverName) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthScaffolder.js","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"mcpAuthScaffolder.js","sourceRoot":"","sources":["../../../src/component/utils/mcpAuthScaffolder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { FxError } from "@microsoft/teamsfx-api";
|
|
2
2
|
import { Result } from "neverthrow";
|
|
3
|
-
export declare const MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_WELL_KNOWN_AUTHORIZATION_SERVER_URL>";
|
|
4
3
|
/**
|
|
5
4
|
* Placeholders for a static `oauth` action whose authorization / token URLs could not be
|
|
6
5
|
* discovered. `identityProvider: Custom` is unusable without both, and omitting the fields
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthAction.d.ts","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthAction.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAa7C
|
|
1
|
+
{"version":3,"file":"mcpAuthAction.d.ts","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthAction.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAe,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAa7C;;;;GAIG;AACH,eAAO,MAAM,uCAAuC,uCAAuC,CAAC;AAC5F,eAAO,MAAM,+BAA+B,+BAA+B,CAAC;AAE5E,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,MAAM,WAAW,iBAAiB;IAChC,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,kBAAkB,CAAC,EAAE;QACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,2BAA2B,EAAE,OAAO,CAAC;IACrC,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAoID,uFAAuF;AACvF,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,iBAAiB,GACtB,MAAM,CAAC,mBAAmB,EAAE,OAAO,CAAC,CA+DtC"}
|
|
@@ -2,7 +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.MCP_OAUTH_TOKEN_URL_PLACEHOLDER = exports.MCP_OAUTH_AUTHORIZATION_URL_PLACEHOLDER =
|
|
5
|
+
exports.MCP_OAUTH_TOKEN_URL_PLACEHOLDER = exports.MCP_OAUTH_AUTHORIZATION_URL_PLACEHOLDER = void 0;
|
|
6
6
|
exports.injectMcpAuthActionYaml = injectMcpAuthActionYaml;
|
|
7
7
|
const teamsfx_api_1 = require("@microsoft/teamsfx-api");
|
|
8
8
|
const neverthrow_1 = require("neverthrow");
|
|
@@ -16,7 +16,6 @@ const SUPPORTED_AUTH_TYPES = new Set([
|
|
|
16
16
|
"oauth-dynamic",
|
|
17
17
|
"bearer-token",
|
|
18
18
|
]);
|
|
19
|
-
exports.MCP_DCR_WELL_KNOWN_URL_PLACEHOLDER = "<PLEASE_FILL_IN_WELL_KNOWN_AUTHORIZATION_SERVER_URL>";
|
|
20
19
|
/**
|
|
21
20
|
* Placeholders for a static `oauth` action whose authorization / token URLs could not be
|
|
22
21
|
* discovered. `identityProvider: Custom` is unusable without both, and omitting the fields
|
|
@@ -118,7 +117,7 @@ function oauthAction(args, appIdEnvName) {
|
|
|
118
117
|
writeToEnvironmentFile: { configurationId: args.registrationId },
|
|
119
118
|
};
|
|
120
119
|
}
|
|
121
|
-
function dcrAction(args, appIdEnvName
|
|
120
|
+
function dcrAction(args, appIdEnvName) {
|
|
122
121
|
return {
|
|
123
122
|
uses: "dcr/register",
|
|
124
123
|
with: {
|
|
@@ -126,7 +125,7 @@ function dcrAction(args, appIdEnvName, wellKnownUrl) {
|
|
|
126
125
|
appId: `\${{${appIdEnvName}}}`,
|
|
127
126
|
applicableToApps: "AnyApp",
|
|
128
127
|
targetAudience: "HomeTenant",
|
|
129
|
-
|
|
128
|
+
mcpResourceUrl: args.mcpServerUrl,
|
|
130
129
|
targetUrlsShouldStartWith: [args.mcpServerUrl],
|
|
131
130
|
},
|
|
132
131
|
writeToEnvironmentFile: { configurationId: args.registrationId },
|
|
@@ -181,10 +180,9 @@ function injectMcpAuthActionYaml(yaml, args) {
|
|
|
181
180
|
if (!appIdEnvName) {
|
|
182
181
|
return failure("The rendered m365agents.yml does not expose a Teams app id.");
|
|
183
182
|
}
|
|
184
|
-
const placeholderUsed = args.authType === "oauth-dynamic" && !args.endpoints.wellKnownUrl;
|
|
185
183
|
const oauthUrlPlaceholderUsed = args.authType === "oauth" && (!args.endpoints.authorizationUrl || !args.endpoints.tokenUrl);
|
|
186
184
|
const action = args.authType === "oauth-dynamic"
|
|
187
|
-
? dcrAction(args, appIdEnvName
|
|
185
|
+
? dcrAction(args, appIdEnvName)
|
|
188
186
|
: args.authType === "bearer-token"
|
|
189
187
|
? apiKeyAction(args, appIdEnvName)
|
|
190
188
|
: oauthAction(args, appIdEnvName);
|
|
@@ -197,7 +195,7 @@ function injectMcpAuthActionYaml(yaml, args) {
|
|
|
197
195
|
}
|
|
198
196
|
return (0, neverthrow_1.ok)({
|
|
199
197
|
yaml: document.toString(),
|
|
200
|
-
wellKnownUrlPlaceholderUsed:
|
|
198
|
+
wellKnownUrlPlaceholderUsed: false,
|
|
201
199
|
oauthUrlPlaceholderUsed,
|
|
202
200
|
});
|
|
203
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthAction.js","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthAction.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;
|
|
1
|
+
{"version":3,"file":"mcpAuthAction.js","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthAction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthScaffold.d.ts","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthScaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAwB,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAgB9D,oFAAoF;AACpF,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAkFF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE;QACjB,QAAQ,EAAE,OAAO,CAAC;QAClB,YAAY,EAAE,OAAO,CAAC;QACtB,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,GACA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"mcpAuthScaffold.d.ts","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthScaffold.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAwB,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAG7C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAgB9D,oFAAoF;AACpF,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC;AAkFF;;;;GAIG;AACH,wBAAsB,mBAAmB,CACvC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE;QACjB,QAAQ,EAAE,OAAO,CAAC;QAClB,YAAY,EAAE,OAAO,CAAC;QACtB,KAAK,EAAE,OAAO,CAAC;QACf,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,CAAC;CACH,GACA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA0DhC;AAED;;;GAGG;AACH,wBAAsB,6BAA6B,CACjD,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE;IACJ,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GACA,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAyBhC"}
|
|
@@ -47,14 +47,14 @@ function mcpAuthIdentifiers(mcpServerUrl) {
|
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
49
|
/**
|
|
50
|
-
* Best-effort resolution of the authorization-server endpoints for
|
|
50
|
+
* Best-effort resolution of the authorization-server endpoints for static `oauth`,
|
|
51
51
|
* mirroring the v3 create flow: probe the server for its `resource_metadata`, then resolve the
|
|
52
52
|
* well-known OAuth metadata. Any failure yields empty endpoints — the action is still injected and
|
|
53
|
-
* the developer fills the URLs before provisioning, matching v3's best-effort behavior.
|
|
54
|
-
*
|
|
53
|
+
* the developer fills the URLs before provisioning, matching v3's best-effort behavior.
|
|
54
|
+
* Other auth types need no endpoints (no network); TGS owns dynamic registration discovery.
|
|
55
55
|
*/
|
|
56
56
|
async function resolveEndpoints(authType, mcpServerUrl, warn) {
|
|
57
|
-
if (authType !== "oauth"
|
|
57
|
+
if (authType !== "oauth") {
|
|
58
58
|
return {};
|
|
59
59
|
}
|
|
60
60
|
try {
|
|
@@ -104,7 +104,6 @@ async function injectMcpAuthAction(ctx, args) {
|
|
|
104
104
|
}
|
|
105
105
|
const identifiers = mcpAuthIdentifiers(args.mcpServerUrl);
|
|
106
106
|
const endpoints = await resolveEndpoints(args.authType, args.mcpServerUrl, ctx.warn);
|
|
107
|
-
let wellKnownUrlPlaceholderUsed = false;
|
|
108
107
|
let oauthUrlPlaceholderUsed = false;
|
|
109
108
|
for (const ymlFile of ymlFiles) {
|
|
110
109
|
const injectResult = (0, mcpAuthAction_1.injectMcpAuthActionYaml)(ymlFile.content.toString("utf8"), {
|
|
@@ -134,16 +133,9 @@ async function injectMcpAuthAction(ctx, args) {
|
|
|
134
133
|
if (injectResult.isErr()) {
|
|
135
134
|
return (0, neverthrow_1.err)(injectResult.error);
|
|
136
135
|
}
|
|
137
|
-
wellKnownUrlPlaceholderUsed ||= injectResult.value.wellKnownUrlPlaceholderUsed;
|
|
138
136
|
oauthUrlPlaceholderUsed ||= injectResult.value.oauthUrlPlaceholderUsed;
|
|
139
137
|
ctx.write(ymlFile.path, Buffer.from(injectResult.value.yaml, "utf8"));
|
|
140
138
|
}
|
|
141
|
-
if (wellKnownUrlPlaceholderUsed) {
|
|
142
|
-
ctx.warn?.({
|
|
143
|
-
type: "mcpAuthDcrWellKnownUrlPlaceholder",
|
|
144
|
-
content: (0, localizeUtils_1.getLocalizedString)("core.MCPForDA.mcpAuthDcrPlaceholderWarning"),
|
|
145
|
-
});
|
|
146
|
-
}
|
|
147
139
|
if (oauthUrlPlaceholderUsed) {
|
|
148
140
|
ctx.warn?.({
|
|
149
141
|
type: "mcpAuthOAuthUrlPlaceholder",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcpAuthScaffold.js","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthScaffold.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAkHlC,
|
|
1
|
+
{"version":3,"file":"mcpAuthScaffold.js","sourceRoot":"","sources":["../../../src/v4/mcp/mcpAuthScaffold.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@microsoft/teamsfx-core",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.5-alpha.46aaa82df3.0",
|
|
4
4
|
"main": "build/index.js",
|
|
5
5
|
"types": "build/index.d.ts",
|
|
6
6
|
"license": "MIT",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"@feathersjs/hooks": "^0.6.5",
|
|
22
22
|
"@microsoft/dev-tunnels-contracts": "1.1.9",
|
|
23
23
|
"@microsoft/dev-tunnels-management": "1.1.9",
|
|
24
|
-
"@microsoft/kiota": "1.
|
|
24
|
+
"@microsoft/kiota": "1.35.0",
|
|
25
25
|
"@modelcontextprotocol/sdk": "^1.29.0",
|
|
26
26
|
"adm-zip": "^0.6.0",
|
|
27
27
|
"ajv": "^8.18.0",
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
"neverthrow": "^3.2.0",
|
|
52
52
|
"node-fetch": "^3.3.2",
|
|
53
53
|
"node-forge": "^1.3.1",
|
|
54
|
-
"office-addin-manifest": "^
|
|
55
|
-
"office-addin-project": "^
|
|
54
|
+
"office-addin-manifest": "^3.0.1",
|
|
55
|
+
"office-addin-project": "^2.0.1",
|
|
56
56
|
"openapi-types": "^7.2.3",
|
|
57
57
|
"proper-lockfile": "^4.1.2",
|
|
58
58
|
"read-package-json-fast": "^2.0.3",
|
|
@@ -68,8 +68,8 @@
|
|
|
68
68
|
"validator": "^13.7.0",
|
|
69
69
|
"xml2js": "^0.5.0",
|
|
70
70
|
"yaml": "^2.4.2",
|
|
71
|
-
"@microsoft/
|
|
72
|
-
"@microsoft/
|
|
71
|
+
"@microsoft/teamsfx-api": "0.24.4-alpha.46aaa82df3.0",
|
|
72
|
+
"@microsoft/m365-spec-parser": "^0.3.4-alpha.46aaa82df3.0"
|
|
73
73
|
},
|
|
74
74
|
"devDependencies": {
|
|
75
75
|
"@azure/storage-blob": "^12.5.0",
|
|
@@ -154,7 +154,7 @@
|
|
|
154
154
|
"gitHead": "7d60c0765c0ea8c023a26c10d1c93001c597afbb",
|
|
155
155
|
"publishConfig": {
|
|
156
156
|
"access": "public",
|
|
157
|
-
"tag": "
|
|
157
|
+
"tag": "alpha"
|
|
158
158
|
},
|
|
159
159
|
"lint-staged": {
|
|
160
160
|
"*.{js,jsx,css,ts,tsx}": [
|
|
@@ -1949,45 +1949,62 @@
|
|
|
1949
1949
|
"dcrRegister": {
|
|
1950
1950
|
"type": "object",
|
|
1951
1951
|
"additionalProperties": false,
|
|
1952
|
-
"description": "Create a Dynamic Client Registration (DCR) configuration.",
|
|
1952
|
+
"description": "Create a Dynamic Client Registration (DCR) configuration through Teams Graph Service (TGS). Registration is skipped when the mapped configurationId environment variable already has a value.",
|
|
1953
1953
|
"required": ["uses", "with", "writeToEnvironmentFile"],
|
|
1954
1954
|
"properties": {
|
|
1955
1955
|
"uses": {
|
|
1956
1956
|
"type": "string",
|
|
1957
|
-
"description": "Register
|
|
1957
|
+
"description": "Register an OAuth configuration using server-side Dynamic Client Registration.",
|
|
1958
1958
|
"const": "dcr/register"
|
|
1959
1959
|
},
|
|
1960
1960
|
"with": {
|
|
1961
1961
|
"type": "object",
|
|
1962
1962
|
"additionalProperties": false,
|
|
1963
|
-
"description": "
|
|
1964
|
-
"required": ["name", "
|
|
1963
|
+
"description": "DCR registration parameters. Supply mcpResourceUrl for protected resource metadata discovery, wellKnownAuthorizationServer to pin authorization-server metadata, or both.",
|
|
1964
|
+
"required": ["name", "targetUrlsShouldStartWith"],
|
|
1965
|
+
"anyOf": [
|
|
1966
|
+
{ "required": ["mcpResourceUrl"] },
|
|
1967
|
+
{ "required": ["wellKnownAuthorizationServer"] }
|
|
1968
|
+
],
|
|
1965
1969
|
"properties": {
|
|
1966
1970
|
"name": {
|
|
1967
1971
|
"type": "string",
|
|
1968
|
-
"description": "
|
|
1972
|
+
"description": "Required client name sent to TGS as clientName for dynamic registration. Maximum 128 characters."
|
|
1969
1973
|
},
|
|
1970
1974
|
"appId": {
|
|
1971
1975
|
"type": "string",
|
|
1972
|
-
"description": "
|
|
1976
|
+
"description": "Microsoft 365 app ID. Required when applicableToApps is SpecificApp; ignored when applicableToApps is AnyApp."
|
|
1977
|
+
},
|
|
1978
|
+
"mcpResourceUrl": {
|
|
1979
|
+
"type": "string",
|
|
1980
|
+
"minLength": 1,
|
|
1981
|
+
"description": "HTTPS URL of the actual MCP endpoint, including its path. Recommended for new configurations. TGS probes this endpoint and RFC 9728 well-known locations for protected resource metadata (PRM), then uses its first authorization_servers entry, resource and scopes_supported. This is not the PRM document URL and is not necessarily the OAuth resource indicator. Optional when wellKnownAuthorizationServer is supplied."
|
|
1973
1982
|
},
|
|
1974
1983
|
"wellKnownAuthorizationServer": {
|
|
1975
1984
|
"type": "string",
|
|
1976
|
-
"
|
|
1985
|
+
"minLength": 1,
|
|
1986
|
+
"description": "Legacy/pinning HTTPS URL of the authorization server's RFC 8414 metadata document. Optional when mcpResourceUrl is supplied. When present, this URL takes precedence for authorization-server metadata resolution. If mcpResourceUrl is also supplied, TGS still attempts best-effort PRM discovery for resource and scopes; failure of that enrichment does not fail registration."
|
|
1987
|
+
},
|
|
1988
|
+
"resource": {
|
|
1989
|
+
"type": "string",
|
|
1990
|
+
"minLength": 1,
|
|
1991
|
+
"description": "Optional explicit OAuth resource indicator: an absolute URI without a fragment. Overrides PRM's resource value. Normally omit this field and let PRM determine the resource; it is not inferred from mcpResourceUrl. TGS sends the selected resource in authorization, token and refresh-token requests."
|
|
1977
1992
|
},
|
|
1978
1993
|
"targetUrlsShouldStartWith": {
|
|
1979
1994
|
"type": "array",
|
|
1980
|
-
"description": "
|
|
1981
|
-
"
|
|
1995
|
+
"description": "Required MCP target URL array. TGS requires exactly one valid HTTPS URL; omission, a string, an empty array or multiple entries is rejected. New configurations use the actual MCP endpoint. This field does not set the OAuth resource indicator.",
|
|
1996
|
+
"minItems": 1,
|
|
1997
|
+
"maxItems": 1,
|
|
1998
|
+
"items": { "type": "string", "minLength": 1 }
|
|
1982
1999
|
},
|
|
1983
2000
|
"applicableToApps": {
|
|
1984
2001
|
"type": "string",
|
|
1985
|
-
"description": "
|
|
2002
|
+
"description": "Applications permitted to use this configuration: AnyApp (default), or SpecificApp, which requires appId.",
|
|
1986
2003
|
"enum": ["SpecificApp", "AnyApp"]
|
|
1987
2004
|
},
|
|
1988
2005
|
"targetAudience": {
|
|
1989
2006
|
"type": "string",
|
|
1990
|
-
"description": "
|
|
2007
|
+
"description": "Tenants permitted to use this configuration: HomeTenant (default) or AnyTenant.",
|
|
1991
2008
|
"enum": ["HomeTenant", "AnyTenant"]
|
|
1992
2009
|
}
|
|
1993
2010
|
}
|
|
@@ -1999,7 +2016,7 @@
|
|
|
1999
2016
|
"required": ["configurationId"],
|
|
2000
2017
|
"properties": {
|
|
2001
2018
|
"configurationId": {
|
|
2002
|
-
"description": "Required.
|
|
2019
|
+
"description": "Required environment variable name receiving the returned configurationRegistrationId.oAuthConfigId. This is a configuration ID, not an OAuth client ID or resource indicator. An existing value causes this action to skip registration.",
|
|
2003
2020
|
"$ref": "#/definitions/envVarName"
|
|
2004
2021
|
}
|
|
2005
2022
|
}
|
|
@@ -1949,45 +1949,62 @@
|
|
|
1949
1949
|
"dcrRegister": {
|
|
1950
1950
|
"type": "object",
|
|
1951
1951
|
"additionalProperties": false,
|
|
1952
|
-
"description": "Create a Dynamic Client Registration (DCR) configuration.",
|
|
1952
|
+
"description": "Create a Dynamic Client Registration (DCR) configuration through Teams Graph Service (TGS). Registration is skipped when the mapped configurationId environment variable already has a value.",
|
|
1953
1953
|
"required": ["uses", "with", "writeToEnvironmentFile"],
|
|
1954
1954
|
"properties": {
|
|
1955
1955
|
"uses": {
|
|
1956
1956
|
"type": "string",
|
|
1957
|
-
"description": "Register
|
|
1957
|
+
"description": "Register an OAuth configuration using server-side Dynamic Client Registration.",
|
|
1958
1958
|
"const": "dcr/register"
|
|
1959
1959
|
},
|
|
1960
1960
|
"with": {
|
|
1961
1961
|
"type": "object",
|
|
1962
1962
|
"additionalProperties": false,
|
|
1963
|
-
"description": "
|
|
1964
|
-
"required": ["name", "
|
|
1963
|
+
"description": "DCR registration parameters. Supply mcpResourceUrl for protected resource metadata discovery, wellKnownAuthorizationServer to pin authorization-server metadata, or both.",
|
|
1964
|
+
"required": ["name", "targetUrlsShouldStartWith"],
|
|
1965
|
+
"anyOf": [
|
|
1966
|
+
{ "required": ["mcpResourceUrl"] },
|
|
1967
|
+
{ "required": ["wellKnownAuthorizationServer"] }
|
|
1968
|
+
],
|
|
1965
1969
|
"properties": {
|
|
1966
1970
|
"name": {
|
|
1967
1971
|
"type": "string",
|
|
1968
|
-
"description": "
|
|
1972
|
+
"description": "Required client name sent to TGS as clientName for dynamic registration. Maximum 128 characters."
|
|
1969
1973
|
},
|
|
1970
1974
|
"appId": {
|
|
1971
1975
|
"type": "string",
|
|
1972
|
-
"description": "
|
|
1976
|
+
"description": "Microsoft 365 app ID. Required when applicableToApps is SpecificApp; ignored when applicableToApps is AnyApp."
|
|
1977
|
+
},
|
|
1978
|
+
"mcpResourceUrl": {
|
|
1979
|
+
"type": "string",
|
|
1980
|
+
"minLength": 1,
|
|
1981
|
+
"description": "HTTPS URL of the actual MCP endpoint, including its path. Recommended for new configurations. TGS probes this endpoint and RFC 9728 well-known locations for protected resource metadata (PRM), then uses its first authorization_servers entry, resource and scopes_supported. This is not the PRM document URL and is not necessarily the OAuth resource indicator. Optional when wellKnownAuthorizationServer is supplied."
|
|
1973
1982
|
},
|
|
1974
1983
|
"wellKnownAuthorizationServer": {
|
|
1975
1984
|
"type": "string",
|
|
1976
|
-
"
|
|
1985
|
+
"minLength": 1,
|
|
1986
|
+
"description": "Legacy/pinning HTTPS URL of the authorization server's RFC 8414 metadata document. Optional when mcpResourceUrl is supplied. When present, this URL takes precedence for authorization-server metadata resolution. If mcpResourceUrl is also supplied, TGS still attempts best-effort PRM discovery for resource and scopes; failure of that enrichment does not fail registration."
|
|
1987
|
+
},
|
|
1988
|
+
"resource": {
|
|
1989
|
+
"type": "string",
|
|
1990
|
+
"minLength": 1,
|
|
1991
|
+
"description": "Optional explicit OAuth resource indicator: an absolute URI without a fragment. Overrides PRM's resource value. Normally omit this field and let PRM determine the resource; it is not inferred from mcpResourceUrl. TGS sends the selected resource in authorization, token and refresh-token requests."
|
|
1977
1992
|
},
|
|
1978
1993
|
"targetUrlsShouldStartWith": {
|
|
1979
1994
|
"type": "array",
|
|
1980
|
-
"description": "
|
|
1981
|
-
"
|
|
1995
|
+
"description": "Required MCP target URL array. TGS requires exactly one valid HTTPS URL; omission, a string, an empty array or multiple entries is rejected. New configurations use the actual MCP endpoint. This field does not set the OAuth resource indicator.",
|
|
1996
|
+
"minItems": 1,
|
|
1997
|
+
"maxItems": 1,
|
|
1998
|
+
"items": { "type": "string", "minLength": 1 }
|
|
1982
1999
|
},
|
|
1983
2000
|
"applicableToApps": {
|
|
1984
2001
|
"type": "string",
|
|
1985
|
-
"description": "
|
|
2002
|
+
"description": "Applications permitted to use this configuration: AnyApp (default), or SpecificApp, which requires appId.",
|
|
1986
2003
|
"enum": ["SpecificApp", "AnyApp"]
|
|
1987
2004
|
},
|
|
1988
2005
|
"targetAudience": {
|
|
1989
2006
|
"type": "string",
|
|
1990
|
-
"description": "
|
|
2007
|
+
"description": "Tenants permitted to use this configuration: HomeTenant (default) or AnyTenant.",
|
|
1991
2008
|
"enum": ["HomeTenant", "AnyTenant"]
|
|
1992
2009
|
}
|
|
1993
2010
|
}
|
|
@@ -1999,7 +2016,7 @@
|
|
|
1999
2016
|
"required": ["configurationId"],
|
|
2000
2017
|
"properties": {
|
|
2001
2018
|
"configurationId": {
|
|
2002
|
-
"description": "Required.
|
|
2019
|
+
"description": "Required environment variable name receiving the returned configurationRegistrationId.oAuthConfigId. This is a configuration ID, not an OAuth client ID or resource indicator. An existing value causes this action to skip registration.",
|
|
2003
2020
|
"$ref": "#/definitions/envVarName"
|
|
2004
2021
|
}
|
|
2005
2022
|
}
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/templates/metadata.zip
CHANGED
|
Binary file
|
package/templates/v4/floor.json
CHANGED
|
Binary file
|
|
Binary file
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"treatmentVariables.d.ts","sourceRoot":"","sources":["../../src/common/treatmentVariables.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB;;;CAGrB,CAAC"}
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
// Copyright (c) Microsoft Corporation.
|
|
3
|
-
// Licensed under the MIT license.
|
|
4
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.TreatmentVariables = void 0;
|
|
6
|
-
exports.TreatmentVariables = {
|
|
7
|
-
VSCodeConfig: "vscode",
|
|
8
|
-
RaiValidation: "RaiValidation",
|
|
9
|
-
};
|
|
10
|
-
//# sourceMappingURL=treatmentVariables.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"treatmentVariables.js","sourceRoot":"","sources":["../../src/common/treatmentVariables.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAErB,QAAA,kBAAkB,GAAG;IAChC,YAAY,EAAE,QAAQ;IACtB,aAAa,EAAE,eAAe;CACtB,CAAC"}
|