n8n 2.38.0 → 2.38.2
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/dist/active-workflow-manager.d.ts +8 -8
- package/dist/active-workflow-manager.js +38 -23
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/chat/chat-execution-manager.d.ts +5 -0
- package/dist/chat/chat-execution-manager.js +50 -10
- package/dist/chat/chat-execution-manager.js.map +1 -1
- package/dist/chat/chat-service.d.ts +0 -1
- package/dist/chat/chat-service.js +12 -18
- package/dist/chat/chat-service.js.map +1 -1
- package/dist/chat/utils.d.ts +1 -0
- package/dist/chat/utils.js +14 -4
- package/dist/chat/utils.js.map +1 -1
- package/dist/controllers/invitation.controller.d.ts +1 -5
- package/dist/controllers/invitation.controller.js +3 -32
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/role.controller.d.ts +3 -1
- package/dist/controllers/role.controller.js +19 -3
- package/dist/controllers/role.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +2 -27
- package/dist/controllers/users.controller.js +6 -132
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.service.js +24 -3
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/errors/subworkflow-policy-denial.error.d.ts +4 -1
- package/dist/errors/subworkflow-policy-denial.error.js +26 -10
- package/dist/errors/subworkflow-policy-denial.error.js.map +1 -1
- package/dist/evaluation.ee/evaluation-test-run.service.d.ts +46 -0
- package/dist/evaluation.ee/evaluation-test-run.service.js +65 -0
- package/dist/evaluation.ee/evaluation-test-run.service.js.map +1 -0
- package/dist/evaluation.ee/insights/insights-context-builder.js +4 -2
- package/dist/evaluation.ee/insights/insights-context-builder.js.map +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.d.ts +1 -1
- package/dist/evaluation.ee/test-runs.controller.ee.js +5 -2
- package/dist/evaluation.ee/test-runs.controller.ee.js.map +1 -1
- package/dist/executions/execution-recovery.service.d.ts +3 -1
- package/dist/executions/execution-recovery.service.js +13 -4
- package/dist/executions/execution-recovery.service.js.map +1 -1
- package/dist/executions/pre-execution-checks/subworkflow-policy-checker.d.ts +5 -2
- package/dist/executions/pre-execution-checks/subworkflow-policy-checker.js +28 -8
- package/dist/executions/pre-execution-checks/subworkflow-policy-checker.js.map +1 -1
- package/dist/modules/agents/agent-interrupted-execution-sweeper.d.ts +5 -1
- package/dist/modules/agents/agent-interrupted-execution-sweeper.js +14 -2
- package/dist/modules/agents/agent-interrupted-execution-sweeper.js.map +1 -1
- package/dist/modules/agents/agent-runtime-reconstruction.service.d.ts +1 -0
- package/dist/modules/agents/agent-runtime-reconstruction.service.js +39 -4
- package/dist/modules/agents/agent-runtime-reconstruction.service.js.map +1 -1
- package/dist/modules/agents/agents.module.d.ts +1 -1
- package/dist/modules/agents/agents.module.js +3 -0
- package/dist/modules/agents/agents.module.js.map +1 -1
- package/dist/modules/agents/background/agent-background-job.service.d.ts +34 -0
- package/dist/modules/agents/background/agent-background-job.service.js +168 -0
- package/dist/modules/agents/background/agent-background-job.service.js.map +1 -0
- package/dist/modules/agents/background/background-job-tools.d.ts +21 -0
- package/dist/modules/agents/background/background-job-tools.js +157 -0
- package/dist/modules/agents/background/background-job-tools.js.map +1 -0
- package/dist/modules/agents/background/sub-agent-background-runner.d.ts +27 -0
- package/dist/modules/agents/background/sub-agent-background-runner.js +123 -0
- package/dist/modules/agents/background/sub-agent-background-runner.js.map +1 -0
- package/dist/modules/agents/entities/agent-background-job.entity.d.ts +18 -0
- package/dist/modules/agents/entities/agent-background-job.entity.js +78 -0
- package/dist/modules/agents/entities/agent-background-job.entity.js.map +1 -0
- package/dist/modules/agents/repositories/agent-background-job.repository.d.ts +37 -0
- package/dist/modules/agents/repositories/agent-background-job.repository.js +61 -0
- package/dist/modules/agents/repositories/agent-background-job.repository.js.map +1 -0
- package/dist/modules/agents/sub-agents/delegate-sub-agent-tool.d.ts +4 -5
- package/dist/modules/agents/sub-agents/delegate-sub-agent-tool.js +4 -14
- package/dist/modules/agents/sub-agents/delegate-sub-agent-tool.js.map +1 -1
- package/dist/modules/agents/sub-agents/format-sub-agent-tool-output.d.ts +3 -0
- package/dist/modules/agents/sub-agents/format-sub-agent-tool-output.js +14 -0
- package/dist/modules/agents/sub-agents/format-sub-agent-tool-output.js.map +1 -0
- package/dist/modules/agents/sub-agents/{sub-agent-foreground-runner.d.ts → sub-agent-runner.d.ts} +5 -5
- package/dist/modules/agents/sub-agents/{sub-agent-foreground-runner.js → sub-agent-runner.js} +8 -11
- package/dist/modules/agents/sub-agents/sub-agent-runner.js.map +1 -0
- package/dist/modules/agents/tools/workflow-tool-factory.d.ts +2 -0
- package/dist/modules/agents/tools/workflow-tool-factory.js +2 -1
- package/dist/modules/agents/tools/workflow-tool-factory.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.d.ts +3 -1
- package/dist/modules/chat-hub/chat-hub.service.js +8 -2
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/community-packages/community-packages.service.js +4 -0
- package/dist/modules/community-packages/community-packages.service.js.map +1 -1
- package/dist/modules/instance-ai/eval/execution.service.js +1 -1
- package/dist/modules/instance-ai/eval/execution.service.js.map +1 -1
- package/dist/modules/log-streaming.ee/destinations/destination-credentials-access.d.ts +4 -0
- package/dist/modules/log-streaming.ee/destinations/destination-credentials-access.js +21 -0
- package/dist/modules/log-streaming.ee/destinations/destination-credentials-access.js.map +1 -0
- package/dist/modules/log-streaming.ee/log-streaming.controller.d.ts +4 -2
- package/dist/modules/log-streaming.ee/log-streaming.controller.js +13 -4
- package/dist/modules/log-streaming.ee/log-streaming.controller.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/constants.d.ts +1 -0
- package/dist/modules/mcp/tools/workflow-builder/constants.js +2 -1
- package/dist/modules/mcp/tools/workflow-builder/constants.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js +2 -1
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/validate-workflow-code.tool.js +2 -1
- package/dist/modules/mcp/tools/workflow-builder/validate-workflow-code.tool.js.map +1 -1
- package/dist/modules/oauth-server/oauth-server.service.js +29 -0
- package/dist/modules/oauth-server/oauth-server.service.js.map +1 -1
- package/dist/modules/oauth-server/oauth-session.service.d.ts +1 -0
- package/dist/modules/oauth-server/oauth-session.service.js +5 -5
- package/dist/modules/oauth-server/oauth-session.service.js.map +1 -1
- package/dist/modules/source-control.ee/source-control.service.ee.d.ts +1 -0
- package/dist/modules/source-control.ee/source-control.service.ee.js +24 -20
- package/dist/modules/source-control.ee/source-control.service.ee.js.map +1 -1
- package/dist/modules/sso-oidc/oidc.controller.ee.js +1 -0
- package/dist/modules/sso-oidc/oidc.controller.ee.js.map +1 -1
- package/dist/modules/sso-oidc/oidc.service.ee.d.ts +1 -0
- package/dist/modules/sso-oidc/oidc.service.ee.js +7 -0
- package/dist/modules/sso-oidc/oidc.service.ee.js.map +1 -1
- package/dist/public-api/v1/handlers/evaluations/evaluations.handler.js +11 -35
- package/dist/public-api/v1/handlers/evaluations/evaluations.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/log-streaming/log-streaming.handler.js +10 -3
- package/dist/public-api/v1/handlers/log-streaming/log-streaming.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/users/users.handler.ee.d.ts +1 -1
- package/dist/public-api/v1/handlers/users/users.handler.ee.js +16 -18
- package/dist/public-api/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/public-api/v1/handlers/users/users.mapper.d.ts +12 -0
- package/dist/public-api/v1/handlers/users/users.mapper.js +27 -0
- package/dist/public-api/v1/handlers/users/users.mapper.js.map +1 -0
- package/dist/push/abstract.push.js +2 -1
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/scaling/constants.d.ts +2 -2
- package/dist/scaling/constants.js +1 -0
- package/dist/scaling/constants.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +3 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -1
- package/dist/server.d.ts +1 -0
- package/dist/server.js +25 -25
- package/dist/server.js.map +1 -1
- package/dist/services/active-workflows.service.d.ts +4 -5
- package/dist/services/active-workflows.service.js +11 -12
- package/dist/services/active-workflows.service.js.map +1 -1
- package/dist/services/credentials-tester.service.d.ts +1 -0
- package/dist/services/credentials-tester.service.js +9 -1
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +1 -0
- package/dist/services/project.service.ee.js +3 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/user.service.d.ts +41 -8
- package/dist/services/user.service.js +174 -8
- package/dist/services/user.service.js.map +1 -1
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js +1 -2
- package/dist/task-runners/task-broker/auth/task-broker-auth.service.js.map +1 -1
- package/dist/utils/request-path.d.ts +2 -0
- package/dist/utils/request-path.js +58 -0
- package/dist/utils/request-path.js.map +1 -0
- package/dist/webhooks/hitl-interaction-webhooks.d.ts +1 -0
- package/dist/webhooks/hitl-interaction-webhooks.js +5 -3
- package/dist/webhooks/hitl-interaction-webhooks.js.map +1 -1
- package/dist/webhooks/slack-interaction-webhooks.d.ts +1 -0
- package/dist/webhooks/slack-interaction-webhooks.js +4 -0
- package/dist/webhooks/slack-interaction-webhooks.js.map +1 -1
- package/dist/webhooks/telegram-interaction-webhooks.d.ts +1 -0
- package/dist/webhooks/telegram-interaction-webhooks.js +4 -0
- package/dist/webhooks/telegram-interaction-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-request-sanitizer.js +8 -0
- package/dist/webhooks/webhook-request-sanitizer.js.map +1 -1
- package/dist/webhooks/webhook-response-headers.js +11 -2
- package/dist/webhooks/webhook-response-headers.js.map +1 -1
- package/dist/workflows/publication/publication-status-reporter.d.ts +4 -4
- package/dist/workflows/publication/publication-status-reporter.js +16 -16
- package/dist/workflows/publication/publication-status-reporter.js.map +1 -1
- package/dist/workflows/workflow-push-notifier.service.d.ts +9 -0
- package/dist/workflows/workflow-push-notifier.service.js +31 -0
- package/dist/workflows/workflow-push-notifier.service.js.map +1 -0
- package/dist/workflows/workflow-sharing.service.d.ts +7 -3
- package/dist/workflows/workflow-sharing.service.js +29 -2
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/package.json +35 -35
- package/dist/modules/agents/sub-agents/sub-agent-foreground-runner.js.map +0 -1
- package/dist/public-api/v1/handlers/users/users.service.ee.d.ts +0 -21
- package/dist/public-api/v1/handlers/users/users.service.ee.js +0 -68
- package/dist/public-api/v1/handlers/users/users.service.ee.js.map +0 -1
|
@@ -3,12 +3,14 @@ const api_types_1 = require("@n8n/api-types");
|
|
|
3
3
|
const backend_network_1 = require("@n8n/backend-network");
|
|
4
4
|
const config_1 = require("@n8n/config");
|
|
5
5
|
const di_1 = require("@n8n/di");
|
|
6
|
+
const credentials_finder_service_1 = require("../../../../credentials/credentials-finder.service");
|
|
6
7
|
const bad_request_error_1 = require("../../../../errors/response-errors/bad-request.error");
|
|
7
8
|
const conflict_error_1 = require("../../../../errors/response-errors/conflict.error");
|
|
8
9
|
const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
|
|
9
10
|
const event_message_classes_1 = require("../../../../eventbus/event-message-classes");
|
|
10
11
|
const message_event_bus_1 = require("../../../../eventbus/message-event-bus/message-event-bus");
|
|
11
12
|
const create_message_event_bus_destination_1 = require("../../../../modules/log-streaming.ee/create-message-event-bus-destination");
|
|
13
|
+
const destination_credentials_access_1 = require("../../../../modules/log-streaming.ee/destinations/destination-credentials-access");
|
|
12
14
|
const log_streaming_destination_service_1 = require("../../../../modules/log-streaming.ee/log-streaming-destination.service");
|
|
13
15
|
const log_streaming_mapper_1 = require("./log-streaming.mapper");
|
|
14
16
|
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
@@ -57,7 +59,9 @@ const logStreamingHandlers = {
|
|
|
57
59
|
if (!parseResult.success) {
|
|
58
60
|
throw new bad_request_error_1.BadRequestError(parseResult.error.errors[0].message);
|
|
59
61
|
}
|
|
60
|
-
const
|
|
62
|
+
const options = (0, log_streaming_mapper_1.toInternalDestinationOptions)(parseResult.data);
|
|
63
|
+
await (0, destination_credentials_access_1.assertUserCanUseDestinationCredentials)(di_1.Container.get(credentials_finder_service_1.CredentialsFinderService), req.user, options);
|
|
64
|
+
const destination = (0, create_message_event_bus_destination_1.createMessageEventBusDestination)(di_1.Container.get(message_event_bus_1.MessageEventBus), di_1.Container.get(backend_network_1.OutboundHttp), options);
|
|
61
65
|
const result = await di_1.Container.get(log_streaming_destination_service_1.LogStreamingDestinationService).addDestination(destination);
|
|
62
66
|
return res.json((0, log_streaming_mapper_1.toPublicDestination)(result.serialize()));
|
|
63
67
|
},
|
|
@@ -72,7 +76,9 @@ const logStreamingHandlers = {
|
|
|
72
76
|
if (!parseResult.success) {
|
|
73
77
|
throw new bad_request_error_1.BadRequestError(parseResult.error.errors[0].message);
|
|
74
78
|
}
|
|
75
|
-
const
|
|
79
|
+
const options = { ...(0, log_streaming_mapper_1.toInternalDestinationOptions)(parseResult.data), id: req.params.id };
|
|
80
|
+
await (0, destination_credentials_access_1.assertUserCanUseDestinationCredentials)(di_1.Container.get(credentials_finder_service_1.CredentialsFinderService), req.user, options);
|
|
81
|
+
const destination = (0, create_message_event_bus_destination_1.createMessageEventBusDestination)(di_1.Container.get(message_event_bus_1.MessageEventBus), di_1.Container.get(backend_network_1.OutboundHttp), options);
|
|
76
82
|
const result = await di_1.Container.get(log_streaming_destination_service_1.LogStreamingDestinationService).addDestination(destination);
|
|
77
83
|
return res.json((0, log_streaming_mapper_1.toPublicDestination)(result.serialize()));
|
|
78
84
|
},
|
|
@@ -81,7 +87,8 @@ const logStreamingHandlers = {
|
|
|
81
87
|
(0, global_middleware_1.isLicensed)('feat:logStreaming'),
|
|
82
88
|
(0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'eventBusDestination:test' }),
|
|
83
89
|
async (req, res) => {
|
|
84
|
-
await findDestinationOrFail(req.params.id);
|
|
90
|
+
const destination = await findDestinationOrFail(req.params.id);
|
|
91
|
+
await (0, destination_credentials_access_1.assertUserCanUseDestinationCredentials)(di_1.Container.get(credentials_finder_service_1.CredentialsFinderService), req.user, destination);
|
|
85
92
|
let success;
|
|
86
93
|
try {
|
|
87
94
|
success = await di_1.Container.get(log_streaming_destination_service_1.LogStreamingDestinationService).testDestination(req.params.id);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log-streaming.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/log-streaming/log-streaming.handler.ts"],"names":[],"mappings":";AAAA,8CAA4D;AAC5D,0DAAoD;AACpD,wCAA2D;AAC3D,gCAAoC;AAGpC,kFAA6E;AAC7E,4EAAwE;AACxE,8EAAyE;AACzE,4EAAiE;AACjE,sFAAiF;AACjF,0HAAmH;AACnH,oHAA8G;AAE9G,iEAA2F;AAG3F,kFAGoD;AAEpD,MAAM,qBAAqB,GAAG,GAAG,EAAE;IAClC,IAAI,cAAS,CAAC,GAAG,CAAC,qCAA4B,CAAC,CAAC,wBAAwB,EAAE,CAAC;QAC1E,MAAM,IAAI,8BAAa,CACtB,yGAAyG,CACzG,CAAC;IACH,CAAC;AACF,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,KAAK,EAAE,EAAU,EAA8C,EAAE;IAC9F,MAAM,CAAC,WAAW,CAAC,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,kEAA8B,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;IAC9F,IAAI,CAAC,WAAW,EAAE,CAAC;QAClB,MAAM,IAAI,+BAAa,CAAC,sCAAsC,EAAE,sBAAsB,CAAC,CAAC;IACzF,CAAC;IACD,OAAO,WAAW,CAAC;AACpB,CAAC,CAAC;AAYF,MAAM,oBAAoB,GAAyB;IAClD,aAAa,EAAE;QACd,IAAA,8BAAU,EAAC,mBAAmB,CAAC;QAC/B,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;QAC5E,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YACnB,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,qCAAa,EAAE,CAAC,CAAC;QAC1C,CAAC;KACD;IAED,eAAe,EAAE;QAChB,IAAA,8BAAU,EAAC,mBAAmB,CAAC;QAC/B,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;QAC5E,KAAK,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE;YACnB,MAAM,YAAY,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,kEAA8B,CAAC,CAAC,eAAe,EAAE,CAAC;YAC3F,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC,0CAAmB,CAAC,EAAE,CAAC,CAAC;QAClE,CAAC;KACD;IAED,cAAc,EAAE;QACf,IAAA,8BAAU,EAAC,mBAAmB,CAAC;QAC/B,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,0BAA0B,EAAE,CAAC;QAC5E,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,WAAW,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC/D,OAAO,GAAG,CAAC,IAAI,CAAC,IAAA,0CAAmB,EAAC,WAAW,CAAC,CAAC,CAAC;QACnD,CAAC;KACD;IAED,iBAAiB,EAAE;QAClB,IAAA,8BAAU,EAAC,mBAAmB,CAAC;QAC/B,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,4BAA4B,EAAE,CAAC;QAC9E,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,qBAAqB,EAAE,CAAC;YAExB,MAAM,WAAW,GAAG,sCAA0B,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;gBAC1B,MAAM,IAAI,mCAAe,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YAChE,CAAC;YAED,MAAM,WAAW,GAAG,IAAA,uEAAgC,EACnD,cAAS,CAAC,GAAG,CAAC,mCAAe,CAAC,EAC9B,cAAS,CAAC,GAAG,CAAC,8BAAY,CAAC,EAC3B,
|
|
1
|
+
{"version":3,"file":"log-streaming.handler.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/log-streaming/log-streaming.handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { InviteUsersRequestDto, RoleChangeRequestDto } from '@n8n/api-types';
|
|
2
2
|
import { type AuthenticatedRequest } from '@n8n/db';
|
|
3
|
-
import type { UserRequest } from '../../../../requests';
|
|
4
3
|
import type { PublicAPIEndpoint } from '../../shared/handler.types';
|
|
4
|
+
import type { UserRequest } from '../../../../requests';
|
|
5
5
|
type Create = AuthenticatedRequest<{}, {}, InviteUsersRequestDto>;
|
|
6
6
|
type Delete = UserRequest.Delete;
|
|
7
7
|
type ChangeRole = AuthenticatedRequest<{
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
const api_types_1 = require("@n8n/api-types");
|
|
3
|
-
const db_1 = require("@n8n/db");
|
|
4
3
|
const di_1 = require("@n8n/di");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
4
|
+
const users_mapper_1 = require("./users.mapper");
|
|
5
|
+
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
6
|
+
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
7
7
|
const bad_request_error_1 = require("../../../../errors/response-errors/bad-request.error");
|
|
8
8
|
const not_found_error_1 = require("../../../../errors/response-errors/not-found.error");
|
|
9
9
|
const event_service_1 = require("../../../../events/event.service");
|
|
10
|
+
const project_service_ee_1 = require("../../../../services/project.service.ee");
|
|
10
11
|
const user_service_1 = require("../../../../services/user.service");
|
|
11
|
-
const users_service_ee_1 = require("./users.service.ee");
|
|
12
|
-
const global_middleware_1 = require("../../shared/middlewares/global.middleware");
|
|
13
|
-
const pagination_service_1 = require("../../shared/services/pagination.service");
|
|
14
12
|
const usersHandlers = {
|
|
15
13
|
getUser: [
|
|
16
14
|
global_middleware_1.validLicenseWithUserQuota,
|
|
@@ -18,7 +16,7 @@ const usersHandlers = {
|
|
|
18
16
|
async (req, res) => {
|
|
19
17
|
const { includeRole = false } = req.query;
|
|
20
18
|
const { id } = req.params;
|
|
21
|
-
const user = await (
|
|
19
|
+
const user = await di_1.Container.get(user_service_1.UserService).getUser(id);
|
|
22
20
|
if (!user) {
|
|
23
21
|
throw new not_found_error_1.NotFoundError(`Could not find user with id: ${id}`);
|
|
24
22
|
}
|
|
@@ -26,7 +24,7 @@ const usersHandlers = {
|
|
|
26
24
|
userId: req.user.id,
|
|
27
25
|
publicApi: true,
|
|
28
26
|
});
|
|
29
|
-
return res.json((0,
|
|
27
|
+
return res.json((0, users_mapper_1.toPublicApiUser)(user, { includeRole }));
|
|
30
28
|
},
|
|
31
29
|
],
|
|
32
30
|
getUsers: [
|
|
@@ -35,22 +33,22 @@ const usersHandlers = {
|
|
|
35
33
|
global_middleware_1.validCursor,
|
|
36
34
|
async (req, res) => {
|
|
37
35
|
const { offset = 0, limit = 100, includeRole = false, projectId } = req.query;
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
const userService = di_1.Container.get(user_service_1.UserService);
|
|
37
|
+
await userService.assertGetUsersAccess(req.user, projectId);
|
|
38
|
+
const userIdsInProject = projectId
|
|
39
|
+
? await di_1.Container.get(project_service_ee_1.ProjectService).findUserIdsByProjectId(projectId)
|
|
41
40
|
: undefined;
|
|
42
|
-
const
|
|
43
|
-
|
|
41
|
+
const { users, count } = await userService.getUsersAndCount({
|
|
42
|
+
ids: userIdsInProject,
|
|
44
43
|
limit,
|
|
45
44
|
offset,
|
|
46
|
-
in: _in,
|
|
47
45
|
});
|
|
48
46
|
di_1.Container.get(event_service_1.EventService).emit('user-retrieved-all-users', {
|
|
49
47
|
userId: req.user.id,
|
|
50
48
|
publicApi: true,
|
|
51
49
|
});
|
|
52
50
|
return res.json({
|
|
53
|
-
data: (0,
|
|
51
|
+
data: (0, users_mapper_1.toPublicApiUser)(users, { includeRole }),
|
|
54
52
|
nextCursor: (0, pagination_service_1.encodeNextCursor)({
|
|
55
53
|
offset,
|
|
56
54
|
limit,
|
|
@@ -66,14 +64,14 @@ const usersHandlers = {
|
|
|
66
64
|
if (error) {
|
|
67
65
|
throw new bad_request_error_1.BadRequestError(error.errors[0]?.message ?? 'Invalid request body');
|
|
68
66
|
}
|
|
69
|
-
const usersInvited = await di_1.Container.get(
|
|
67
|
+
const usersInvited = await di_1.Container.get(user_service_1.UserService).inviteUser(req.user, data);
|
|
70
68
|
return res.status(201).json(usersInvited);
|
|
71
69
|
},
|
|
72
70
|
],
|
|
73
71
|
deleteUser: [
|
|
74
72
|
(0, global_middleware_1.apiKeyHasScopeWithGlobalScopeFallback)({ scope: 'user:delete' }),
|
|
75
73
|
async (req, res) => {
|
|
76
|
-
await di_1.Container.get(
|
|
74
|
+
await di_1.Container.get(user_service_1.UserService).deleteUser(req.user, req.params.id, req.query.transferId);
|
|
77
75
|
return res.status(204).send();
|
|
78
76
|
},
|
|
79
77
|
],
|
|
@@ -85,7 +83,7 @@ const usersHandlers = {
|
|
|
85
83
|
if (validation.error) {
|
|
86
84
|
throw new bad_request_error_1.BadRequestError(validation.error.errors[0]?.message ?? 'Invalid request body');
|
|
87
85
|
}
|
|
88
|
-
await di_1.Container.get(
|
|
86
|
+
await di_1.Container.get(user_service_1.UserService).changeGlobalRole(req.user, req.params.id, validation.data);
|
|
89
87
|
return res.status(204).send();
|
|
90
88
|
},
|
|
91
89
|
],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.handler.ee.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/users/users.handler.ee.ts"],"names":[],"mappings":";AAAA,8CAA6E;
|
|
1
|
+
{"version":3,"file":"users.handler.ee.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/users/users.handler.ee.ts"],"names":[],"mappings":";AAAA,8CAA6E;AAE7E,gCAAoC;AAEpC,iDAAiD;AAEjD,kFAKoD;AACpD,iFAA4E;AAE5E,kFAA6E;AAC7E,8EAAyE;AACzE,0DAAsD;AAEtD,sEAA+D;AAC/D,0DAAsD;AActD,MAAM,aAAa,GAAkB;IACpC,OAAO,EAAE;QACR,6CAAyB;QACzB,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QAC7D,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAC1C,MAAM,EAAE,EAAE,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;YAE1B,MAAM,IAAI,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAE1D,IAAI,CAAC,IAAI,EAAE,CAAC;gBACX,MAAM,IAAI,+BAAa,CAAC,gCAAgC,EAAE,EAAE,CAAC,CAAC;YAC/D,CAAC;YAED,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,qBAAqB,EAAE;gBACvD,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,SAAS,EAAE,IAAI;aACf,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,IAAI,CAAC,IAAA,8BAAe,EAAC,IAAI,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACzD,CAAC;KACD;IACD,QAAQ,EAAE;QACT,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;QAC7D,6CAAyB;QACzB,+BAAW;QACX,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,EAAE,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,WAAW,GAAG,KAAK,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;YAC9E,MAAM,WAAW,GAAG,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC;YAE/C,MAAM,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;YAE5D,MAAM,gBAAgB,GAAG,SAAS;gBACjC,CAAC,CAAC,MAAM,cAAS,CAAC,GAAG,CAAC,mCAAc,CAAC,CAAC,sBAAsB,CAAC,SAAS,CAAC;gBACvE,CAAC,CAAC,SAAS,CAAC;YAEb,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,MAAM,WAAW,CAAC,gBAAgB,CAAC;gBAC3D,GAAG,EAAE,gBAAgB;gBACrB,KAAK;gBACL,MAAM;aACN,CAAC,CAAC;YAEH,cAAS,CAAC,GAAG,CAAC,4BAAY,CAAC,CAAC,IAAI,CAAC,0BAA0B,EAAE;gBAC5D,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,EAAE;gBACnB,SAAS,EAAE,IAAI;aACf,CAAC,CAAC;YAEH,OAAO,GAAG,CAAC,IAAI,CAAC;gBACf,IAAI,EAAE,IAAA,8BAAe,EAAC,KAAK,EAAE,EAAE,WAAW,EAAE,CAAC;gBAC7C,UAAU,EAAE,IAAA,qCAAgB,EAAC;oBAC5B,MAAM;oBACN,KAAK;oBACL,oBAAoB,EAAE,KAAK;iBAC3B,CAAC;aACF,CAAC,CAAC;QACJ,CAAC;KACD;IACD,UAAU,EAAE;QACX,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QAC/D,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,iCAAqB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAClE,IAAI,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,mCAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,sBAAsB,CAAC,CAAC;YAC/E,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACjF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC3C,CAAC;KACD;IACD,UAAU,EAAE;QACX,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QAC/D,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAE3F,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;IACD,UAAU,EAAE;QACX,IAAA,8BAAU,EAAC,0BAA0B,CAAC;QACtC,IAAA,yDAAqC,EAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;QACnE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YAClB,MAAM,UAAU,GAAG,gCAAoB,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5D,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM,IAAI,mCAAe,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,IAAI,sBAAsB,CAAC,CAAC;YAC1F,CAAC;YAED,MAAM,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;YAE5F,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QAC/B,CAAC;KACD;CACD,CAAC;AAEF,iBAAS,aAAa,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { User } from '@n8n/db';
|
|
2
|
+
declare const userProperties: readonly ['id', 'email', 'firstName', 'lastName', 'createdAt', 'updatedAt', 'isPending', 'mfaEnabled'];
|
|
3
|
+
type PublicApiUser = Pick<User, (typeof userProperties)[number]> & {
|
|
4
|
+
role?: string;
|
|
5
|
+
};
|
|
6
|
+
export declare function toPublicApiUser(user: User, options?: {
|
|
7
|
+
includeRole: boolean;
|
|
8
|
+
}): PublicApiUser;
|
|
9
|
+
export declare function toPublicApiUser(users: User[], options?: {
|
|
10
|
+
includeRole: boolean;
|
|
11
|
+
}): PublicApiUser[];
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.toPublicApiUser = toPublicApiUser;
|
|
7
|
+
const pick_1 = __importDefault(require("lodash/pick"));
|
|
8
|
+
const userProperties = [
|
|
9
|
+
'id',
|
|
10
|
+
'email',
|
|
11
|
+
'firstName',
|
|
12
|
+
'lastName',
|
|
13
|
+
'createdAt',
|
|
14
|
+
'updatedAt',
|
|
15
|
+
'isPending',
|
|
16
|
+
'mfaEnabled',
|
|
17
|
+
];
|
|
18
|
+
function mapToPublicApiUser(user, options) {
|
|
19
|
+
const publicApiUser = (0, pick_1.default)(user, ...userProperties);
|
|
20
|
+
return options?.includeRole ? { ...publicApiUser, role: user.role?.slug } : publicApiUser;
|
|
21
|
+
}
|
|
22
|
+
function toPublicApiUser(users, options) {
|
|
23
|
+
return Array.isArray(users)
|
|
24
|
+
? users.map((user) => mapToPublicApiUser(user, options))
|
|
25
|
+
: mapToPublicApiUser(users, options);
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=users.mapper.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.mapper.js","sourceRoot":"","sources":["../../../../../src/public-api/v1/handlers/users/users.mapper.ts"],"names":[],"mappings":";;;;;;AACA,uDAA+B;AAE/B,MAAM,cAAc,GAAG;IACtB,IAAI;IACJ,OAAO;IACP,WAAW;IACX,UAAU;IACV,WAAW;IACX,WAAW;IACX,WAAW;IACX,YAAY;CACH,CAAC;AAIX,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAkC;IACzE,MAAM,aAAa,GAAG,IAAA,cAAI,EAAC,IAAI,EAAE,GAAG,cAAc,CAAC,CAAC;IAEpD,OAAO,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;AAC3F,CAAC;AAID,yBACC,KAAoB,EACpB,OAAkC;IAElC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAC1B,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,kBAAkB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC,kBAAkB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC"}
|
|
@@ -79,7 +79,8 @@ let AbstractPush = class AbstractPush extends backend_common_1.TypedEmitter {
|
|
|
79
79
|
}
|
|
80
80
|
sendToUsers(pushMsg, userIds) {
|
|
81
81
|
const { connections } = this;
|
|
82
|
-
const
|
|
82
|
+
const userIdSet = new Set(userIds);
|
|
83
|
+
const userPushRefs = Object.keys(connections).filter((pushRef) => userIdSet.has(this.userIdByPushRef[pushRef]));
|
|
83
84
|
this.sendTo(pushMsg, userPushRefs);
|
|
84
85
|
}
|
|
85
86
|
closeAllConnections() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"abstract.push.js","sourceRoot":"","sources":["../../src/push/abstract.push.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,5 @@ export declare const COMMAND_PUBSUB_CHANNEL = "n8n.commands";
|
|
|
4
4
|
export declare const WORKER_RESPONSE_PUBSUB_CHANNEL = "n8n.worker-response";
|
|
5
5
|
export declare const MCP_RELAY_PUBSUB_CHANNEL = "n8n.mcp-relay";
|
|
6
6
|
export declare const MAX_PUBSUB_PAYLOAD_BYTES: number;
|
|
7
|
-
export declare const SELF_SEND_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
8
|
-
export declare const IMMEDIATE_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
7
|
+
export declare const SELF_SEND_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-agent-background-job" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
8
|
+
export declare const IMMEDIATE_COMMANDS: Set<"add-webhooks-triggers-and-pollers" | "agent-chat-integration-changed" | "agent-chat-leader-channel-request" | "agent-chat-leader-channel-result" | "agent-chat-subscription-changed" | "agent-config-changed" | "agent-tasks-changed" | "cancel-agent-background-job" | "cancel-collection" | "cancel-test-run" | "clear-test-webhooks" | "community-package-install" | "community-package-uninstall" | "community-package-update" | "display-workflow-activation" | "display-workflow-activation-error" | "display-workflow-deactivation" | "display-workflow-publication-status" | "get-worker-id" | "get-worker-status" | "redaction-floor-changed" | "relay-agent-execution-update" | "relay-chat-human-message" | "relay-chat-message-edit" | "relay-chat-stream-event" | "relay-execution-lifecycle-event" | "relay-instance-ai-event" | "relay-instance-ai-task-control" | "reload-external-secrets-providers" | "reload-instance-ai-settings" | "reload-license" | "reload-mcp-registry" | "reload-oidc-config" | "reload-otel-config" | "reload-overwrite-credentials" | "reload-saml-config" | "reload-source-control-config" | "reload-sso-provisioning-configuration" | "remove-triggers-and-pollers" | "restart-event-bus" | "resume-agent-workflow-tool" | "stop-execution" | "workflow-publish-wake-up">;
|
|
@@ -19,6 +19,7 @@ exports.IMMEDIATE_COMMANDS = new Set([
|
|
|
19
19
|
'relay-chat-stream-event',
|
|
20
20
|
'relay-agent-execution-update',
|
|
21
21
|
'resume-agent-workflow-tool',
|
|
22
|
+
'cancel-agent-background-job',
|
|
22
23
|
'relay-instance-ai-event',
|
|
23
24
|
'relay-instance-ai-task-control',
|
|
24
25
|
'agent-chat-subscription-changed',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAGvD,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAM3C,QAAA,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAK3C,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAE7B,0BAA0B;CAC1B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAC7B,iCAAiC;IACjC,yBAAyB;IACzB,8BAA8B;IAC9B,4BAA4B;IAC5B,yBAAyB;IACzB,gCAAgC;IAChC,iCAAiC;IACjC,gCAAgC;IAGhC,mCAAmC;IACnC,kCAAkC;IAClC,iBAAiB;IACjB,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,mCAAmC;IACnC,qCAAqC;IACrC,0BAA0B;CAC1B,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/scaling/constants.ts"],"names":[],"mappings":";;;AAEa,QAAA,UAAU,GAAG,MAAM,CAAC;AAEpB,QAAA,aAAa,GAAG,KAAK,CAAC;AAGtB,QAAA,sBAAsB,GAAG,cAAc,CAAC;AAGxC,QAAA,8BAA8B,GAAG,qBAAqB,CAAC;AAGvD,QAAA,wBAAwB,GAAG,eAAe,CAAC;AAM3C,QAAA,wBAAwB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAK3C,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAE7B,0BAA0B;CAC1B,CAAC,CAAC;AAMU,QAAA,kBAAkB,GAAG,IAAI,GAAG,CAA4B;IACpE,mCAAmC;IACnC,6BAA6B;IAC7B,iCAAiC;IACjC,yBAAyB;IACzB,8BAA8B;IAC9B,4BAA4B;IAC5B,6BAA6B;IAC7B,yBAAyB;IACzB,gCAAgC;IAChC,iCAAiC;IACjC,gCAAgC;IAGhC,mCAAmC;IACnC,kCAAkC;IAClC,iBAAiB;IACjB,gBAAgB;IAChB,6BAA6B;IAC7B,+BAA+B;IAC/B,mCAAmC;IACnC,qCAAqC;IACrC,0BAA0B;CAC1B,CAAC,CAAC"}
|
|
@@ -39,6 +39,7 @@ export declare namespace PubSub {
|
|
|
39
39
|
type RelayExecutionLifecycleEvent = ToCommand<'relay-execution-lifecycle-event'>;
|
|
40
40
|
type RelayAgentExecutionUpdate = ToCommand<'relay-agent-execution-update'>;
|
|
41
41
|
type ResumeAgentWorkflowTool = ToCommand<'resume-agent-workflow-tool'>;
|
|
42
|
+
type CancelAgentBackgroundJob = ToCommand<'cancel-agent-background-job'>;
|
|
42
43
|
type RelayChatStreamEvent = ToCommand<'relay-chat-stream-event'>;
|
|
43
44
|
type RelayInstanceAiEvent = ToCommand<'relay-instance-ai-event'>;
|
|
44
45
|
type RelayInstanceAiTaskControl = ToCommand<'relay-instance-ai-task-control'>;
|
|
@@ -60,7 +61,7 @@ export declare namespace PubSub {
|
|
|
60
61
|
type AgentTasksChanged = ToCommand<'agent-tasks-changed'>;
|
|
61
62
|
type RedactionFloorChanged = ToCommand<'redaction-floor-changed'>;
|
|
62
63
|
}
|
|
63
|
-
export type Command = Commands.ReloadLicense | Commands.RestartEventBus | Commands.ReloadExternalSecretsProviders | Commands.CommunityPackageInstall | Commands.CommunityPackageUpdate | Commands.CommunityPackageUninstall | Commands.GetWorkerId | Commands.GetWorkerStatus | Commands.StopExecution | Commands.AddWebhooksTriggersAndPollers | Commands.RemoveTriggersAndPollers | Commands.DisplayWorkflowActivation | Commands.DisplayWorkflowDeactivation | Commands.DisplayWorkflowActivationError | Commands.DisplayWorkflowPublicationStatus | Commands.WorkflowPublishWakeUp | Commands.RelayExecutionLifecycleEvent | Commands.RelayAgentExecutionUpdate | Commands.ResumeAgentWorkflowTool | Commands.RelayChatStreamEvent | Commands.RelayInstanceAiEvent | Commands.RelayInstanceAiTaskControl | Commands.RelayChatHumanMessage | Commands.RelayChatMessageEdit | Commands.ClearTestWebhooks | Commands.ReloadOIDCConfiguration | Commands.ReloadSamlConfiguration | Commands.ReloadCredentialsOverwrites | Commands.ReloadSsoProvisioningConfiguration | Commands.ReloadSourceControlConfiguration | Commands.ReloadMcpRegistry | Commands.ReloadOtelConfig | Commands.ReloadInstanceAiSettings | Commands.CancelTestRun | Commands.CancelCollection | Commands.AgentChatIntegrationChanged | Commands.AgentChatSubscriptionChanged | Commands.AgentChatLeaderChannelRequest | Commands.AgentChatLeaderChannelResult | Commands.AgentConfigChanged | Commands.AgentTasksChanged | Commands.RedactionFloorChanged;
|
|
64
|
+
export type Command = Commands.ReloadLicense | Commands.RestartEventBus | Commands.ReloadExternalSecretsProviders | Commands.CommunityPackageInstall | Commands.CommunityPackageUpdate | Commands.CommunityPackageUninstall | Commands.GetWorkerId | Commands.GetWorkerStatus | Commands.StopExecution | Commands.AddWebhooksTriggersAndPollers | Commands.RemoveTriggersAndPollers | Commands.DisplayWorkflowActivation | Commands.DisplayWorkflowDeactivation | Commands.DisplayWorkflowActivationError | Commands.DisplayWorkflowPublicationStatus | Commands.WorkflowPublishWakeUp | Commands.RelayExecutionLifecycleEvent | Commands.RelayAgentExecutionUpdate | Commands.ResumeAgentWorkflowTool | Commands.CancelAgentBackgroundJob | Commands.RelayChatStreamEvent | Commands.RelayInstanceAiEvent | Commands.RelayInstanceAiTaskControl | Commands.RelayChatHumanMessage | Commands.RelayChatMessageEdit | Commands.ClearTestWebhooks | Commands.ReloadOIDCConfiguration | Commands.ReloadSamlConfiguration | Commands.ReloadCredentialsOverwrites | Commands.ReloadSsoProvisioningConfiguration | Commands.ReloadSourceControlConfiguration | Commands.ReloadMcpRegistry | Commands.ReloadOtelConfig | Commands.ReloadInstanceAiSettings | Commands.CancelTestRun | Commands.CancelCollection | Commands.AgentChatIntegrationChanged | Commands.AgentChatSubscriptionChanged | Commands.AgentChatLeaderChannelRequest | Commands.AgentChatLeaderChannelResult | Commands.AgentConfigChanged | Commands.AgentTasksChanged | Commands.RedactionFloorChanged;
|
|
64
65
|
type _ToWorkerResponse<WorkerResponseKey extends keyof PubSubWorkerResponseMap> = {
|
|
65
66
|
senderId: string;
|
|
66
67
|
targets?: string[];
|
package/dist/server.d.ts
CHANGED
|
@@ -54,6 +54,7 @@ export declare class Server extends AbstractServer {
|
|
|
54
54
|
start(): Promise<void>;
|
|
55
55
|
private registerAdditionalControllers;
|
|
56
56
|
configure(): Promise<void>;
|
|
57
|
+
private protectTypeFiles;
|
|
57
58
|
private configureSettingsRoute;
|
|
58
59
|
private initializeWorkflowIndexing;
|
|
59
60
|
protected setupPushServer(): void;
|
package/dist/server.js
CHANGED
|
@@ -73,6 +73,7 @@ const push_1 = require("./push");
|
|
|
73
73
|
const ResponseHelper = __importStar(require("./response-helper"));
|
|
74
74
|
const content_security_policy_2 = require("./security/content-security-policy");
|
|
75
75
|
const telemetry_1 = require("./telemetry");
|
|
76
|
+
const requestPath = __importStar(require("./utils/request-path"));
|
|
76
77
|
require("./controllers/active-workflows.controller");
|
|
77
78
|
require("./controllers/annotation-tags.controller.ee");
|
|
78
79
|
require("./controllers/auth.controller");
|
|
@@ -263,20 +264,7 @@ let Server = class Server extends abstract_server_1.AbstractServer {
|
|
|
263
264
|
const maxAge = constants_1.Time.days.toMilliseconds;
|
|
264
265
|
const cacheOptions = constants_2.inE2ETests || backend_common_1.inDevelopment ? {} : { maxAge };
|
|
265
266
|
const { staticCacheDir } = di_1.Container.get(n8n_core_1.InstanceSettings);
|
|
266
|
-
|
|
267
|
-
const protectedTypeFiles = [
|
|
268
|
-
'/types/nodes.json',
|
|
269
|
-
'/types/credentials.json',
|
|
270
|
-
'/types/node-versions.json',
|
|
271
|
-
];
|
|
272
|
-
protectedTypeFiles.forEach((path) => {
|
|
273
|
-
this.app.get(path, authService.createAuthMiddleware({ allowSkipMFA: true, allowSkipPreviewAuth: true }), async (_, res) => {
|
|
274
|
-
res.setHeader('Cache-Control', 'no-cache, must-revalidate');
|
|
275
|
-
res.sendFile(path.substring(1), {
|
|
276
|
-
root: staticCacheDir,
|
|
277
|
-
});
|
|
278
|
-
});
|
|
279
|
-
});
|
|
267
|
+
this.protectTypeFiles(staticCacheDir);
|
|
280
268
|
if (frontendService) {
|
|
281
269
|
this.app.use([
|
|
282
270
|
'/icons/{@:scope/}:packageName/*path/*file.svg',
|
|
@@ -345,7 +333,7 @@ let Server = class Server extends abstract_server_1.AbstractServer {
|
|
|
345
333
|
this.endpointPresetCredentials,
|
|
346
334
|
...this.globalConfig.endpoints.additionalNonUIRoutes.split(':'),
|
|
347
335
|
].filter((u) => !!u);
|
|
348
|
-
const nonUIRoutesRegex = new RegExp(`^/(${nonUIRoutes.join('|')})
|
|
336
|
+
const nonUIRoutesRegex = new RegExp(`^/(${nonUIRoutes.join('|')})/?.*$`, 'i');
|
|
349
337
|
let indexHtmlParts;
|
|
350
338
|
const indexHtmlTemplate = async () => {
|
|
351
339
|
indexHtmlParts ??= (await (0, promises_1.readFile)((0, path_1.resolve)(staticCacheDir, 'index.html'), 'utf8')).split(constants_1.HTML_NONCE_PLACEHOLDER);
|
|
@@ -356,7 +344,7 @@ let Server = class Server extends abstract_server_1.AbstractServer {
|
|
|
356
344
|
if (method === 'GET' &&
|
|
357
345
|
(!accept || req.accepts('html') || accept.includes('*/*')) &&
|
|
358
346
|
!req.path.endsWith('.wasm') &&
|
|
359
|
-
!nonUIRoutesRegex.test(req.path)) {
|
|
347
|
+
!nonUIRoutesRegex.test(requestPath.normalize(req.path))) {
|
|
360
348
|
res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate, proxy-revalidate');
|
|
361
349
|
let template;
|
|
362
350
|
try {
|
|
@@ -375,20 +363,32 @@ let Server = class Server extends abstract_server_1.AbstractServer {
|
|
|
375
363
|
next();
|
|
376
364
|
}
|
|
377
365
|
};
|
|
378
|
-
|
|
379
|
-
if (/^\/types\/(nodes|credentials).json$/.test(res.req.url)) {
|
|
380
|
-
res.setHeader('Cache-Control', 'no-cache, must-revalidate');
|
|
381
|
-
}
|
|
382
|
-
};
|
|
383
|
-
this.app.use('/', historyApiHandler, express_1.default.static(staticCacheDir, {
|
|
384
|
-
...cacheOptions,
|
|
385
|
-
setHeaders: setCustomCacheHeader,
|
|
386
|
-
}), express_1.default.static(constants_2.EDITOR_UI_DIST_DIR, cacheOptions));
|
|
366
|
+
this.app.use('/', historyApiHandler, express_1.default.static(staticCacheDir, cacheOptions), express_1.default.static(constants_2.EDITOR_UI_DIST_DIR, cacheOptions));
|
|
387
367
|
}
|
|
388
368
|
else {
|
|
389
369
|
this.app.use('/', express_1.default.static(staticCacheDir, cacheOptions));
|
|
390
370
|
}
|
|
391
371
|
}
|
|
372
|
+
protectTypeFiles(staticCacheDir) {
|
|
373
|
+
const authMiddleware = di_1.Container.get(auth_service_1.AuthService).createAuthMiddleware({
|
|
374
|
+
allowSkipMFA: true,
|
|
375
|
+
allowSkipPreviewAuth: true,
|
|
376
|
+
});
|
|
377
|
+
const typeFiles = ['/types/nodes.json', '/types/credentials.json', '/types/node-versions.json'];
|
|
378
|
+
typeFiles.forEach((typeFile) => {
|
|
379
|
+
this.app.get(typeFile, authMiddleware, async (_, res) => {
|
|
380
|
+
res.setHeader('Cache-Control', 'no-cache, must-revalidate');
|
|
381
|
+
res.sendFile(typeFile.substring(1), { root: staticCacheDir });
|
|
382
|
+
});
|
|
383
|
+
});
|
|
384
|
+
this.app.use((req, res, next) => {
|
|
385
|
+
if (requestPath.mayReachDirectory(req.path, 'types')) {
|
|
386
|
+
res.status(401).end();
|
|
387
|
+
return;
|
|
388
|
+
}
|
|
389
|
+
next();
|
|
390
|
+
});
|
|
391
|
+
}
|
|
392
392
|
configureSettingsRoute() {
|
|
393
393
|
const { frontendService } = this;
|
|
394
394
|
const authService = di_1.Container.get(auth_service_1.AuthService);
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAAkF;AAClF,wCAA6C;AAC7C,8CAA8D;AAE9D,gCAA6C;AAC7C,kEAAyC;AACzC,sDAA8B;AAC9B,0CAA2D;AAC3D,oDAA4B;AAC5B,uCAA4C;AAC5C,+BAA+B;AAE/B,uDAAmD;AACnD,sDAAkD;AAClD,2CAAsE;AACtE,+DAA2D;AAC3D,qEAAiE;AACjE,sFAAiF;AACjF,0DAAsD;AACtD,yFAAmF;AAEnF,6EAAuE;AACvE,2CAAsE;AACtE,mFAA8F;AAC9F,uCAA0C;AAC1C,6CAAqD;AACrD,iCAA8B;AAC9B,MAAY,cAAc,8CAA0B;AACpD,gFAAoF;AAEpF,2CAAwC;AAExC,qDAAmD;AACnD,uDAAqD;AACrD,yCAAuC;AACvC,gDAA8C;AAC9C,uCAAqC;AACrC,4DAA0D;AAC1D,yDAAuD;AACvD,+CAA6C;AAC7C,uCAAqC;AACrC,+CAA6C;AAC7C,4DAA0D;AAC1D,4DAA0D;AAC1D,kDAAgD;AAChD,0CAAwC;AACxC,mDAAiD;AACjD,4CAA0C;AAC1C,yCAAuC;AACvC,yCAAuC;AACvC,gDAA8C;AAC9C,2CAAyC;AACzC,0CAAwC;AACxC,kDAAgD;AAChD,wDAAsD;AACtD,6CAA2C;AAC3C,sDAAoD;AACpD,gDAA8C;AAC9C,sCAAoC;AACpC,8CAA4C;AAC5C,oDAAkD;AAClD,wCAAsC;AACtC,mDAAiD;AACjD,wDAAsD;AACtD,gEAA8D;AAC9D,gEAA8D;AAC9D,oEAAkE;AAClE,4CAA0C;AAC1C,mEAAiE;AACjE,+CAA6C;AAC7C,0CAAwC;AAExC,oDAAgD;AAChD,mDAA+C;AAC/C,yFAAoF;AACpF,sEAAkE;AAClE,4EAAsE;AACtE,8EAAyE;AACzE,0FAAoF;AAG7E,IAAM,MAAM,GAAZ,MAAM,MAAO,SAAQ,gCAAc;IAOzC,YACkB,uBAAgD,EAChD,aAA4B,EAC5B,YAA0B,EAC1B,gBAAkC;QAEnD,KAAK,EAAE,CAAC;uCALS,uBAAuB;6BACvB,aAAa;4BACb,YAAY;gCACZ,gBAAgB;QAIjC,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;QAChC,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,sCAAsC,CAAC;IAC5F,CAAC;IAED,KAAK,CAAC,KAAK;QACV,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAC5C,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,MAAM,CAAC,gCAAgC,CAAC,CAAC;YAC3E,IAAI,CAAC,eAAe,GAAG,cAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,6CAA6C,CAAC,CAAC;YAC5D,MAAM,MAAM,CAAC,kDAAkD,CAAC,CAAC;QAClE,CAAC;QAED,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAC;QAErC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,SAAS,CAAC,QAAQ,CAAC;QAElF,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;QAEhE,IAAI,8BAAa,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;YAC5D,KAAK,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,CAAC;QACpD,CAAC;QAED,IAAI,CAAC,WAAW,EAAE,CAAC;QAEnB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC1C,CAAC;IAEO,KAAK,CAAC,6BAA6B;QAC1C,IAAI,CAAC,6BAAY,IAAI,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;YACxD,MAAM,MAAM,CAAC,mCAAmC,CAAC,CAAC;QACnD,CAAC;QAED,IAAI,sBAAU,EAAE,CAAC;YAChB,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,IAAA,6BAAmB,GAAE,EAAE,CAAC;YAC3B,MAAM,cAAS,CAAC,GAAG,CAAC,wBAAU,CAAC,CAAC,IAAI,EAAE,CAAC;YACvC,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,SAAS,EAAE,CAAC;YAC5C,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACtC,MAAM,MAAM,CAAC,kCAAkC,CAAC,CAAC;QAClD,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3C,MAAM,MAAM,CAAC,uCAAuC,CAAC,CAAC;YACtD,MAAM,MAAM,CAAC,qCAAqC,CAAC,CAAC;QACrD,CAAC;QAMD,IAAI,CAAC;YACJ,MAAM,MAAM,CAAC,wDAAwD,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oCAAqC,KAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAClF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,SAAS;QACd,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAChD,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;YACnF,cAAS,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,CAAC;QAED,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QACjC,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,gBAAgB,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,CAAC;YAC7D,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAC;YAEtE,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBACnD,cAAS,CAAC,GAAG,CAAC,qBAAS,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;YAC/E,CAAC;QACF,CAAC;QAED,MAAM,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;QAChC,IAAI,CAAC,aAAa,CAAC,0BAA0B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExD,MAAM,iBAAiB,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC;QAU3D,MAAM,QAAQ,GAAG,cAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC;QACrD,QAAQ,CAAC,QAAQ,CAAC,cAAS,CAAC,GAAG,CAAC,0CAAkB,CAAC,CAAC,CAAC;QACrD,QAAQ,CAAC,QAAQ,CAAC,cAAS,CAAC,GAAG,CAAC,wDAAyB,CAAC,CAAC,CAAC;QAG5D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAC;QAG7B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAe,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;YACzC,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAW,CAAC;YACpD,IAAI,EAAE,CAAC;QACR,CAAC,CAAC,CAAC;QAQH,MAAM,cAAc,GAAG,cAAS,CAAC,GAAG,CAAC,uBAAc,CAAC,CAAC;QACrD,IAAI,CAAC,GAAG,CAAC,GAAG,CACX,IAAA,+DAAqC,EACpC,IAAA,wDAA8B,EAC7B,cAAc,CAAC,qBAAqB,EACpC,cAAc,CAAC,+BAA+B,EAC9C,IAAI,CAAC,MAAM,CACX,CACD,CACD,CAAC;QAMF,MAAM,EAAE,UAAU,EAAE,gBAAgB,EAAE,GAAG,MAAM,IAAA,kCAAqB,EAAC,iBAAiB,CAAC,CAAC;QACxF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;QAC5B,IAAI,eAAe,EAAE,CAAC;YACrB,CAAC,MAAM,eAAe,CAAC,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,GAAG,gBAAgB,CAAC;QAClF,CAAC;QAED,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAEnC,MAAM,IAAI,GAAG,cAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC;QACjC,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QAEzC,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,0CAA0C,CAAC,CAAC;YAE1F,MAAM,oBAAoB,GAAG,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;YACjE,oBAAoB,CAAC,IAAI,EAAE,CAAC;QAC7B,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,oJAAoJ,CACpJ,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACnD,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,8BAA8B,CAAC,CAAC;YACxE,MAAM,cAAS,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,UAAU,EAAE,CAAC;QAClD,CAAC;QAED,MAAM,IAAA,0BAAgB,GAAE,CAAC;QAEzB,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;QAG3C,cAAS,CAAC,GAAG,CAAC,gCAAc,CAAC,CAAC,IAAI,EAAE,CAAC;QAGrC,cAAS,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAOhD,MAAM,UAAU,GAAG,IAAA,cAAO,EAAC,mBAAO,EAAE,qBAAqB,CAAC,CAAC;QAC3D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,YAAY,oBAAoB,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAClE,GAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAC/C,CAAC;QAEF,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAK9B,MAAM,QAAQ,GAAG,cAAS,CAAC,GAAG,CAAC,mCAAe,CAAC,CAAC;QAChD,MAAM,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC5B,cAAS,CAAC,GAAG,CAAC,kDAAsB,CAAC,CAAC,IAAI,EAAE,CAAC;QAK7C,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAExC,IAAI,IAAI,CAAC,yBAAyB,KAAK,EAAE,EAAE,CAAC;YAE3C,MAAM,2BAA2B,GAChC,cAAS,CAAC,GAAG,CAAC,8CAAqB,CAAC,CAAC,8BAA8B,EAAE,CAAC;YAEvE,IAAI,2BAA2B,EAAE,CAAC;gBACjC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,yBAAyB,EAAE,EAAE,2BAA2B,CAAC,CAAC;YACjF,CAAC;YAED,MAAM,sBAAsB,GAAG,2BAA2B,KAAK,IAAI,CAAC;YACpE,IAAI,CAAC,GAAG,CAAC,IAAI,CACZ,IAAI,IAAI,CAAC,yBAAyB,EAAE,EACpC,KAAK,EAAE,GAAoB,EAAE,GAAqB,EAAE,EAAE;gBACrD,IAAI,CAAC;oBAEJ,IAAI,CAAC,IAAI,CAAC,uBAAuB,IAAI,sBAAsB,EAAE,CAAC;wBAC7D,MAAM,IAAI,GAAG,GAAG,CAAC,IAA6B,CAAC;wBAE/C,IAAI,GAAG,CAAC,WAAW,KAAK,kBAAkB,EAAE,CAAC;4BAC5C,cAAc,CAAC,iBAAiB,CAC/B,GAAG,EACH,IAAI,KAAK,CACR,2EAA2E,CAC3E,CACD,CAAC;4BACF,OAAO;wBACR,CAAC;wBAED,MAAM,cAAS,CAAC,GAAG,CAAC,8CAAqB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;wBAErE,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC;wBAGpC,cAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;wBAE5E,cAAc,CAAC,mBAAmB,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;oBACvE,CAAC;yBAAM,CAAC;wBACP,cAAc,CAAC,iBAAiB,CAC/B,GAAG,EACH,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAC/C,CAAC;oBACH,CAAC;gBACF,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrE,cAAc,CAAC,iBAAiB,CAC/B,GAAG,EACH,IAAI,KAAK,CACR,gGAAgG,CAChG,CACD,CAAC;gBACH,CAAC;YACF,CAAC,CACD,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,gBAAI,CAAC,IAAI,CAAC,cAAc,CAAC;QACxC,MAAM,YAAY,GAAG,sBAAU,IAAI,8BAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;QACnE,MAAM,EAAE,cAAc,EAAE,GAAG,cAAS,CAAC,GAAG,CAAC,2BAAgB,CAAC,CAAC;QAG3D,MAAM,WAAW,GAAG,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC;QAC/C,MAAM,kBAAkB,GAAG;YAC1B,mBAAmB;YACnB,yBAAyB;YACzB,2BAA2B;SAC3B,CAAC;QACF,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACnC,IAAI,CAAC,GAAG,CAAC,GAAG,CACX,IAAI,EACJ,WAAW,CAAC,oBAAoB,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,EACpF,KAAK,EAAE,CAAC,EAAE,GAAqB,EAAE,EAAE;gBAClC,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,2BAA2B,CAAC,CAAC;gBAC5D,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;oBAC/B,IAAI,EAAE,cAAc;iBACpB,CAAC,CAAC;YACJ,CAAC,CACD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,eAAe,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CACX;gBACC,+CAA+C;gBAC/C,+CAA+C;aAC/C,EACD,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAElB,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBACxC,IAAI,KAAK;oBAAE,WAAW,GAAG,IAAI,KAAK,IAAI,WAAW,EAAE,CAAC;gBACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,WAAW,CAAC,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;gBACxF,IAAI,QAAQ,EAAE,CAAC;oBACd,IAAI,CAAC;wBACJ,MAAM,IAAA,iBAAQ,EAAC,QAAQ,CAAC,CAAC;wBACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;oBAC9D,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBACX,CAAC;gBACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CACD,CAAC;YAEF,MAAM,YAAY,GAA2B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC/D,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC;gBAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC;oBAC3D,IAAI;oBACJ,QAAQ;oBACR,SAAS;oBACT,OAAO;iBACP,CAAC,CAAC;gBAEH,IAAI,QAAQ,EAAE,CAAC;oBACd,IAAI,CAAC;wBACJ,MAAM,IAAA,iBAAQ,EAAC,QAAQ,CAAC,CAAC;wBACzB,OAAO,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,GAAG,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;oBACvE,CAAC;oBAAC,MAAM,CAAC,CAAA,CAAC;gBACX,CAAC;gBACD,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,uDAAuD,EAAE,YAAY,CAAC,CAAC;YAEpF,MAAM,YAAY,GACjB,IAAI,CAAC,YAAY,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3E,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,MAAM,CAAC;YAC9D,MAAM,uBAAuB,GAAG,cAAS,CAAC,GAAG,CAAC,uBAAc,CAAC,CAAC,uBAAuB,CAAC;YAGtF,MAAM,yBAAyB,GAAG,IAAA,gBAAM,EAAC;gBACxC,qBAAqB,EAAE,KAAK;gBAC5B,aAAa,EACZ,aAAa,IAAI,sBAAU,IAAI,8BAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE;gBAChF,kBAAkB,EAAE,KAAK;gBAEzB,QAAQ,EAAE,KAAK;gBAEf,UAAU,EAAE,KAAK;gBAGjB,uBAAuB,EAAE,YAAY;oBACpC,CAAC,CAAC;wBACA,MAAM,EAAE,GAAG,GAAG,gBAAI,CAAC,IAAI,CAAC,SAAS;wBACjC,iBAAiB,EAAE,KAAK;wBACxB,OAAO,EAAE,KAAK;qBACd;oBACF,CAAC,CAAC,KAAK;gBACR,uBAAuB,EAAE;oBACxB,MAAM,EAAE,uBAAuB;iBAC/B;aACD,CAAC,CAAC;YAGH,MAAM,WAAW,GAAsB;gBACtC,aAAa;gBACb,QAAQ;gBACR,QAAQ;gBACR,OAAO;gBACP,IAAI,CAAC,cAAc;gBACnB,SAAS;gBACT,KAAK;gBACL,IAAI,CAAC,YAAY;gBACjB,IAAI,CAAC,yBAAyB;gBAC9B,GAAG,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC;aAC/D,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrB,MAAM,gBAAgB,GAAG,IAAI,MAAM,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAIzE,IAAI,cAAoC,CAAC;YACzC,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;gBACpC,cAAc,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAA,cAAO,EAAC,cAAc,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,KAAK,CACvF,kCAAsB,CACtB,CAAC;gBACF,OAAO,cAAc,CAAC;YACvB,CAAC,CAAC;YAEF,MAAM,iBAAiB,GAA2B,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC1E,MAAM,EACL,MAAM,EACN,OAAO,EAAE,EAAE,MAAM,EAAE,GACnB,GAAG,GAAG,CAAC;gBAIR,IACC,MAAM,KAAK,KAAK;oBAChB,CAAC,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;oBAC1D,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;oBAC3B,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAC/B,CAAC;oBACF,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,uDAAuD,CAAC,CAAC;oBAExF,IAAI,QAAkB,CAAC;oBACvB,IAAI,CAAC;wBACJ,QAAQ,GAAG,MAAM,iBAAiB,EAAE,CAAC;oBACtC,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2BAA2B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;wBAC1D,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;wBACpB,OAAO;oBACR,CAAC;oBAID,yBAAyB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE;wBACxC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;oBAC3D,CAAC,CAAC,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACP,IAAI,EAAE,CAAC;gBACR,CAAC;YACF,CAAC,CAAC;YACF,MAAM,oBAAoB,GAAG,CAAC,GAAqB,EAAE,EAAE;gBACtD,IAAI,qCAAqC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7D,GAAG,CAAC,SAAS,CAAC,eAAe,EAAE,2BAA2B,CAAC,CAAC;gBAC7D,CAAC;YACF,CAAC,CAAC;YAEF,IAAI,CAAC,GAAG,CAAC,GAAG,CACX,GAAG,EACH,iBAAiB,EACjB,iBAAO,CAAC,MAAM,CAAC,cAAc,EAAE;gBAC9B,GAAG,YAAY;gBACf,UAAU,EAAE,oBAAoB;aAChC,CAAC,EACF,iBAAO,CAAC,MAAM,CAAC,8BAAkB,EAAE,YAAY,CAAC,CAChD,CAAC;QACH,CAAC;aAAM,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC;QACjE,CAAC;IACF,CAAC;IAEO,sBAAsB;QAC7B,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QACjC,MAAM,WAAW,GAAG,cAAS,CAAC,GAAG,CAAC,0BAAW,CAAC,CAAC;QAE/C,IAAI,eAAe,EAAE,CAAC;YAErB,IAAI,CAAC,GAAG,CAAC,GAAG,CACX,IAAI,IAAI,CAAC,YAAY,WAAW,EAChC,WAAW,CAAC,oBAAoB,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC,EACrF,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,GAAyB,EAAE,EAAE;gBACvD,OAAO,GAAG,CAAC,IAAI;oBACd,CAAC,CAAC,MAAM,eAAe,CAAC,WAAW,EAAE;oBACrC,CAAC,CAAC,MAAM,eAAe,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;YACnF,CAAC,CAAC,CACF,CAAC;QACH,CAAC;IACF,CAAC;IAEO,KAAK,CAAC,0BAA0B;QACvC,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAC5C,oDAAoD,CACpD,CAAC;QACF,cAAS,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;IAES,eAAe;QACxB,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAC3C,cAAS,CAAC,GAAG,CAAC,WAAI,CAAC,CAAC,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;QAC/D,cAAS,CAAC,GAAG,CAAC,wBAAU,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QAC7C,IAAI,cAAS,CAAC,GAAG,CAAC,+BAAc,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC3D,cAAS,CAAC,GAAG,CAAC,qCAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;QACpD,CAAC;IACF,CAAC;CACD,CAAA;;iBAjdY,MAAM;IADlB,IAAA,YAAO,GAAE;qCASkC,oDAAuB,EACjC,uBAAa,EACd,4BAAY,EACR,2BAAgB;GAXxC,MAAM,CAidlB"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
2
|
import type { User } from '@n8n/db';
|
|
3
|
-
import {
|
|
3
|
+
import { WorkflowRepository } from '@n8n/db';
|
|
4
4
|
import { ActivationErrorsService } from '../activation-errors.service';
|
|
5
|
-
import { ProjectScopeService } from '../permissions.ee/project-scope.service';
|
|
6
5
|
import { WorkflowFinderService } from '../workflows/workflow-finder.service';
|
|
6
|
+
import { WorkflowSharingService } from '../workflows/workflow-sharing.service';
|
|
7
7
|
export declare class ActiveWorkflowsService {
|
|
8
8
|
private readonly logger;
|
|
9
9
|
private readonly workflowRepository;
|
|
10
|
-
private readonly
|
|
10
|
+
private readonly workflowSharingService;
|
|
11
11
|
private readonly activationErrorsService;
|
|
12
12
|
private readonly workflowFinderService;
|
|
13
|
-
|
|
14
|
-
constructor(logger: Logger, workflowRepository: WorkflowRepository, sharedWorkflowRepository: SharedWorkflowRepository, activationErrorsService: ActivationErrorsService, workflowFinderService: WorkflowFinderService, projectScopeService: ProjectScopeService);
|
|
13
|
+
constructor(logger: Logger, workflowRepository: WorkflowRepository, workflowSharingService: WorkflowSharingService, activationErrorsService: ActivationErrorsService, workflowFinderService: WorkflowFinderService);
|
|
15
14
|
getAllActiveIdsInStorage(): Promise<string[]>;
|
|
16
15
|
getAllActiveIdsFor(user: User): Promise<string[]>;
|
|
17
16
|
getActivationError(workflowId: string, user: User): Promise<string | null>;
|
|
@@ -13,18 +13,18 @@ exports.ActiveWorkflowsService = void 0;
|
|
|
13
13
|
const backend_common_1 = require("@n8n/backend-common");
|
|
14
14
|
const db_1 = require("@n8n/db");
|
|
15
15
|
const di_1 = require("@n8n/di");
|
|
16
|
+
const permissions_1 = require("@n8n/permissions");
|
|
16
17
|
const activation_errors_service_1 = require("../activation-errors.service");
|
|
17
18
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
18
|
-
const project_scope_service_1 = require("../permissions.ee/project-scope.service");
|
|
19
19
|
const workflow_finder_service_1 = require("../workflows/workflow-finder.service");
|
|
20
|
+
const workflow_sharing_service_1 = require("../workflows/workflow-sharing.service");
|
|
20
21
|
let ActiveWorkflowsService = class ActiveWorkflowsService {
|
|
21
|
-
constructor(logger, workflowRepository,
|
|
22
|
+
constructor(logger, workflowRepository, workflowSharingService, activationErrorsService, workflowFinderService) {
|
|
22
23
|
this.logger = logger;
|
|
23
24
|
this.workflowRepository = workflowRepository;
|
|
24
|
-
this.
|
|
25
|
+
this.workflowSharingService = workflowSharingService;
|
|
25
26
|
this.activationErrorsService = activationErrorsService;
|
|
26
27
|
this.workflowFinderService = workflowFinderService;
|
|
27
|
-
this.projectScopeService = projectScopeService;
|
|
28
28
|
}
|
|
29
29
|
async getAllActiveIdsInStorage() {
|
|
30
30
|
const activationErrors = await this.activationErrorsService.getAll();
|
|
@@ -34,13 +34,12 @@ let ActiveWorkflowsService = class ActiveWorkflowsService {
|
|
|
34
34
|
async getAllActiveIdsFor(user) {
|
|
35
35
|
const activationErrors = await this.activationErrorsService.getAll();
|
|
36
36
|
const activeWorkflowIds = await this.workflowRepository.getActiveIds();
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return activeWorkflowIds.filter((workflowId) => listableWorkflowIds.has(workflowId) && !activationErrors[workflowId]);
|
|
37
|
+
const hasFullAccess = (0, permissions_1.hasGlobalScope)(user, 'workflow:read');
|
|
38
|
+
if (hasFullAccess) {
|
|
39
|
+
return activeWorkflowIds.filter((workflowId) => !activationErrors[workflowId]);
|
|
40
|
+
}
|
|
41
|
+
const accessibleWorkflowIds = new Set(await this.workflowSharingService.getSharedWorkflowIds(user, { scopes: ['workflow:read'] }));
|
|
42
|
+
return activeWorkflowIds.filter((workflowId) => accessibleWorkflowIds.has(workflowId) && !activationErrors[workflowId]);
|
|
44
43
|
}
|
|
45
44
|
async getActivationError(workflowId, user) {
|
|
46
45
|
const workflow = await this.workflowFinderService.findWorkflowForUser(workflowId, user, [
|
|
@@ -59,6 +58,6 @@ let ActiveWorkflowsService = class ActiveWorkflowsService {
|
|
|
59
58
|
exports.ActiveWorkflowsService = ActiveWorkflowsService;
|
|
60
59
|
exports.ActiveWorkflowsService = ActiveWorkflowsService = __decorate([
|
|
61
60
|
(0, di_1.Service)(),
|
|
62
|
-
__metadata("design:paramtypes", [backend_common_1.Logger, db_1.WorkflowRepository,
|
|
61
|
+
__metadata("design:paramtypes", [backend_common_1.Logger, db_1.WorkflowRepository, workflow_sharing_service_1.WorkflowSharingService, activation_errors_service_1.ActivationErrorsService, workflow_finder_service_1.WorkflowFinderService])
|
|
63
62
|
], ActiveWorkflowsService);
|
|
64
63
|
//# sourceMappingURL=active-workflows.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"active-workflows.service.js","sourceRoot":"","sources":["../../src/services/active-workflows.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAE7C,
|
|
1
|
+
{"version":3,"file":"active-workflows.service.js","sourceRoot":"","sources":["../../src/services/active-workflows.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAA6C;AAC7C,gCAAkC;AAClC,kDAAkD;AAElD,2EAAsE;AACtE,kFAA6E;AAC7E,iFAA4E;AAC5E,mFAA8E;AAGvE,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,MAAc,EACd,kBAAsC,EACtC,sBAA8C,EAC9C,uBAAgD,EAChD,qBAA4C;sBAJ5C,MAAM;kCACN,kBAAkB;sCAClB,sBAAsB;uCACtB,uBAAuB;qCACvB,qBAAqB;IACpC,CAAC;IAEJ,KAAK,CAAC,wBAAwB;QAC7B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC;QACrE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;QACvE,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAU;QAClC,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,CAAC;QACrE,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,EAAE,CAAC;QAEvE,MAAM,aAAa,GAAG,IAAA,4BAAc,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC5D,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,iBAAiB,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC,CAAC;QAChF,CAAC;QAID,MAAM,qBAAqB,GAAG,IAAI,GAAG,CACpC,MAAM,IAAI,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,eAAe,CAAC,EAAE,CAAC,CAC3F,CAAC;QACF,OAAO,iBAAiB,CAAC,MAAM,CAC9B,CAAC,UAAU,EAAE,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CACtF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,UAAkB,EAAE,IAAU;QACtD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE;YACvF,eAAe;SACf,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,8DAA8D,EAAE;gBAChF,UAAU;gBACV,MAAM,EAAE,IAAI,CAAC,EAAE;aACf,CAAC,CAAC;YAEH,MAAM,IAAI,mCAAe,CAAC,qBAAqB,UAAU,uBAAuB,CAAC,CAAC;QACnF,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC3D,CAAC;CACD,CAAA;;iCAjDY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAGiB,uBAAM,EACM,uBAAkB,EACd,iDAAsB,EACrB,mDAAuB,EACzB,+CAAqB;GANlD,sBAAsB,CAiDlC"}
|