@microsoft/teamsfx-core 3.1.4 → 3.1.5-alpha.656c2e7763.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 +47 -14
- package/build/component/driver/dcr/create.js.map +1 -1
- package/build/component/driver/dcr/interface/createDcrArgs.d.ts +4 -1
- package/build/component/driver/dcr/interface/createDcrArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/create.d.ts.map +1 -1
- package/build/component/driver/oauth/create.js +16 -2
- package/build/component/driver/oauth/create.js.map +1 -1
- package/build/component/driver/oauth/error/oauthSupportedAccountTypesUnsupportedCloud.d.ts +5 -0
- package/build/component/driver/oauth/error/oauthSupportedAccountTypesUnsupportedCloud.d.ts.map +1 -0
- package/build/component/driver/oauth/error/oauthSupportedAccountTypesUnsupportedCloud.js +13 -0
- package/build/component/driver/oauth/error/oauthSupportedAccountTypesUnsupportedCloud.js.map +1 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts +1 -0
- package/build/component/driver/oauth/interface/createOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts +1 -0
- package/build/component/driver/oauth/interface/updateOauthArgs.d.ts.map +1 -1
- package/build/component/driver/oauth/update.d.ts.map +1 -1
- package/build/component/driver/oauth/update.js +26 -4
- package/build/component/driver/oauth/update.js.map +1 -1
- package/build/component/driver/oauth/utility/supportedAccountTypes.d.ts +6 -0
- package/build/component/driver/oauth/utility/supportedAccountTypes.d.ts.map +1 -0
- package/build/component/driver/oauth/utility/supportedAccountTypes.js +31 -0
- package/build/component/driver/oauth/utility/supportedAccountTypes.js.map +1 -0
- package/build/component/driver/teamsApp/interfaces/DcrRegistration.d.ts +5 -2
- package/build/component/driver/teamsApp/interfaces/DcrRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts +6 -0
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.d.ts.map +1 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js +5 -1
- package/build/component/driver/teamsApp/interfaces/OauthRegistration.js.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/package.nls.json +1 -0
- package/resource/yaml-schema/v1.13/yaml.schema.json +71 -33
- package/resource/yaml-schema/yaml.schema.json +71 -33
- 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
|
@@ -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.656c2e7763.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/m365-spec-parser": "^0.3.
|
|
72
|
-
"@microsoft/teamsfx-api": "0.24.
|
|
71
|
+
"@microsoft/m365-spec-parser": "^0.3.4-alpha.656c2e7763.0",
|
|
72
|
+
"@microsoft/teamsfx-api": "0.24.4-alpha.656c2e7763.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}": [
|
|
@@ -1172,6 +1172,7 @@
|
|
|
1172
1172
|
"core.createProjectQuestion.mcpForDa.EntraClientId.title": "Microsoft Entra Application (Client) ID",
|
|
1173
1173
|
"core.createProjectQuestion.mcpForDa.EntraClientId.placeholder": "Enter the Application (client) ID of your Microsoft Entra app registration",
|
|
1174
1174
|
"core.createProjectQuestion.mcpForDa.EntraClientId.required": "Microsoft Entra Application (Client) ID is required.",
|
|
1175
|
+
"driver.oauth.error.supportedAccountTypesUnsupportedCloud": "The includePersonalMicrosoftAccounts option is supported only in the Microsoft 365 commercial cloud environment.",
|
|
1175
1176
|
"core.createProjectQuestion.mcpForDa.File.title": "Select the action manifest you want to update",
|
|
1176
1177
|
"core.createProjectQuestion.mcpForDa.File.createNew.label": "Create a new ai-plugin.json",
|
|
1177
1178
|
"core.createProjectQuestion.mcpForDa.File.createNew.title": "Name the new action manifest file",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"environmentFolderPath": {
|
|
11
11
|
"type": "string",
|
|
12
12
|
"description": "The folder path of .env files used for variables and different environments."
|
|
13
|
-
|
|
13
|
+
},
|
|
14
14
|
"version": {
|
|
15
15
|
"type": "string",
|
|
16
16
|
"description": "The version of the yaml file schema",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"additionalProperties": true,
|
|
23
23
|
"properties": {
|
|
24
24
|
"sampleTag": {
|
|
25
|
-
"type": ["number","string","boolean","object","array", "null", "integer"],
|
|
25
|
+
"type": ["number", "string", "boolean", "object", "array", "null", "integer"],
|
|
26
26
|
"description": "A tag for the sample app used to track telemetry events sent by Microsoft 365 Agents Toolkit associated with that sample. Pattern: <sample-repo>:<sample-name>"
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -76,16 +76,16 @@
|
|
|
76
76
|
{ "$ref": "#/definitions/spfxDeploy" },
|
|
77
77
|
{ "$ref": "#/definitions/teamsAppCopyAppPackageToSPFx" },
|
|
78
78
|
{ "$ref": "#/definitions/script" },
|
|
79
|
-
{ "$ref": "#/definitions/apiKeyRegister"},
|
|
80
|
-
{ "$ref": "#/definitions/azureStaticWebAppGetDeploymentKey"},
|
|
81
|
-
{ "$ref": "#/definitions/apiKeyUpdate"},
|
|
82
|
-
{ "$ref": "#/definitions/oauthRegister"},
|
|
83
|
-
{ "$ref": "#/definitions/oauthUpdate"},
|
|
84
|
-
{ "$ref": "#/definitions/dcrRegister"},
|
|
85
|
-
{ "$ref": "#/definitions/devChannelCreate"},
|
|
86
|
-
{ "$ref": "#/definitions/devChannelInstallApp"},
|
|
87
|
-
{ "$ref": "#/definitions/typeSpecCompile"},
|
|
88
|
-
{ "$ref": "#/definitions/copilotAgentPublish"}
|
|
79
|
+
{ "$ref": "#/definitions/apiKeyRegister" },
|
|
80
|
+
{ "$ref": "#/definitions/azureStaticWebAppGetDeploymentKey" },
|
|
81
|
+
{ "$ref": "#/definitions/apiKeyUpdate" },
|
|
82
|
+
{ "$ref": "#/definitions/oauthRegister" },
|
|
83
|
+
{ "$ref": "#/definitions/oauthUpdate" },
|
|
84
|
+
{ "$ref": "#/definitions/dcrRegister" },
|
|
85
|
+
{ "$ref": "#/definitions/devChannelCreate" },
|
|
86
|
+
{ "$ref": "#/definitions/devChannelInstallApp" },
|
|
87
|
+
{ "$ref": "#/definitions/typeSpecCompile" },
|
|
88
|
+
{ "$ref": "#/definitions/copilotAgentPublish" }
|
|
89
89
|
]
|
|
90
90
|
}
|
|
91
91
|
},
|
|
@@ -115,7 +115,7 @@
|
|
|
115
115
|
"aadAppCreateWithSecret": {
|
|
116
116
|
"type": "object",
|
|
117
117
|
"additionalProperties": false,
|
|
118
|
-
"allOf": [
|
|
118
|
+
"allOf": [{ "$ref": "#/definitions/aadAppCreateBase" }],
|
|
119
119
|
"required": ["with", "writeToEnvironmentFile"],
|
|
120
120
|
"properties": {
|
|
121
121
|
"name": {},
|
|
@@ -144,7 +144,12 @@
|
|
|
144
144
|
"signInAudience": {
|
|
145
145
|
"type": "string",
|
|
146
146
|
"description": "Specifies what Microsoft accounts are supported for the current application.",
|
|
147
|
-
"enum": [
|
|
147
|
+
"enum": [
|
|
148
|
+
"AzureADMyOrg",
|
|
149
|
+
"AzureADMultipleOrgs",
|
|
150
|
+
"AzureADandPersonalMicrosoftAccount",
|
|
151
|
+
"PersonalMicrosoftAccount"
|
|
152
|
+
]
|
|
148
153
|
},
|
|
149
154
|
"serviceManagementReference": {
|
|
150
155
|
"type": "string",
|
|
@@ -197,7 +202,7 @@
|
|
|
197
202
|
},
|
|
198
203
|
"aadAppCreateWithoutSecret": {
|
|
199
204
|
"type": "object",
|
|
200
|
-
"allOf": [
|
|
205
|
+
"allOf": [{ "$ref": "#/definitions/aadAppCreateBase" }],
|
|
201
206
|
"required": ["with", "writeToEnvironmentFile"],
|
|
202
207
|
"additionalProperties": false,
|
|
203
208
|
"properties": {
|
|
@@ -227,7 +232,12 @@
|
|
|
227
232
|
"signInAudience": {
|
|
228
233
|
"type": "string",
|
|
229
234
|
"description": "Specifies what Microsoft accounts are supported for the current application.",
|
|
230
|
-
"enum": [
|
|
235
|
+
"enum": [
|
|
236
|
+
"AzureADMyOrg",
|
|
237
|
+
"AzureADMultipleOrgs",
|
|
238
|
+
"AzureADandPersonalMicrosoftAccount",
|
|
239
|
+
"PersonalMicrosoftAccount"
|
|
240
|
+
]
|
|
231
241
|
},
|
|
232
242
|
"serviceManagementReference": {
|
|
233
243
|
"type": "string",
|
|
@@ -1049,7 +1059,7 @@
|
|
|
1049
1059
|
"$ref": "#/definitions/secretEnvVarName"
|
|
1050
1060
|
}
|
|
1051
1061
|
}
|
|
1052
|
-
}
|
|
1062
|
+
}
|
|
1053
1063
|
}
|
|
1054
1064
|
},
|
|
1055
1065
|
"botframeworkCreate": {
|
|
@@ -1104,7 +1114,10 @@
|
|
|
1104
1114
|
"type": "array",
|
|
1105
1115
|
"description": "the channel(s) to be enabled of the bot",
|
|
1106
1116
|
"items": {
|
|
1107
|
-
"oneOf": [
|
|
1117
|
+
"oneOf": [
|
|
1118
|
+
{ "$ref": "#/definitions/MsTeamsChannel" },
|
|
1119
|
+
{ "$ref": "#/definitions/M365ExtensionsChannel" }
|
|
1120
|
+
]
|
|
1108
1121
|
}
|
|
1109
1122
|
}
|
|
1110
1123
|
}
|
|
@@ -1281,9 +1294,7 @@
|
|
|
1281
1294
|
"type": "object",
|
|
1282
1295
|
"description": "Install Azure Functions Core Tools. This will output environment variable specified by `funcPath` to current environment's .env file.",
|
|
1283
1296
|
"additionalProperties": false,
|
|
1284
|
-
"required": [
|
|
1285
|
-
"version"
|
|
1286
|
-
],
|
|
1297
|
+
"required": ["version"],
|
|
1287
1298
|
"properties": {
|
|
1288
1299
|
"version": {
|
|
1289
1300
|
"oneOf": [
|
|
@@ -1557,7 +1568,7 @@
|
|
|
1557
1568
|
"description": "redirect stdout and stderr to a file"
|
|
1558
1569
|
}
|
|
1559
1570
|
}
|
|
1560
|
-
}
|
|
1571
|
+
}
|
|
1561
1572
|
}
|
|
1562
1573
|
},
|
|
1563
1574
|
"relativePath": {
|
|
@@ -1841,6 +1852,10 @@
|
|
|
1841
1852
|
"type": "string",
|
|
1842
1853
|
"description": "Token exchange method type, can be BasicAuthorizationHeader or PostRequestBody. BasicAuthorizationHeader: token exchange via HTTP headers, PostRequestBody: token exchange via request body. Default is BasicAuthorizationHeader.",
|
|
1843
1854
|
"enum": ["BasicAuthorizationHeader", "PostRequestBody"]
|
|
1855
|
+
},
|
|
1856
|
+
"includePersonalMicrosoftAccounts": {
|
|
1857
|
+
"type": "boolean",
|
|
1858
|
+
"description": "Whether to allow personal Microsoft accounts in addition to work or school accounts. If omitted when registering, only work or school accounts are allowed."
|
|
1844
1859
|
}
|
|
1845
1860
|
}
|
|
1846
1861
|
},
|
|
@@ -1941,6 +1956,10 @@
|
|
|
1941
1956
|
"type": "string",
|
|
1942
1957
|
"description": "Token exchange method type, can be BasicAuthorizationHeader or PostRequestBody. BasicAuthorizationHeader: token exchange via HTTP headers, PostRequestBody: token exchange via request body. Default is BasicAuthorizationHeader.",
|
|
1943
1958
|
"enum": ["BasicAuthorizationHeader", "PostRequestBody"]
|
|
1959
|
+
},
|
|
1960
|
+
"includePersonalMicrosoftAccounts": {
|
|
1961
|
+
"type": "boolean",
|
|
1962
|
+
"description": "Whether to allow personal Microsoft accounts in addition to work or school accounts. If omitted during an update, the existing account support remains unchanged."
|
|
1944
1963
|
}
|
|
1945
1964
|
}
|
|
1946
1965
|
}
|
|
@@ -1949,46 +1968,65 @@
|
|
|
1949
1968
|
"dcrRegister": {
|
|
1950
1969
|
"type": "object",
|
|
1951
1970
|
"additionalProperties": false,
|
|
1952
|
-
"description": "Create a Dynamic Client Registration (DCR) configuration.",
|
|
1971
|
+
"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
1972
|
"required": ["uses", "with", "writeToEnvironmentFile"],
|
|
1954
1973
|
"properties": {
|
|
1955
1974
|
"uses": {
|
|
1956
1975
|
"type": "string",
|
|
1957
|
-
"description": "Register
|
|
1976
|
+
"description": "Register an OAuth configuration using server-side Dynamic Client Registration.",
|
|
1958
1977
|
"const": "dcr/register"
|
|
1959
1978
|
},
|
|
1960
1979
|
"with": {
|
|
1961
1980
|
"type": "object",
|
|
1962
1981
|
"additionalProperties": false,
|
|
1963
|
-
"description": "
|
|
1964
|
-
"required": ["name"
|
|
1982
|
+
"description": "DCR registration parameters. Supply mcpResourceUrl for protected resource metadata discovery, wellKnownAuthorizationServer to pin authorization-server metadata, or both.",
|
|
1983
|
+
"required": ["name"],
|
|
1984
|
+
"anyOf": [
|
|
1985
|
+
{ "required": ["mcpResourceUrl"] },
|
|
1986
|
+
{ "required": ["wellKnownAuthorizationServer"] }
|
|
1987
|
+
],
|
|
1965
1988
|
"properties": {
|
|
1966
1989
|
"name": {
|
|
1967
1990
|
"type": "string",
|
|
1968
|
-
"description": "
|
|
1991
|
+
"description": "Required client name sent to TGS as clientName for dynamic registration. Maximum 128 characters."
|
|
1969
1992
|
},
|
|
1970
1993
|
"appId": {
|
|
1971
1994
|
"type": "string",
|
|
1972
|
-
"description": "
|
|
1995
|
+
"description": "Microsoft 365 app ID. Required when applicableToApps is SpecificApp; ignored when applicableToApps is AnyApp."
|
|
1996
|
+
},
|
|
1997
|
+
"mcpResourceUrl": {
|
|
1998
|
+
"type": "string",
|
|
1999
|
+
"minLength": 1,
|
|
2000
|
+
"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) to discover resource and scopes_supported. Unless wellKnownAuthorizationServer is supplied, TGS uses PRM's first authorization_servers entry. This is not the PRM document URL; the OAuth resource indicator comes from PRM's resource, not directly from this endpoint URL. Optional when wellKnownAuthorizationServer is supplied."
|
|
1973
2001
|
},
|
|
1974
2002
|
"wellKnownAuthorizationServer": {
|
|
1975
2003
|
"type": "string",
|
|
1976
|
-
"
|
|
2004
|
+
"minLength": 1,
|
|
2005
|
+
"description": "HTTPS URL of the authorization server's RFC 8414 metadata document, supported for existing configurations and explicit authorization-server selection. Optional when mcpResourceUrl is supplied. When present, this URL takes precedence for authorization-server metadata resolution. An authorization server can serve multiple resources, so this metadata alone cannot identify the intended OAuth resource. Without mcpResourceUrl, supply resource explicitly if the service requires it. If mcpResourceUrl is also supplied, TGS attempts best-effort PRM discovery for resource and scopes; failure of that enrichment does not fail registration."
|
|
2006
|
+
},
|
|
2007
|
+
"resource": {
|
|
2008
|
+
"type": "string",
|
|
2009
|
+
"minLength": 1,
|
|
2010
|
+
"description": "Optional explicit OAuth resource indicator: an absolute URI without a fragment. Overrides PRM's resource value. Omit this field when mcpResourceUrl enables PRM discovery of the intended resource; otherwise supply it explicitly if the service requires a resource indicator. It is not inferred from authorization-server metadata or copied from the MCP endpoint or target URL. If neither an explicit value nor PRM supplies a resource, no resource indicator is sent. TGS sends the selected resource in authorization, token and refresh-token requests."
|
|
1977
2011
|
},
|
|
1978
2012
|
"targetUrlsShouldStartWith": {
|
|
1979
2013
|
"type": "array",
|
|
1980
|
-
"description": "
|
|
2014
|
+
"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.",
|
|
1981
2015
|
"items": { "type": "string" }
|
|
1982
2016
|
},
|
|
1983
2017
|
"applicableToApps": {
|
|
1984
2018
|
"type": "string",
|
|
1985
|
-
"description": "
|
|
2019
|
+
"description": "Applications permitted to use this configuration: AnyApp (default), or SpecificApp, which requires appId.",
|
|
1986
2020
|
"enum": ["SpecificApp", "AnyApp"]
|
|
1987
2021
|
},
|
|
1988
2022
|
"targetAudience": {
|
|
1989
2023
|
"type": "string",
|
|
1990
|
-
"description": "
|
|
2024
|
+
"description": "Tenants permitted to use this configuration: HomeTenant (default) or AnyTenant.",
|
|
1991
2025
|
"enum": ["HomeTenant", "AnyTenant"]
|
|
2026
|
+
},
|
|
2027
|
+
"includePersonalMicrosoftAccounts": {
|
|
2028
|
+
"type": "boolean",
|
|
2029
|
+
"description": "Whether to allow personal Microsoft accounts in addition to work or school accounts. If omitted when registering, only work or school accounts are allowed."
|
|
1992
2030
|
}
|
|
1993
2031
|
}
|
|
1994
2032
|
},
|
|
@@ -1999,7 +2037,7 @@
|
|
|
1999
2037
|
"required": ["configurationId"],
|
|
2000
2038
|
"properties": {
|
|
2001
2039
|
"configurationId": {
|
|
2002
|
-
"description": "Required.
|
|
2040
|
+
"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
2041
|
"$ref": "#/definitions/envVarName"
|
|
2004
2042
|
}
|
|
2005
2043
|
}
|