n8n 1.122.4 → 2.0.0-rc.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/bin/n8n +1 -1
- package/dist/abstract-server.js +2 -2
- package/dist/abstract-server.js.map +1 -1
- package/dist/active-workflow-manager.d.ts +4 -9
- package/dist/active-workflow-manager.js +2 -2
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/binary-data/database.manager.d.ts +26 -0
- package/dist/binary-data/database.manager.js +153 -0
- package/dist/binary-data/database.manager.js.map +1 -0
- package/dist/build.tsbuildinfo +1 -1
- package/dist/command-registry.d.ts +1 -0
- package/dist/command-registry.js +38 -5
- package/dist/command-registry.js.map +1 -1
- package/dist/commands/base-command.d.ts +0 -1
- package/dist/commands/base-command.js +22 -29
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/publish/workflow.d.ts +20 -0
- package/dist/commands/publish/workflow.js +58 -0
- package/dist/commands/publish/workflow.js.map +1 -0
- package/dist/commands/start.js +1 -19
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/unpublish/workflow.d.ts +17 -0
- package/dist/commands/unpublish/workflow.js +60 -0
- package/dist/commands/unpublish/workflow.js.map +1 -0
- package/dist/commands/update/workflow.js +31 -9
- package/dist/commands/update/workflow.js.map +1 -1
- package/dist/commands/worker.js +0 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.js +0 -32
- package/dist/config/index.js.map +1 -1
- package/dist/controllers/ai.controller.js +2 -1
- package/dist/controllers/ai.controller.js.map +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.js +1 -1
- package/dist/controllers/oauth/abstract-oauth.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.d.ts +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +19 -7
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.d.ts +14 -0
- package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.js +18 -0
- package/dist/controllers/oauth/oauth2-dynamic-client-registration.schema.js.map +1 -0
- package/dist/controllers/posthog.controller.d.ts +1 -0
- package/dist/controllers/posthog.controller.js +13 -0
- package/dist/controllers/posthog.controller.js.map +1 -1
- package/dist/controllers/users.controller.js +1 -1
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +4 -1
- package/dist/credentials/credentials.service.js +16 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.d.ts +4 -3
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +26 -6
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +2 -2
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.js +12 -3
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +7 -3
- package/dist/events/relays/telemetry.event-relay.d.ts +1 -0
- package/dist/events/relays/telemetry.event-relay.js +10 -3
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/executions/execution-data.service.js +4 -1
- package/dist/executions/execution-data.service.js.map +1 -1
- package/dist/executions/execution-recovery.service.d.ts +13 -3
- package/dist/executions/execution-recovery.service.js +68 -2
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/legacy-sqlite-execution-recovery.service.js.map +1 -1
- package/dist/load-nodes-and-credentials.d.ts +4 -2
- package/dist/load-nodes-and-credentials.js +98 -2
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/manual-execution.service.js +4 -4
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/modules/breaking-changes/rules/index.d.ts +1 -1
- package/dist/modules/breaking-changes/rules/v2/{cli-activate-all-workflows.rule.js → cli-replace-update-workflow-command.rule.js} +6 -6
- package/dist/modules/breaking-changes/rules/v2/cli-replace-update-workflow-command.rule.js.map +1 -0
- package/dist/modules/breaking-changes/rules/v2/index.d.ts +1 -1
- package/dist/modules/breaking-changes/rules/v2/index.js +4 -2
- package/dist/modules/breaking-changes/rules/v2/index.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v2/wait-node-subworkflow.rule.d.ts +2 -1
- package/dist/modules/breaking-changes/rules/v2/wait-node-subworkflow.rule.js +7 -4
- package/dist/modules/breaking-changes/rules/v2/wait-node-subworkflow.rule.js.map +1 -1
- package/dist/modules/breaking-changes/rules/v2/workflow-hooks-deprecated.rule.d.ts +6 -0
- package/dist/modules/breaking-changes/rules/v2/workflow-hooks-deprecated.rule.js +57 -0
- package/dist/modules/breaking-changes/rules/v2/workflow-hooks-deprecated.rule.js.map +1 -0
- package/dist/modules/chat-hub/chat-hub-agent.service.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js +1 -1
- package/dist/modules/chat-hub/chat-hub-agent.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-credentials.service.d.ts +19 -9
- package/dist/modules/chat-hub/chat-hub-credentials.service.js +41 -12
- package/dist/modules/chat-hub/chat-hub-credentials.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-session.entity.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +2 -0
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.js +5 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.constants.d.ts +1 -1
- package/dist/modules/chat-hub/chat-hub.constants.js +1 -1
- package/dist/modules/chat-hub/chat-hub.service.d.ts +15 -19
- package/dist/modules/chat-hub/chat-hub.service.js +74 -81
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +1 -0
- package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
- package/dist/modules/chat-hub/chat-message.repository.d.ts +3 -2
- package/dist/modules/chat-hub/chat-message.repository.js +6 -1
- package/dist/modules/chat-hub/chat-message.repository.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.js +11 -10
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.utils.d.ts +2 -2
- package/dist/modules/mcp/mcp.utils.js +2 -2
- package/dist/modules/mcp/mcp.utils.js.map +1 -1
- package/dist/modules/mcp/tools/execute-workflow.tool.js +5 -5
- package/dist/modules/mcp/tools/execute-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js +6 -6
- package/dist/modules/mcp/tools/get-workflow-details.tool.js.map +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js +8 -5
- package/dist/modules/mcp/tools/search-workflows.tool.js.map +1 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.d.ts +3 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.js +5 -2
- package/dist/modules/provisioning.ee/provisioning.service.ee.js.map +1 -1
- package/dist/public-api/types.d.ts +9 -1
- package/dist/public-api/v1/handlers/workflows/workflows.handler.d.ts +3 -0
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js +50 -82
- package/dist/public-api/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/workflows/workflows.service.d.ts +0 -4
- package/dist/public-api/v1/handlers/workflows/workflows.service.js +0 -29
- package/dist/public-api/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +110 -1
- package/dist/scaling/scaling.service.js +1 -1
- package/dist/scaling/scaling.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +30 -4
- package/dist/services/frontend.service.js +15 -14
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/import.service.d.ts +3 -2
- package/dist/services/import.service.js +10 -2
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/user.service.d.ts +1 -1
- package/dist/services/user.service.js +4 -6
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/workflow-statistics.service.js +8 -6
- package/dist/services/workflow-statistics.service.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.d.ts +9 -0
- package/dist/task-runners/task-managers/task-requester.js +8 -0
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/dist/task-runners/task-runner-module.js +9 -0
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/task-runners/task-runner-process-py.d.ts +2 -0
- package/dist/task-runners/task-runner-process-py.js +23 -16
- package/dist/task-runners/task-runner-process-py.js.map +1 -1
- package/dist/user-management/email/templates/workflow-deactivated.handlebars +196 -0
- package/dist/user-management/email/user-management-mailer.d.ts +5 -1
- package/dist/user-management/email/user-management-mailer.js +15 -0
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/utils/handlebars.util.d.ts +1 -0
- package/dist/utils/handlebars.util.js +28 -0
- package/dist/utils/handlebars.util.js.map +1 -0
- package/dist/webhooks/test-webhook-registrations.service.js.map +1 -1
- package/dist/webhooks/test-webhooks.d.ts +3 -3
- package/dist/webhooks/test-webhooks.js +8 -2
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.d.ts +4 -4
- package/dist/webhooks/webhook-helpers.js +4 -2
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/workflow-execute-additional-data.js +1 -0
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.js +20 -0
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +7 -8
- package/dist/workflows/workflow-execution.service.js +112 -103
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow-history/workflow-history.service.d.ts +3 -1
- package/dist/workflows/workflow-history/workflow-history.service.js +5 -1
- package/dist/workflows/workflow-history/workflow-history.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +17 -7
- package/dist/workflows/workflow.service.d.ts +14 -6
- package/dist/workflows/workflow.service.ee.d.ts +4 -2
- package/dist/workflows/workflow.service.ee.js +20 -9
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +104 -77
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +2 -4
- package/dist/workflows/workflows.controller.js +24 -9
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +22 -22
- package/templates/form-trigger.handlebars +29 -6
- package/dist/modules/breaking-changes/rules/v2/cli-activate-all-workflows.rule.js.map +0 -1
- /package/dist/modules/breaking-changes/rules/v2/{cli-activate-all-workflows.rule.d.ts → cli-replace-update-workflow-command.rule.d.ts} +0 -0
|
@@ -55,9 +55,7 @@ let McpSettingsController = class McpSettingsController {
|
|
|
55
55
|
return await this.mcpServerApiKeyService.rotateMcpServerApiKey(req.user);
|
|
56
56
|
}
|
|
57
57
|
async toggleWorkflowMCPAccess(req, _res, workflowId, dto) {
|
|
58
|
-
const workflow = await this.workflowFinderService.findWorkflowForUser(workflowId, req.user, [
|
|
59
|
-
'workflow:update',
|
|
60
|
-
]);
|
|
58
|
+
const workflow = await this.workflowFinderService.findWorkflowForUser(workflowId, req.user, ['workflow:update'], { includeActiveVersion: true });
|
|
61
59
|
if (!workflow) {
|
|
62
60
|
this.logger.warn('User attempted to update MCP availability without permissions', {
|
|
63
61
|
workflowId,
|
|
@@ -65,12 +63,15 @@ let McpSettingsController = class McpSettingsController {
|
|
|
65
63
|
});
|
|
66
64
|
throw new not_found_error_1.NotFoundError('Could not load the workflow - you can only access workflows available to you');
|
|
67
65
|
}
|
|
68
|
-
if (
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
66
|
+
if (dto.availableInMCP) {
|
|
67
|
+
if (!workflow.activeVersionId) {
|
|
68
|
+
throw new bad_request_error_1.BadRequestError('MCP access can only be set for active workflows');
|
|
69
|
+
}
|
|
70
|
+
const nodes = workflow.activeVersion?.nodes ?? [];
|
|
71
|
+
const supportedTrigger = (0, mcp_utils_1.findMcpSupportedTrigger)(nodes);
|
|
72
|
+
if (!supportedTrigger) {
|
|
73
|
+
throw new bad_request_error_1.BadRequestError(`MCP access can only be set for active workflows with one of the following trigger nodes: ${Object.values(mcp_constants_1.SUPPORTED_MCP_TRIGGERS).join(', ')}.`);
|
|
74
|
+
}
|
|
74
75
|
}
|
|
75
76
|
const workflowUpdate = new db_1.WorkflowEntity();
|
|
76
77
|
const currentSettings = workflow.settings ?? {};
|
|
@@ -79,7 +80,7 @@ let McpSettingsController = class McpSettingsController {
|
|
|
79
80
|
availableInMCP: dto.availableInMCP,
|
|
80
81
|
};
|
|
81
82
|
workflowUpdate.versionId = workflow.versionId;
|
|
82
|
-
const updatedWorkflow = await this.workflowService.update(req.user, workflowUpdate, workflowId
|
|
83
|
+
const updatedWorkflow = await this.workflowService.update(req.user, workflowUpdate, workflowId);
|
|
83
84
|
return {
|
|
84
85
|
id: updatedWorkflow.id,
|
|
85
86
|
settings: updatedWorkflow.settings,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.settings.controller.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.settings.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6D;AAC7D,gCAAoE;AACpE,gDASyB;AAGzB,2EAAqE;AACrE,6FAAuF;AACvF,+DAA+D;AAC/D,mDAAyD;AACzD,iEAA4D;AAC5D,2CAAsD;AAEtD,kFAA6E;AAC7E,8EAAyE;AACzE,iFAA4E;AAC5E,mEAA+D;AAGxD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACjC,YACkB,kBAAsC,EACtC,MAAc,EACd,cAA8B,EAC9B,sBAA8C,EAC9C,qBAA4C,EAC5C,eAAgC;QALhC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAIE,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACR,GAAyB;QAE/B,MAAM,OAAO,GAAG,GAAG,CAAC,gBAAgB,CAAC;QACrC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,EAAE;gBAClE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;IACtC,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAAC,GAAyB;QACpD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAC,GAAyB;QACvD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IAIK,AAAN,KAAK,CAAC,uBAAuB,CAC5B,GAAyB,EACzB,IAAc,EACO,UAAkB,EACjC,GAAkC;QAExC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"mcp.settings.controller.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.settings.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6D;AAC7D,gCAAoE;AACpE,gDASyB;AAGzB,2EAAqE;AACrE,6FAAuF;AACvF,+DAA+D;AAC/D,mDAAyD;AACzD,iEAA4D;AAC5D,2CAAsD;AAEtD,kFAA6E;AAC7E,8EAAyE;AACzE,iFAA4E;AAC5E,mEAA+D;AAGxD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACjC,YACkB,kBAAsC,EACtC,MAAc,EACd,cAA8B,EAC9B,sBAA8C,EAC9C,qBAA4C,EAC5C,eAAgC;QALhC,uBAAkB,GAAlB,kBAAkB,CAAoB;QACtC,WAAM,GAAN,MAAM,CAAQ;QACd,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,oBAAe,GAAf,eAAe,CAAiB;IAC/C,CAAC;IAIE,AAAN,KAAK,CAAC,cAAc,CACnB,IAA0B,EAC1B,IAAc,EACR,GAAyB;QAE/B,MAAM,OAAO,GAAG,GAAG,CAAC,gBAAgB,CAAC;QACrC,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gDAAgD,EAAE;gBAClE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC;IACtC,CAAC;IAIK,AAAN,KAAK,CAAC,qBAAqB,CAAC,GAAyB;QACpD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtE,CAAC;IAIK,AAAN,KAAK,CAAC,wBAAwB,CAAC,GAAyB;QACvD,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC1E,CAAC;IAIK,AAAN,KAAK,CAAC,uBAAuB,CAC5B,GAAyB,EACzB,IAAc,EACO,UAAkB,EACjC,GAAkC;QAExC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CACpE,UAAU,EACV,GAAG,CAAC,IAAI,EACR,CAAC,iBAAiB,CAAC,EACnB,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAC9B,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+DAA+D,EAAE;gBACjF,UAAU;gBACV,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;aACnB,CAAC,CAAC;YACH,MAAM,IAAI,+BAAa,CACtB,8EAA8E,CAC9E,CAAC;QACH,CAAC;QAED,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;YACxB,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;gBAC/B,MAAM,IAAI,mCAAe,CAAC,iDAAiD,CAAC,CAAC;YAC9E,CAAC;YACD,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,EAAE,KAAK,IAAI,EAAE,CAAC;YAClD,MAAM,gBAAgB,GAAG,IAAA,mCAAuB,EAAC,KAAK,CAAC,CAAC;YAExD,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACvB,MAAM,IAAI,mCAAe,CACxB,4FAA4F,MAAM,CAAC,MAAM,CAAC,sCAAsB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC/I,CAAC;YACH,CAAC;QACF,CAAC;QAED,MAAM,cAAc,GAAG,IAAI,mBAAc,EAAE,CAAC;QAC5C,MAAM,eAAe,GAAG,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC;QAChD,cAAc,CAAC,QAAQ,GAAG;YACzB,GAAG,eAAe;YAClB,cAAc,EAAE,GAAG,CAAC,cAAc;SAClC,CAAC;QACF,cAAc,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;QAE9C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,CAAC,CAAC;QAEhG,OAAO;YACN,EAAE,EAAE,eAAe,CAAC,EAAE;YACtB,QAAQ,EAAE,eAAe,CAAC,QAAQ;YAClC,SAAS,EAAE,eAAe,CAAC,SAAS;SACpC,CAAC;IACH,CAAC;CACD,CAAA;AAhGY,sDAAqB;AAY3B;IAFL,IAAA,wBAAW,EAAC,YAAY,CAAC;IACzB,IAAA,kBAAK,EAAC,WAAW,CAAC;IAIjB,WAAA,iBAAI,CAAA;;qDAAM,8CAAoB;;2DAY/B;AAIK;IAFL,IAAA,wBAAW,EAAC,kBAAkB,CAAC;IAC/B,IAAA,gBAAG,EAAC,UAAU,CAAC;;;;kEAGf;AAIK;IAFL,IAAA,wBAAW,EAAC,kBAAkB,CAAC;IAC/B,IAAA,iBAAI,EAAC,iBAAiB,CAAC;;;;qEAGvB;AAIK;IAFL,IAAA,yBAAY,EAAC,iBAAiB,CAAC;IAC/B,IAAA,kBAAK,EAAC,sCAAsC,CAAC;IAI5C,WAAA,IAAA,kBAAK,EAAC,YAAY,CAAC,CAAA;IACnB,WAAA,iBAAI,CAAA;;6DAAM,gEAA6B;;oEAgDxC;gCA/FW,qBAAqB;IADjC,IAAA,2BAAc,EAAC,MAAM,CAAC;qCAGgB,yCAAkB;QAC9B,uBAAM;QACE,+BAAc;QACN,4CAAsB;QACvB,+CAAqB;QAC3B,kCAAe;GAPtC,qBAAqB,CAgGjC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AuthenticatedRequest
|
|
1
|
+
import type { AuthenticatedRequest } from '@n8n/db';
|
|
2
2
|
import type { Request } from 'express';
|
|
3
3
|
import type { INode } from 'n8n-workflow';
|
|
4
4
|
export declare const getClientInfo: (req: Request | AuthenticatedRequest) => {
|
|
@@ -7,4 +7,4 @@ export declare const getClientInfo: (req: Request | AuthenticatedRequest) => {
|
|
|
7
7
|
} | undefined;
|
|
8
8
|
export declare const getToolName: (body: unknown) => string;
|
|
9
9
|
export declare const getToolArguments: (body: unknown) => Record<string, unknown>;
|
|
10
|
-
export declare const findMcpSupportedTrigger: (
|
|
10
|
+
export declare const findMcpSupportedTrigger: (nodes: INode[]) => INode | undefined;
|
|
@@ -35,9 +35,9 @@ const getToolArguments = (body) => {
|
|
|
35
35
|
return {};
|
|
36
36
|
};
|
|
37
37
|
exports.getToolArguments = getToolArguments;
|
|
38
|
-
const findMcpSupportedTrigger = (
|
|
38
|
+
const findMcpSupportedTrigger = (nodes) => {
|
|
39
39
|
const triggerNodeTypes = Object.keys(mcp_constants_1.SUPPORTED_MCP_TRIGGERS);
|
|
40
|
-
return
|
|
40
|
+
return nodes.find((node) => triggerNodeTypes.includes(node.type) && !node.disabled);
|
|
41
41
|
};
|
|
42
42
|
exports.findMcpSupportedTrigger = findMcpSupportedTrigger;
|
|
43
43
|
//# sourceMappingURL=mcp.utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp.utils.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.utils.ts"],"names":[],"mappings":";;;AAIA,mDAAyD;AACzD,qDAA8D;AAEvD,MAAM,aAAa,GAAG,CAAC,GAAmC,EAAE,EAAE;IACpE,IAAI,UAA2D,CAAC;IAChE,IAAI,IAAA,iCAAgB,EAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QAC/D,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IACzC,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB;AAOK,MAAM,WAAW,GAAG,CAAC,IAAa,EAAU,EAAE;IACpD,IAAI,CAAC,IAAA,iCAAgB,EAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAEnC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;IAC7B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAVW,QAAA,WAAW,eAUtB;AAOK,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAA2B,EAAE;IAC1E,IAAI,CAAC,IAAA,iCAAgB,EAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,IAAI,IAAA,yBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAUK,MAAM,uBAAuB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"mcp.utils.js","sourceRoot":"","sources":["../../../src/modules/mcp/mcp.utils.ts"],"names":[],"mappings":";;;AAIA,mDAAyD;AACzD,qDAA8D;AAEvD,MAAM,aAAa,GAAG,CAAC,GAAmC,EAAE,EAAE;IACpE,IAAI,UAA2D,CAAC;IAChE,IAAI,IAAA,iCAAgB,EAAC,GAAG,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC;QAC/D,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IACzC,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB;AAOK,MAAM,WAAW,GAAG,CAAC,IAAa,EAAU,EAAE;IACpD,IAAI,CAAC,IAAA,iCAAgB,EAAC,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC9C,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAEnC,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;IAC7B,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,SAAS,CAAC;AAClB,CAAC,CAAC;AAVW,QAAA,WAAW,eAUtB;AAOK,MAAM,gBAAgB,GAAG,CAAC,IAAa,EAA2B,EAAE;IAC1E,IAAI,CAAC,IAAA,iCAAgB,EAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAE5B,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,IAAI,IAAA,yBAAQ,EAAC,IAAI,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC;IACb,CAAC;IAED,OAAO,EAAE,CAAC;AACX,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAUK,MAAM,uBAAuB,GAAG,CAAC,KAAc,EAAqB,EAAE;IAC5E,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,sCAAsB,CAAC,CAAC;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;AACrF,CAAC,CAAC;AAHW,QAAA,uBAAuB,2BAGlC"}
|
|
@@ -113,22 +113,22 @@ const createExecuteWorkflowTool = (user, workflowFinderService, activeExecutions
|
|
|
113
113
|
});
|
|
114
114
|
exports.createExecuteWorkflowTool = createExecuteWorkflowTool;
|
|
115
115
|
const executeWorkflow = async (user, workflowFinderService, activeExecutions, workflowRunner, workflowId, inputs) => {
|
|
116
|
-
const workflow = await workflowFinderService.findWorkflowForUser(workflowId, user, [
|
|
117
|
-
'workflow:execute',
|
|
118
|
-
]);
|
|
116
|
+
const workflow = await workflowFinderService.findWorkflowForUser(workflowId, user, ['workflow:execute'], { includeActiveVersion: true });
|
|
119
117
|
if (!workflow || workflow.isArchived) {
|
|
120
118
|
throw new n8n_workflow_1.UserError('Workflow not found');
|
|
121
119
|
}
|
|
122
120
|
if (!workflow.settings?.availableInMCP) {
|
|
123
121
|
throw new n8n_workflow_1.UserError('Workflow is not available for execution via MCP. Enable access in the workflow settings to make it available.');
|
|
124
122
|
}
|
|
125
|
-
const
|
|
123
|
+
const nodes = workflow.activeVersion?.nodes ?? [];
|
|
124
|
+
const connections = workflow.activeVersion?.connections ?? {};
|
|
125
|
+
const triggerNode = (0, mcp_utils_1.findMcpSupportedTrigger)(nodes);
|
|
126
126
|
if (!triggerNode) {
|
|
127
127
|
throw new n8n_workflow_1.UserError(`Only workflows with the following trigger nodes can be executed: ${Object.values(mcp_constants_1.SUPPORTED_MCP_TRIGGERS).join(', ')}.`);
|
|
128
128
|
}
|
|
129
129
|
const runData = {
|
|
130
130
|
executionMode: getExecutionModeForTrigger(triggerNode),
|
|
131
|
-
workflowData: workflow,
|
|
131
|
+
workflowData: { ...workflow, nodes, connections },
|
|
132
132
|
userId: user.id,
|
|
133
133
|
};
|
|
134
134
|
runData.startNodes = [{ name: triggerNode.name, sourceData: null }];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-workflow.tool.js","sourceRoot":"","sources":["../../../../src/modules/mcp/tools/execute-workflow.tool.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsC;AAEtC,sEAAqC;AACrC,+CAgBsB;AACtB,8CAAoB;AAEpB,oDAAsF;AACtF,8CAAyD;AAMzD,4CAAuD;AAOvD,MAAM,6BAA6B,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAEtE,MAAM,WAAW,GAAG,aAAC,CAAC,MAAM,CAAC;IAC5B,UAAU,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,mCAAmC,CAAC;IACpE,MAAM,EAAE,aAAC;SACP,kBAAkB,CAAC,MAAM,EAAE;QAC3B,aAAC,CAAC,MAAM,CAAC;YACR,IAAI,EAAE,aAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YACvB,SAAS,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,gCAAgC,CAAC;SAChE,CAAC;QACF,aAAC,CAAC,MAAM,CAAC;YACR,IAAI,EAAE,aAAC,CAAC,OAAO,CAAC,MAAM,CAAC;YACvB,QAAQ,EAAE,aAAC,CAAC,MAAM,CAAC,aAAC,CAAC,OAAO,EAAE,CAAC,CAAC,QAAQ,CAAC,qCAAqC,CAAC;SAC/E,CAAC;QACF,aAAC,CAAC,MAAM,CAAC;YACR,IAAI,EAAE,aAAC,CAAC,OAAO,CAAC,SAAS,CAAC;YAC1B,WAAW,EAAE,aAAC;iBACZ,MAAM,CAAC;gBACP,MAAM,EAAE,aAAC;qBACP,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;qBAClE,QAAQ,EAAE;qBACV,OAAO,CAAC,KAAK,CAAC;qBACd,QAAQ,CAAC,+BAA+B,CAAC;gBAC3C,KAAK,EAAE,aAAC,CAAC,MAAM,CAAC,aAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,yBAAyB,CAAC;gBAC1E,IAAI,EAAE,aAAC;qBACL,MAAM,CAAC,aAAC,CAAC,OAAO,EAAE,CAAC;qBACnB,QAAQ,EAAE;qBACV,QAAQ,CAAC,0CAA0C,CAAC;gBACtD,OAAO,EAAE,aAAC;qBACR,MAAM,CAAC,aAAC,CAAC,MAAM,EAAE,CAAC;qBAClB,QAAQ,EAAE;qBACV,QAAQ,CAAC,kDAAkD,CAAC;aAC9D,CAAC;iBACD,QAAQ,CAAC,wCAAwC,CAAC;SACpD,CAAC;KACF,CAAC;SACD,QAAQ,EAAE;SACV,QAAQ,CAAC,oCAAoC,CAAC;CAChD,CAAC,CAAC;AASH,MAAM,YAAY,GAAG;IACpB,OAAO,EAAE,aAAC,CAAC,OAAO,EAAE;IACpB,WAAW,EAAE,aAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE;IAC7C,MAAM,EAAE,aAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gCAAgC,CAAC;IACzE,KAAK,EAAE,aAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;CACL,CAAC;AAEnB,MAAM,yBAAyB,GAAG,CACxC,IAAU,EACV,qBAA4C,EAC5C,gBAAkC,EAClC,cAA8B,EAC9B,SAAoB,EACuB,EAAE,CAAC,CAAC;IAC/C,IAAI,EAAE,kBAAkB;IACxB,MAAM,EAAE;QACP,WAAW,EACV,qKAAqK;QACtK,WAAW,EAAE,WAAW,CAAC,KAAK;QAC9B,YAAY;QACZ,WAAW,EAAE;YACZ,KAAK,EAAE,kBAAkB;YACzB,YAAY,EAAE,KAAK;YACnB,eAAe,EAAE,IAAI;YACrB,cAAc,EAAE,IAAI;YACpB,aAAa,EAAE,IAAI;SACnB;KACD;IACD,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE;QACzC,MAAM,gBAAgB,GAAkC;YACvD,OAAO,EAAE,IAAI,CAAC,EAAE;YAChB,SAAS,EAAE,kBAAkB;YAC7B,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE;SAC5D,CAAC;QACF,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAe,EACnC,IAAI,EACJ,qBAAqB,EACrB,gBAAgB,EAChB,cAAc,EACd,UAAU,EACV,MAAM,CACN,CAAC;YAEF,gBAAgB,CAAC,OAAO,GAAG;gBAC1B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,IAAI,EAAE;oBACL,WAAW,EAAE,MAAM,CAAC,WAAW;iBAC/B;aACD,CAAC;YACF,SAAS,CAAC,KAAK,CAAC,0CAA0B,EAAE,gBAAgB,CAAC,CAAC;YAE9D,OAAO;gBACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,4BAAa,EAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,iBAAiB,EAAE,MAAM;aACzB,CAAC;QACH,CAAC;QAAC,OAAO,EAAE,EAAE,CAAC;YACb,MAAM,KAAK,GAAG,IAAA,0BAAW,EAAC,EAAE,CAAC,CAAC;YAC9B,MAAM,SAAS,GAAG,KAAK,YAAY,qCAAwB,CAAC;YAC5D,MAAM,MAAM,GAA0B;gBACrC,OAAO,EAAE,KAAK;gBACd,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;gBACjD,KAAK,EAAE,SAAS;oBACf,CAAC,CAAC,sCAAsC,6BAA6B,GAAG,gBAAI,CAAC,YAAY,CAAC,SAAS,UAAU;oBAC7G,CAAC,CAAC,KAAK,CAAC,OAAO;aAChB,CAAC;YAEF,gBAAgB,CAAC,OAAO,GAAG;gBAC1B,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,8BAA8B,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO;aACjE,CAAC;YACF,SAAS,CAAC,KAAK,CAAC,0CAA0B,EAAE,gBAAgB,CAAC,CAAC;YAE9D,OAAO;gBACN,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAA,4BAAa,EAAC,MAAM,CAAC,EAAE,CAAC;gBACxD,iBAAiB,EAAE,MAAM;aACzB,CAAC;QACH,CAAC;IACF,CAAC;CACD,CAAC,CAAC;AAxEU,QAAA,yBAAyB,6BAwEnC;AAQI,MAAM,eAAe,GAAG,KAAK,EACnC,IAAU,EACV,qBAA4C,EAC5C,gBAAkC,EAClC,cAA8B,EAC9B,UAAkB,EAClB,MAA8C,EACb,EAAE;IACnC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"execute-workflow.tool.js","sourceRoot":"","sources":["../../../../src/modules/mcp/tools/execute-workflow.tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,14 +66,14 @@ const createWorkflowDetailsTool = (user, baseWebhookUrl, workflowFinderService,
|
|
|
66
66
|
};
|
|
67
67
|
exports.createWorkflowDetailsTool = createWorkflowDetailsTool;
|
|
68
68
|
async function getWorkflowDetails(user, baseWebhookUrl, workflowFinderService, credentialsService, endpoints, { workflowId }) {
|
|
69
|
-
const workflow = await workflowFinderService.findWorkflowForUser(workflowId, user, [
|
|
70
|
-
'workflow:read',
|
|
71
|
-
]);
|
|
69
|
+
const workflow = await workflowFinderService.findWorkflowForUser(workflowId, user, ['workflow:read'], { includeActiveVersion: true });
|
|
72
70
|
if (!workflow || workflow.isArchived || !workflow.settings?.availableInMCP) {
|
|
73
71
|
throw new n8n_workflow_1.UserError('Workflow not found');
|
|
74
72
|
}
|
|
73
|
+
const nodes = workflow.activeVersion?.nodes ?? [];
|
|
74
|
+
const connections = workflow.activeVersion?.connections ?? {};
|
|
75
75
|
const supportedTriggers = Object.keys(mcp_constants_1.SUPPORTED_MCP_TRIGGERS);
|
|
76
|
-
const triggers =
|
|
76
|
+
const triggers = nodes.filter((node) => supportedTriggers.includes(node.type) && node.disabled !== true);
|
|
77
77
|
const triggerNotice = await (0, webhook_utils_1.getTriggerDetails)(user, triggers, baseWebhookUrl, credentialsService, endpoints);
|
|
78
78
|
const sanitizedWorkflow = {
|
|
79
79
|
id: workflow.id,
|
|
@@ -85,8 +85,8 @@ async function getWorkflowDetails(user, baseWebhookUrl, workflowFinderService, c
|
|
|
85
85
|
createdAt: workflow.createdAt.toISOString(),
|
|
86
86
|
updatedAt: workflow.updatedAt.toISOString(),
|
|
87
87
|
settings: workflow.settings ?? null,
|
|
88
|
-
connections
|
|
89
|
-
nodes:
|
|
88
|
+
connections,
|
|
89
|
+
nodes: nodes.map(({ credentials: _credentials, ...node }) => node),
|
|
90
90
|
tags: (workflow.tags ?? []).map((tag) => ({ id: tag.id, name: tag.name })),
|
|
91
91
|
meta: workflow.meta ?? null,
|
|
92
92
|
parentFolderId: workflow.parentFolder?.id ?? null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-workflow-details.tool.js","sourceRoot":"","sources":["../../../../src/modules/mcp/tools/get-workflow-details.tool.ts"],"names":[],"mappings":";;;;;;AAiGA,
|
|
1
|
+
{"version":3,"file":"get-workflow-details.tool.js","sourceRoot":"","sources":["../../../../src/modules/mcp/tools/get-workflow-details.tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,26 +114,29 @@ async function searchWorkflows(user, workflowService, { limit = MAX_RESULTS, que
|
|
|
114
114
|
},
|
|
115
115
|
select: {
|
|
116
116
|
id: true,
|
|
117
|
+
activeVersionId: true,
|
|
117
118
|
name: true,
|
|
118
119
|
description: true,
|
|
119
120
|
active: true,
|
|
120
121
|
createdAt: true,
|
|
121
122
|
updatedAt: true,
|
|
122
123
|
triggerCount: true,
|
|
123
|
-
|
|
124
|
+
activeVersion: true,
|
|
124
125
|
},
|
|
125
126
|
};
|
|
126
127
|
const { workflows, count } = await workflowService.getMany(user, options, false, false, false);
|
|
127
|
-
const formattedWorkflows = workflows.map(({ id, name, description,
|
|
128
|
+
const formattedWorkflows = workflows.map(({ id, name, description, activeVersionId, createdAt, updatedAt, triggerCount, activeVersion, }) => ({
|
|
128
129
|
id,
|
|
129
130
|
name,
|
|
130
131
|
description,
|
|
131
|
-
active,
|
|
132
|
-
activeVersionId,
|
|
132
|
+
active: activeVersionId !== null,
|
|
133
133
|
createdAt: createdAt.toISOString(),
|
|
134
134
|
updatedAt: updatedAt.toISOString(),
|
|
135
135
|
triggerCount,
|
|
136
|
-
nodes: (nodes ?? []).map((node) => ({
|
|
136
|
+
nodes: (activeVersion?.nodes ?? []).map((node) => ({
|
|
137
|
+
name: node.name,
|
|
138
|
+
type: node.type,
|
|
139
|
+
})),
|
|
137
140
|
}));
|
|
138
141
|
return { data: formattedWorkflows, count };
|
|
139
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-workflows.tool.js","sourceRoot":"","sources":["../../../../src/modules/mcp/tools/search-workflows.tool.ts"],"names":[],"mappings":";;;;;;AAkIA,
|
|
1
|
+
{"version":3,"file":"search-workflows.tool.js","sourceRoot":"","sources":["../../../../src/modules/mcp/tools/search-workflows.tool.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { EventService } from '../../events/event.service';
|
|
|
6
6
|
import { type Publisher } from '../../scaling/pubsub/publisher.service';
|
|
7
7
|
import { ProjectService } from '../../services/project.service.ee';
|
|
8
8
|
import { InstanceSettings } from 'n8n-core';
|
|
9
|
+
import { UserService } from '../../services/user.service';
|
|
9
10
|
export declare class ProvisioningService {
|
|
10
11
|
private readonly eventService;
|
|
11
12
|
private readonly globalConfig;
|
|
@@ -14,11 +15,12 @@ export declare class ProvisioningService {
|
|
|
14
15
|
private readonly projectService;
|
|
15
16
|
private readonly roleRepository;
|
|
16
17
|
private readonly userRepository;
|
|
18
|
+
private readonly userService;
|
|
17
19
|
private readonly logger;
|
|
18
20
|
private readonly publisher;
|
|
19
21
|
private readonly instanceSettings;
|
|
20
22
|
private provisioningConfig;
|
|
21
|
-
constructor(eventService: EventService, globalConfig: GlobalConfig, settingsRepository: SettingsRepository, projectRepository: ProjectRepository, projectService: ProjectService, roleRepository: RoleRepository, userRepository: UserRepository, logger: Logger, publisher: Publisher, instanceSettings: InstanceSettings);
|
|
23
|
+
constructor(eventService: EventService, globalConfig: GlobalConfig, settingsRepository: SettingsRepository, projectRepository: ProjectRepository, projectService: ProjectService, roleRepository: RoleRepository, userRepository: UserRepository, userService: UserService, logger: Logger, publisher: Publisher, instanceSettings: InstanceSettings);
|
|
22
24
|
init(): Promise<void>;
|
|
23
25
|
getConfig(): Promise<ProvisioningConfigDto>;
|
|
24
26
|
provisionInstanceRoleForUser(user: User, roleSlug: unknown): Promise<void>;
|
|
@@ -24,8 +24,9 @@ const bad_request_error_1 = require("../../errors/response-errors/bad-request.er
|
|
|
24
24
|
const zod_1 = require("zod");
|
|
25
25
|
const project_service_ee_1 = require("../../services/project.service.ee");
|
|
26
26
|
const n8n_core_1 = require("n8n-core");
|
|
27
|
+
const user_service_1 = require("../../services/user.service");
|
|
27
28
|
let ProvisioningService = class ProvisioningService {
|
|
28
|
-
constructor(eventService, globalConfig, settingsRepository, projectRepository, projectService, roleRepository, userRepository, logger, publisher, instanceSettings) {
|
|
29
|
+
constructor(eventService, globalConfig, settingsRepository, projectRepository, projectService, roleRepository, userRepository, userService, logger, publisher, instanceSettings) {
|
|
29
30
|
this.eventService = eventService;
|
|
30
31
|
this.globalConfig = globalConfig;
|
|
31
32
|
this.settingsRepository = settingsRepository;
|
|
@@ -33,6 +34,7 @@ let ProvisioningService = class ProvisioningService {
|
|
|
33
34
|
this.projectService = projectService;
|
|
34
35
|
this.roleRepository = roleRepository;
|
|
35
36
|
this.userRepository = userRepository;
|
|
37
|
+
this.userService = userService;
|
|
36
38
|
this.logger = logger;
|
|
37
39
|
this.publisher = publisher;
|
|
38
40
|
this.instanceSettings = instanceSettings;
|
|
@@ -80,7 +82,7 @@ let ProvisioningService = class ProvisioningService {
|
|
|
80
82
|
}
|
|
81
83
|
}
|
|
82
84
|
if (user.role.slug !== dbRole.slug) {
|
|
83
|
-
await this.
|
|
85
|
+
await this.userService.changeUserRole(user, { newRoleName: dbRole.slug });
|
|
84
86
|
this.eventService.emit('sso-user-instance-role-updated', {
|
|
85
87
|
userId: user.id,
|
|
86
88
|
role: dbRole.slug,
|
|
@@ -287,6 +289,7 @@ exports.ProvisioningService = ProvisioningService = __decorate([
|
|
|
287
289
|
project_service_ee_1.ProjectService,
|
|
288
290
|
db_1.RoleRepository,
|
|
289
291
|
db_1.UserRepository,
|
|
292
|
+
user_service_1.UserService,
|
|
290
293
|
backend_common_1.Logger, Function, n8n_core_1.InstanceSettings])
|
|
291
294
|
], ProvisioningService);
|
|
292
295
|
//# sourceMappingURL=provisioning.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioning.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAmF;AACnF,wDAA6C;AAC7C,wCAA2C;AAC3C,gCAQiB;AACjB,gCAAkC;AAClC,+CAAyC;AACzC,2CAA8D;AAC9D,0CAAuC;AACvC,gDAAgD;AAChD,0DAAsD;AAEtD,kFAA6E;AAC7E,6BAA+B;AAC/B,sEAA+D;AAC/D,uCAA4C;
|
|
1
|
+
{"version":3,"file":"provisioning.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,7 +76,11 @@ export declare namespace WorkflowRequest {
|
|
|
76
76
|
}, {}, WorkflowEntity, {}>;
|
|
77
77
|
type Activate = AuthenticatedRequest<{
|
|
78
78
|
id: string;
|
|
79
|
-
}, {}, {
|
|
79
|
+
}, {}, {
|
|
80
|
+
versionId?: string;
|
|
81
|
+
name?: string;
|
|
82
|
+
description?: string;
|
|
83
|
+
}, {}>;
|
|
80
84
|
type GetTags = Get;
|
|
81
85
|
type UpdateTags = AuthenticatedRequest<{
|
|
82
86
|
id: string;
|
|
@@ -86,6 +90,10 @@ export declare namespace WorkflowRequest {
|
|
|
86
90
|
}, {}, {
|
|
87
91
|
destinationProjectId: string;
|
|
88
92
|
}>;
|
|
93
|
+
type GetVersion = AuthenticatedRequest<{
|
|
94
|
+
id: string;
|
|
95
|
+
versionId: string;
|
|
96
|
+
}, {}, {}, {}>;
|
|
89
97
|
}
|
|
90
98
|
export declare namespace UserRequest {
|
|
91
99
|
type Invite = AuthenticatedRequest<{}, {}, Array<{
|
|
@@ -11,6 +11,9 @@ declare const _default: {
|
|
|
11
11
|
getWorkflow: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
|
|
12
12
|
id?: string;
|
|
13
13
|
}>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>))[];
|
|
14
|
+
getWorkflowVersion: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
|
|
15
|
+
id?: string;
|
|
16
|
+
}>, res: express.Response, next: express.NextFunction) => Promise<express.Response | void>) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>))[];
|
|
14
17
|
getWorkflows: (((req: import("../../../types").PaginatedRequest, res: express.Response, next: express.NextFunction) => express.Response | void) | ((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: express.Request, res: express.Response, next: express.NextFunction) => Promise<void>) | ((req: WorkflowRequest.GetAll, res: express.Response) => Promise<express.Response>))[];
|
|
15
18
|
updateWorkflow: (((_req: Request, _res: Response, next: express.NextFunction) => void) | ((req: import("@n8n/db").AuthenticatedRequest<{
|
|
16
19
|
id?: string;
|
|
@@ -5,7 +5,7 @@ const di_1 = require("@n8n/di");
|
|
|
5
5
|
const typeorm_1 = require("@n8n/typeorm");
|
|
6
6
|
const uuid_1 = require("uuid");
|
|
7
7
|
const zod_1 = require("zod");
|
|
8
|
-
const
|
|
8
|
+
const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
|
|
9
9
|
const event_service_1 = require("../../../../events/event.service");
|
|
10
10
|
const external_hooks_1 = require("../../../../external-hooks");
|
|
11
11
|
const workflow_helpers_1 = require("../../../../workflow-helpers");
|
|
@@ -84,6 +84,24 @@ module.exports = {
|
|
|
84
84
|
return res.json(workflow);
|
|
85
85
|
},
|
|
86
86
|
],
|
|
87
|
+
getWorkflowVersion: [
|
|
88
|
+
(0, global_middleware_1.apiKeyHasScope)('workflow:read'),
|
|
89
|
+
(0, global_middleware_1.projectScope)('workflow:read', 'workflow'),
|
|
90
|
+
async (req, res) => {
|
|
91
|
+
const { id: workflowId, versionId } = req.params;
|
|
92
|
+
try {
|
|
93
|
+
const version = await di_1.Container.get(workflow_history_service_1.WorkflowHistoryService).getVersion(req.user, workflowId, versionId, { includePublishHistory: false });
|
|
94
|
+
di_1.Container.get(event_service_1.EventService).emit('user-retrieved-workflow-version', {
|
|
95
|
+
userId: req.user.id,
|
|
96
|
+
publicApi: true,
|
|
97
|
+
});
|
|
98
|
+
return res.json(version);
|
|
99
|
+
}
|
|
100
|
+
catch (error) {
|
|
101
|
+
return res.status(404).json({ message: 'Version not found' });
|
|
102
|
+
}
|
|
103
|
+
},
|
|
104
|
+
],
|
|
87
105
|
getWorkflows: [
|
|
88
106
|
(0, global_middleware_1.apiKeyHasScope)('workflow:list'),
|
|
89
107
|
global_middleware_1.validCursor,
|
|
@@ -192,47 +210,23 @@ module.exports = {
|
|
|
192
210
|
const { id } = req.params;
|
|
193
211
|
const updateData = new db_1.WorkflowEntity();
|
|
194
212
|
Object.assign(updateData, req.body);
|
|
195
|
-
updateData.id = id;
|
|
196
|
-
updateData.versionId = (0, uuid_1.v4)();
|
|
197
|
-
const workflow = await di_1.Container.get(workflow_finder_service_1.WorkflowFinderService).findWorkflowForUser(id, req.user, ['workflow:update'], { includeActiveVersion: true });
|
|
198
|
-
if (!workflow) {
|
|
199
|
-
return res.status(404).json({ message: 'Not Found' });
|
|
200
|
-
}
|
|
201
|
-
await (0, workflow_helpers_1.replaceInvalidCredentials)(updateData);
|
|
202
|
-
(0, workflow_helpers_1.addNodeIds)(updateData);
|
|
203
|
-
const workflowManager = di_1.Container.get(active_workflow_manager_1.ActiveWorkflowManager);
|
|
204
|
-
if (workflow.activeVersionId !== null) {
|
|
205
|
-
await workflowManager.remove(id);
|
|
206
|
-
}
|
|
207
213
|
try {
|
|
208
|
-
await di_1.Container.get(
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
214
|
+
const updatedWorkflow = await di_1.Container.get(workflow_service_1.WorkflowService).update(req.user, updateData, id, {
|
|
215
|
+
forceSave: true,
|
|
216
|
+
publicApi: true,
|
|
217
|
+
publishIfActive: true,
|
|
218
|
+
});
|
|
219
|
+
return res.json(updatedWorkflow);
|
|
212
220
|
}
|
|
213
221
|
catch (error) {
|
|
222
|
+
if (error instanceof not_found_error_1.NotFoundError) {
|
|
223
|
+
return res.status(404).json({ message: 'Not Found' });
|
|
224
|
+
}
|
|
214
225
|
if (error instanceof Error) {
|
|
215
226
|
return res.status(400).json({ message: error.message });
|
|
216
227
|
}
|
|
228
|
+
throw error;
|
|
217
229
|
}
|
|
218
|
-
if (workflow.activeVersionId !== null) {
|
|
219
|
-
try {
|
|
220
|
-
await workflowManager.add(workflow.id, 'update');
|
|
221
|
-
}
|
|
222
|
-
catch (error) {
|
|
223
|
-
if (error instanceof Error) {
|
|
224
|
-
return res.status(400).json({ message: error.message });
|
|
225
|
-
}
|
|
226
|
-
}
|
|
227
|
-
}
|
|
228
|
-
const updatedWorkflow = await (0, workflows_service_1.getWorkflowById)(workflow.id);
|
|
229
|
-
await di_1.Container.get(external_hooks_1.ExternalHooks).run('workflow.afterUpdate', [updateData]);
|
|
230
|
-
di_1.Container.get(event_service_1.EventService).emit('workflow-saved', {
|
|
231
|
-
user: req.user,
|
|
232
|
-
workflow: updateData,
|
|
233
|
-
publicApi: true,
|
|
234
|
-
});
|
|
235
|
-
return res.json(updatedWorkflow);
|
|
236
230
|
},
|
|
237
231
|
],
|
|
238
232
|
activateWorkflow: [
|
|
@@ -240,39 +234,20 @@ module.exports = {
|
|
|
240
234
|
(0, global_middleware_1.projectScope)('workflow:update', 'workflow'),
|
|
241
235
|
async (req, res) => {
|
|
242
236
|
const { id } = req.params;
|
|
243
|
-
const
|
|
244
|
-
|
|
245
|
-
|
|
237
|
+
const { versionId, name, description } = req.body;
|
|
238
|
+
try {
|
|
239
|
+
const workflow = await di_1.Container.get(workflow_service_1.WorkflowService).activateWorkflow(req.user, id, { versionId, name, description }, true);
|
|
240
|
+
return res.json(workflow);
|
|
246
241
|
}
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
try {
|
|
251
|
-
const activeVersion = await (0, workflows_service_1.setWorkflowAsActive)(req.user, workflow.id, activeVersionId);
|
|
252
|
-
await di_1.Container.get(active_workflow_manager_1.ActiveWorkflowManager).add(workflow.id, 'activate');
|
|
253
|
-
workflow.active = true;
|
|
254
|
-
workflow.activeVersionId = activeVersionId;
|
|
255
|
-
workflow.activeVersion = activeVersion;
|
|
242
|
+
catch (error) {
|
|
243
|
+
if (error instanceof not_found_error_1.NotFoundError) {
|
|
244
|
+
return res.status(404).json({ message: 'Not Found' });
|
|
256
245
|
}
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
active: workflow.active,
|
|
260
|
-
activeVersion: workflow.activeVersion,
|
|
261
|
-
updatedAt: new Date(),
|
|
262
|
-
});
|
|
263
|
-
if (error instanceof Error) {
|
|
264
|
-
return res.status(400).json({ message: error.message });
|
|
265
|
-
}
|
|
246
|
+
if (error instanceof Error) {
|
|
247
|
+
return res.status(400).json({ message: error.message });
|
|
266
248
|
}
|
|
267
|
-
|
|
268
|
-
user: req.user,
|
|
269
|
-
workflowId: workflow.id,
|
|
270
|
-
workflow,
|
|
271
|
-
publicApi: true,
|
|
272
|
-
});
|
|
273
|
-
return res.json(workflow);
|
|
249
|
+
throw error;
|
|
274
250
|
}
|
|
275
|
-
return res.json(workflow);
|
|
276
251
|
},
|
|
277
252
|
],
|
|
278
253
|
deactivateWorkflow: [
|
|
@@ -280,26 +255,19 @@ module.exports = {
|
|
|
280
255
|
(0, global_middleware_1.projectScope)('workflow:update', 'workflow'),
|
|
281
256
|
async (req, res) => {
|
|
282
257
|
const { id } = req.params;
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
return res.status(404).json({ message: 'Not Found' });
|
|
286
|
-
}
|
|
287
|
-
const activeWorkflowManager = di_1.Container.get(active_workflow_manager_1.ActiveWorkflowManager);
|
|
288
|
-
if (workflow.activeVersionId) {
|
|
289
|
-
await activeWorkflowManager.remove(workflow.id);
|
|
290
|
-
await (0, workflows_service_1.setWorkflowAsInactive)(workflow.id);
|
|
291
|
-
workflow.active = false;
|
|
292
|
-
workflow.activeVersionId = null;
|
|
293
|
-
workflow.activeVersion = null;
|
|
294
|
-
di_1.Container.get(event_service_1.EventService).emit('workflow-deactivated', {
|
|
295
|
-
user: req.user,
|
|
296
|
-
workflowId: workflow.id,
|
|
297
|
-
workflow,
|
|
298
|
-
publicApi: true,
|
|
299
|
-
});
|
|
258
|
+
try {
|
|
259
|
+
const workflow = await di_1.Container.get(workflow_service_1.WorkflowService).deactivateWorkflow(req.user, id, true);
|
|
300
260
|
return res.json(workflow);
|
|
301
261
|
}
|
|
302
|
-
|
|
262
|
+
catch (error) {
|
|
263
|
+
if (error instanceof not_found_error_1.NotFoundError) {
|
|
264
|
+
return res.status(404).json({ message: 'Not Found' });
|
|
265
|
+
}
|
|
266
|
+
if (error instanceof Error) {
|
|
267
|
+
return res.status(400).json({ message: error.message });
|
|
268
|
+
}
|
|
269
|
+
throw error;
|
|
270
|
+
}
|
|
303
271
|
},
|
|
304
272
|
],
|
|
305
273
|
getWorkflowTags: [
|