Skip to content

Commit 4a7518b

Browse files
authored
Merge branch 'mg/OPS-3127-2' into mg/OPS-3127
2 parents a770d80 + 403ad4f commit 4a7518b

6 files changed

Lines changed: 37 additions & 9 deletions

File tree

packages/server/api/src/app/app-connection/app-connection.controller.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ const UpsertAppConnectionRequest = {
171171

172172
const PatchAppConnectionRequest = {
173173
config: {
174-
allowedPrincipals: [PrincipalType.USER],
174+
allowedPrincipals: [PrincipalType.USER, PrincipalType.MCP],
175175
permission: Permission.WRITE_APP_CONNECTION,
176176
},
177177
schema: {
@@ -189,7 +189,11 @@ const PatchAppConnectionRequest = {
189189

190190
const ListAppConnectionsRequest = {
191191
config: {
192-
allowedPrincipals: [PrincipalType.USER, PrincipalType.SERVICE],
192+
allowedPrincipals: [
193+
PrincipalType.MCP,
194+
PrincipalType.USER,
195+
PrincipalType.SERVICE,
196+
],
193197
permission: Permission.READ_APP_CONNECTION,
194198
},
195199
schema: {
@@ -226,7 +230,7 @@ const DeleteAppConnectionRequest = {
226230

227231
const GetAppConnectionRequest = {
228232
config: {
229-
allowedPrincipals: [PrincipalType.USER],
233+
allowedPrincipals: [PrincipalType.USER, PrincipalType.MCP],
230234
permission: Permission.READ_APP_CONNECTION,
231235
},
232236
schema: {
@@ -253,7 +257,7 @@ const GetAppConnectionRequest = {
253257

254258
const GetConnectionMetadataRequest = {
255259
config: {
256-
allowedPrincipals: [PrincipalType.USER],
260+
allowedPrincipals: [PrincipalType.USER, PrincipalType.MCP],
257261
permission: Permission.READ_APP_CONNECTION,
258262
},
259263
schema: {

packages/server/api/src/app/blocks/base-block-module.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,9 @@ const ListCategoriesRequest = {
230230
};
231231

232232
const OptionsBlockRequest = {
233+
config: {
234+
allowedPrincipals: ALL_PRINCIPAL_TYPES,
235+
},
233236
schema: {
234237
operationId: 'Execute Block Properties',
235238
description:

packages/server/api/src/app/file/file.controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export const fileController: FastifyPluginAsyncTypebox = async (app) => {
1919

2020
const GetFileRequest = {
2121
config: {
22-
allowedPrincipals: [PrincipalType.USER],
22+
allowedPrincipals: [PrincipalType.USER, PrincipalType.MCP],
2323
},
2424
schema: {
2525
operationId: 'Get File',

packages/server/api/src/app/flows/flow-run/flow-run-controller.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ const FlowRunFilteredWithNoSteps = Type.Omit(FlowRun, [
140140

141141
const ListRequest = {
142142
config: {
143-
allowedPrincipals: [PrincipalType.USER, PrincipalType.SERVICE],
143+
allowedPrincipals: [
144+
PrincipalType.MCP,
145+
PrincipalType.USER,
146+
PrincipalType.SERVICE,
147+
],
144148
},
145149
schema: {
146150
operationId: 'List Flow Runs',
@@ -157,7 +161,11 @@ const ListRequest = {
157161

158162
const GetRequest = {
159163
config: {
160-
allowedPrincipals: [PrincipalType.SERVICE, PrincipalType.USER],
164+
allowedPrincipals: [
165+
PrincipalType.SERVICE,
166+
PrincipalType.USER,
167+
PrincipalType.MCP,
168+
],
161169
},
162170
schema: {
163171
operationId: 'Get Flow Run Details',
@@ -190,6 +198,7 @@ const ResumeFlowRunRequest = {
190198

191199
const RetryFlowRequest = {
192200
config: {
201+
allowedPrincipals: [PrincipalType.USER, PrincipalType.MCP],
193202
permission: Permission.RETRY_RUN,
194203
},
195204
schema: {

packages/server/api/src/app/flows/flow/flow-version.controller.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,11 @@ export const flowVersionController: FastifyPluginAsyncTypebox = async (
242242

243243
const GetLatestVersionsByConnectionRequestOptions = {
244244
config: {
245-
allowedPrincipals: [PrincipalType.USER, PrincipalType.SERVICE],
245+
allowedPrincipals: [
246+
PrincipalType.MCP,
247+
PrincipalType.USER,
248+
PrincipalType.SERVICE,
249+
],
246250
permission: Permission.READ_FLOW,
247251
},
248252
schema: {

packages/server/api/src/app/flows/flow/flow.controller.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ const UpdateFlowRequestOptions = {
361361
const ListFlowsRequestOptions = {
362362
config: {
363363
allowedPrincipals: [
364+
PrincipalType.MCP,
364365
PrincipalType.USER,
365366
PrincipalType.SERVICE,
366367
PrincipalType.WORKER,
@@ -381,6 +382,9 @@ const ListFlowsRequestOptions = {
381382
};
382383

383384
const CountFlowsRequestOptions = {
385+
config: {
386+
allowedPrincipals: [PrincipalType.MCP, PrincipalType.USER],
387+
},
384388
schema: {
385389
operationId: 'Get Flow Count',
386390
description:
@@ -419,7 +423,11 @@ const GetFlowTemplateRequestOptions = {
419423

420424
const GetFlowRequestOptions = {
421425
config: {
422-
allowedPrincipals: [PrincipalType.USER, PrincipalType.SERVICE],
426+
allowedPrincipals: [
427+
PrincipalType.MCP,
428+
PrincipalType.USER,
429+
PrincipalType.SERVICE,
430+
],
423431
permission: Permission.READ_FLOW,
424432
},
425433
schema: {

0 commit comments

Comments
 (0)