n8n 2.26.6 → 2.27.1
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 +9 -17
- package/dist/active-workflow-manager.js +48 -159
- package/dist/active-workflow-manager.js.map +1 -1
- package/dist/binary-data/database.manager.js +2 -1
- package/dist/binary-data/database.manager.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/audit.d.ts +1 -0
- package/dist/commands/audit.js +9 -0
- package/dist/commands/audit.js.map +1 -1
- package/dist/commands/base-command.d.ts +1 -0
- package/dist/commands/base-command.js +31 -10
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/start.js +7 -3
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/worker.js +6 -3
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-queue.d.ts +1 -1
- package/dist/concurrency/concurrency-queue.js +2 -2
- package/dist/concurrency/concurrency-queue.js.map +1 -1
- package/dist/controllers/api-keys.controller.js +6 -2
- package/dist/controllers/api-keys.controller.js.map +1 -1
- package/dist/controllers/e2e.controller.js +1 -1
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +7 -0
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/security-settings.controller.d.ts +3 -3
- package/dist/controllers/security-settings.controller.js +3 -8
- package/dist/controllers/security-settings.controller.js.map +1 -1
- package/dist/credentials-helper.js +3 -0
- package/dist/credentials-helper.js.map +1 -1
- package/dist/errors/http-error-serializers.js +2 -15
- package/dist/errors/http-error-serializers.js.map +1 -1
- package/dist/errors/response-errors/bad-request.error.d.ts +1 -1
- package/dist/errors/response-errors/bad-request.error.js +2 -2
- package/dist/errors/response-errors/bad-request.error.js.map +1 -1
- package/dist/errors/response-errors/unprocessable.error.d.ts +2 -1
- package/dist/errors/response-errors/unprocessable.error.js +2 -1
- package/dist/errors/response-errors/unprocessable.error.js.map +1 -1
- package/dist/events/event.service.d.ts +1 -1
- package/dist/events/event.service.js +2 -2
- package/dist/events/event.service.js.map +1 -1
- package/dist/events/maps/execution-data.event-map.d.ts +1 -0
- package/dist/events/maps/relay.event-map.d.ts +1 -0
- package/dist/events/relays/log-streaming.event-relay.js +2 -2
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.js +3 -2
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/executions/execution-data/db-store.d.ts +3 -1
- package/dist/executions/execution-data/db-store.js +14 -0
- package/dist/executions/execution-data/db-store.js.map +1 -1
- package/dist/executions/execution-data/fs-store.d.ts +1 -1
- package/dist/executions/execution-data/fs-store.js +3 -1
- package/dist/executions/execution-data/fs-store.js.map +1 -1
- package/dist/executions/execution-data/s3-store.ee.d.ts +15 -0
- package/dist/executions/execution-data/s3-store.ee.js +115 -0
- package/dist/executions/execution-data/s3-store.ee.js.map +1 -0
- package/dist/executions/execution-data/types.d.ts +1 -1
- package/dist/executions/execution-persistence.d.ts +16 -2
- package/dist/executions/execution-persistence.js +80 -22
- package/dist/executions/execution-persistence.js.map +1 -1
- package/dist/metrics/prometheus/active-workflow-metrics.service.d.ts +12 -0
- package/dist/metrics/prometheus/active-workflow-metrics.service.js +61 -0
- package/dist/metrics/prometheus/active-workflow-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/base.d.ts +5 -0
- package/dist/metrics/{types.js → prometheus/base.js} +1 -1
- package/dist/metrics/prometheus/base.js.map +1 -0
- package/dist/metrics/prometheus/cache-metrics.service.d.ts +11 -0
- package/dist/metrics/prometheus/cache-metrics.service.js +48 -0
- package/dist/metrics/prometheus/cache-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/constant.d.ts +2 -0
- package/dist/metrics/prometheus/constant.js +18 -0
- package/dist/metrics/prometheus/constant.js.map +1 -0
- package/dist/metrics/prometheus/default-metrics.service.d.ts +8 -0
- package/dist/metrics/prometheus/default-metrics.service.js +35 -0
- package/dist/metrics/prometheus/default-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/dns-cache-metrics.service.d.ts +12 -0
- package/dist/metrics/prometheus/dns-cache-metrics.service.js +58 -0
- package/dist/metrics/prometheus/dns-cache-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/event-bus-metrics.service.d.ts +15 -0
- package/dist/metrics/prometheus/event-bus-metrics.service.js +106 -0
- package/dist/metrics/prometheus/event-bus-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/execution-data-metrics.service.d.ts +12 -0
- package/dist/metrics/prometheus/execution-data-metrics.service.js +106 -0
- package/dist/metrics/prometheus/execution-data-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/index.d.ts +1 -0
- package/dist/metrics/prometheus/index.js +6 -0
- package/dist/metrics/prometheus/index.js.map +1 -0
- package/dist/metrics/prometheus/instance-role-metrics.service.d.ts +13 -0
- package/dist/metrics/prometheus/instance-role-metrics.service.js +61 -0
- package/dist/metrics/prometheus/instance-role-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/prometheus.service.d.ts +26 -0
- package/dist/metrics/prometheus/prometheus.service.js +105 -0
- package/dist/metrics/prometheus/prometheus.service.js.map +1 -0
- package/dist/metrics/prometheus/pss-metrics.service.d.ts +9 -0
- package/dist/metrics/prometheus/pss-metrics.service.js +59 -0
- package/dist/metrics/prometheus/pss-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/queue-metrics.service.d.ts +13 -0
- package/dist/metrics/prometheus/queue-metrics.service.js +71 -0
- package/dist/metrics/prometheus/queue-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/route-metrics.service.d.ts +11 -0
- package/dist/metrics/prometheus/route-metrics.service.js +69 -0
- package/dist/metrics/prometheus/route-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/ssrf-metrics.service.d.ts +11 -0
- package/dist/metrics/prometheus/ssrf-metrics.service.js +65 -0
- package/dist/metrics/prometheus/ssrf-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/token-exchange-metrics.service.d.ts +10 -0
- package/dist/metrics/prometheus/token-exchange-metrics.service.js +91 -0
- package/dist/metrics/prometheus/token-exchange-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/version-metrics.service.d.ts +8 -0
- package/dist/metrics/prometheus/version-metrics.service.js +46 -0
- package/dist/metrics/prometheus/version-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/workflow-execution-duration-metrics.service.d.ts +10 -0
- package/dist/metrics/prometheus/workflow-execution-duration-metrics.service.js +61 -0
- package/dist/metrics/prometheus/workflow-execution-duration-metrics.service.js.map +1 -0
- package/dist/metrics/prometheus/workflow-statistics-metrics.service.d.ts +17 -0
- package/dist/metrics/prometheus/workflow-statistics-metrics.service.js +130 -0
- package/dist/metrics/prometheus/workflow-statistics-metrics.service.js.map +1 -0
- package/dist/modules/agents/agent-knowledge.service.d.ts +3 -32
- package/dist/modules/agents/agent-knowledge.service.js +7 -248
- package/dist/modules/agents/agent-knowledge.service.js.map +1 -1
- package/dist/modules/agents/agent-runtime-reconstruction.service.d.ts +1 -6
- package/dist/modules/agents/agent-runtime-reconstruction.service.js +2 -28
- package/dist/modules/agents/agent-runtime-reconstruction.service.js.map +1 -1
- package/dist/modules/agents/agents-list.controller.d.ts +9 -0
- package/dist/modules/agents/agents-list.controller.js +39 -0
- package/dist/modules/agents/agents-list.controller.js.map +1 -0
- package/dist/modules/agents/agents.controller.d.ts +6 -6
- package/dist/modules/agents/agents.controller.js +12 -19
- package/dist/modules/agents/agents.controller.js.map +1 -1
- package/dist/modules/agents/agents.module.d.ts +3 -2
- package/dist/modules/agents/agents.module.js +4 -2
- package/dist/modules/agents/agents.module.js.map +1 -1
- package/dist/modules/agents/agents.service.d.ts +10 -2
- package/dist/modules/agents/agents.service.js +119 -82
- package/dist/modules/agents/agents.service.js.map +1 -1
- package/dist/modules/agents/entities/agent-chat-subscription.entity.d.ts +10 -0
- package/dist/modules/agents/entities/{agent-file.entity.js → agent-chat-subscription.entity.js} +34 -23
- package/dist/modules/agents/entities/agent-chat-subscription.entity.js.map +1 -0
- package/dist/modules/agents/execution-recorder.js +15 -2
- package/dist/modules/agents/execution-recorder.js.map +1 -1
- package/dist/modules/agents/integrations/agent-chat-subscription-state.adapter.d.ts +43 -0
- package/dist/modules/agents/integrations/agent-chat-subscription-state.adapter.js +139 -0
- package/dist/modules/agents/integrations/agent-chat-subscription-state.adapter.js.map +1 -0
- package/dist/modules/agents/integrations/agent-chat-subscription-state.service.d.ts +26 -0
- package/dist/modules/agents/integrations/agent-chat-subscription-state.service.js +88 -0
- package/dist/modules/agents/integrations/agent-chat-subscription-state.service.js.map +1 -0
- package/dist/modules/agents/integrations/chat-integration.service.d.ts +3 -1
- package/dist/modules/agents/integrations/chat-integration.service.js +47 -18
- package/dist/modules/agents/integrations/chat-integration.service.js.map +1 -1
- package/dist/modules/agents/integrations/component-mapper.js.map +1 -1
- package/dist/modules/agents/integrations/slack-app-setup.service.js +8 -8
- package/dist/modules/agents/integrations/slack-app-setup.service.js.map +1 -1
- package/dist/modules/agents/repositories/agent-chat-subscription.repository.d.ts +15 -0
- package/dist/modules/agents/repositories/agent-chat-subscription.repository.js +51 -0
- package/dist/modules/agents/repositories/agent-chat-subscription.repository.js.map +1 -0
- package/dist/modules/agents/repositories/agent.repository.d.ts +7 -0
- package/dist/modules/agents/repositories/agent.repository.js +28 -0
- package/dist/modules/agents/repositories/agent.repository.js.map +1 -1
- package/dist/modules/data-table/data-table.repository.js +1 -1
- package/dist/modules/data-table/data-table.repository.js.map +1 -1
- package/dist/modules/data-table/utils/sql-utils.js +16 -1
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.module.js +15 -7
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.module.js.map +1 -1
- package/dist/modules/instance-ai/eval/execution.service.js +51 -32
- package/dist/modules/instance-ai/eval/execution.service.js.map +1 -1
- package/dist/modules/instance-ai/eval/mock-handler.js +77 -13
- package/dist/modules/instance-ai/eval/mock-handler.js.map +1 -1
- package/dist/modules/instance-ai/eval/mock-quirks.js +8 -1
- package/dist/modules/instance-ai/eval/mock-quirks.js.map +1 -1
- package/dist/modules/instance-ai/eval/workflow-analysis.js +2 -0
- package/dist/modules/instance-ai/eval/workflow-analysis.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.adapter.service.d.ts +5 -4
- package/dist/modules/instance-ai/instance-ai.adapter.service.js +7 -121
- package/dist/modules/instance-ai/instance-ai.adapter.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.controller.js +1 -1
- package/dist/modules/instance-ai/instance-ai.service.d.ts +5 -28
- package/dist/modules/instance-ai/instance-ai.service.js +58 -471
- package/dist/modules/instance-ai/instance-ai.service.js.map +1 -1
- package/dist/modules/instance-ai/output-redaction-config.d.ts +3 -0
- package/dist/modules/instance-ai/output-redaction-config.js +19 -0
- package/dist/modules/instance-ai/output-redaction-config.js.map +1 -0
- package/dist/modules/instance-ai/sandbox/index.d.ts +1 -0
- package/dist/modules/instance-ai/sandbox/index.js +6 -0
- package/dist/modules/instance-ai/sandbox/index.js.map +1 -0
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.d.ts +77 -0
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js +297 -0
- package/dist/modules/instance-ai/sandbox/instance-ai-sandbox.service.js.map +1 -0
- package/dist/modules/instance-ai/suspended-run-restorer.service.d.ts +62 -0
- package/dist/modules/instance-ai/suspended-run-restorer.service.js +116 -0
- package/dist/modules/instance-ai/suspended-run-restorer.service.js.map +1 -0
- package/dist/modules/instance-ai/suspended-thread-persistence.service.d.ts +51 -0
- package/dist/modules/instance-ai/suspended-thread-persistence.service.js +106 -0
- package/dist/modules/instance-ai/suspended-thread-persistence.service.js.map +1 -0
- package/dist/modules/instance-ai/web-research/fetch-and-extract.d.ts +1 -1
- package/dist/modules/mcp/mcp-api-key.service.d.ts +3 -7
- package/dist/modules/mcp/mcp-api-key.service.js +1 -22
- package/dist/modules/mcp/mcp-api-key.service.js.map +1 -1
- package/dist/modules/mcp/mcp-protected-resource.d.ts +13 -0
- package/dist/modules/mcp/mcp-protected-resource.js +39 -0
- package/dist/modules/mcp/mcp-protected-resource.js.map +1 -0
- package/dist/modules/mcp/mcp-server-middleware.service.d.ts +5 -4
- package/dist/modules/mcp/mcp-server-middleware.service.js +9 -6
- package/dist/modules/mcp/mcp-server-middleware.service.js.map +1 -1
- package/dist/modules/mcp/mcp.config.d.ts +3 -0
- package/dist/modules/mcp/mcp.config.js +28 -0
- package/dist/modules/mcp/mcp.config.js.map +1 -0
- package/dist/modules/mcp/mcp.controller.js +4 -2
- package/dist/modules/mcp/mcp.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.errors.d.ts +0 -13
- package/dist/modules/mcp/mcp.errors.js +1 -27
- package/dist/modules/mcp/mcp.errors.js.map +1 -1
- package/dist/modules/mcp/mcp.module.d.ts +0 -1
- package/dist/modules/mcp/mcp.module.js +3 -11
- package/dist/modules/mcp/mcp.module.js.map +1 -1
- package/dist/modules/mcp/mcp.service.d.ts +5 -1
- package/dist/modules/mcp/mcp.service.js +16 -2
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/mcp/mcp.types.d.ts +6 -14
- package/dist/modules/mcp/mcp.types.js.map +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js.map +1 -1
- package/dist/modules/mcp/tools/list-tags.tool.d.ts +26 -0
- package/dist/modules/mcp/tools/list-tags.tool.js +91 -0
- package/dist/modules/mcp/tools/list-tags.tool.js.map +1 -0
- package/dist/modules/mcp/tools/schemas.d.ts +7 -0
- package/dist/modules/mcp/tools/schemas.js +3 -1
- package/dist/modules/mcp/tools/schemas.js.map +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.d.ts +2 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js +14 -4
- package/dist/modules/mcp/tools/search-workflows.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/constants.d.ts +1 -1
- 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 +24 -6
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/explore-node-resources.tool.d.ts +18 -0
- package/dist/modules/mcp/tools/workflow-builder/explore-node-resources.tool.js +119 -0
- package/dist/modules/mcp/tools/workflow-builder/explore-node-resources.tool.js.map +1 -0
- package/dist/modules/mcp/tools/workflow-builder/get-workflow-node-types.tool.d.ts +2 -2
- package/dist/modules/mcp/tools/workflow-builder/get-workflow-node-types.tool.js +4 -4
- package/dist/modules/mcp/tools/workflow-builder/get-workflow-node-types.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/mcp-instructions.js +8 -6
- package/dist/modules/mcp/tools/workflow-builder/mcp-instructions.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/search-workflow-nodes.tool.js +1 -1
- package/dist/modules/mcp/tools/workflow-builder/search-workflow-nodes.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.d.ts +4 -294
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js +137 -16
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/workflow-operations.d.ts +23 -1
- package/dist/modules/mcp/tools/workflow-builder/workflow-operations.js +54 -2
- package/dist/modules/mcp/tools/workflow-builder/workflow-operations.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-validation.utils.d.ts +1 -0
- package/dist/modules/mcp/tools/workflow-validation.utils.js +1 -0
- package/dist/modules/mcp/tools/workflow-validation.utils.js.map +1 -1
- package/dist/modules/mcp-registry/node-description-transform.js +6 -0
- package/dist/modules/mcp-registry/node-description-transform.js.map +1 -1
- package/dist/modules/n8n-packages/engine/import-blocked.error.d.ts +4 -0
- package/dist/modules/n8n-packages/engine/import-blocked.error.js +14 -0
- package/dist/modules/n8n-packages/engine/import-blocked.error.js.map +1 -0
- package/dist/modules/n8n-packages/engine/import-pipeline.d.ts +9 -7
- package/dist/modules/n8n-packages/engine/import-pipeline.js +57 -113
- package/dist/modules/n8n-packages/engine/import-pipeline.js.map +1 -1
- package/dist/modules/n8n-packages/engine/n8n-package-parser.d.ts +11 -0
- package/dist/modules/n8n-packages/engine/n8n-package-parser.js +114 -0
- package/dist/modules/n8n-packages/engine/n8n-package-parser.js.map +1 -0
- package/dist/modules/n8n-packages/entities/credential/credential-importer.d.ts +4 -5
- package/dist/modules/n8n-packages/entities/credential/credential-importer.js +9 -12
- package/dist/modules/n8n-packages/entities/credential/credential-importer.js.map +1 -1
- package/dist/modules/n8n-packages/entities/credential/credential-matcher.d.ts +1 -0
- package/dist/modules/n8n-packages/entities/credential/credential-matcher.js +27 -2
- package/dist/modules/n8n-packages/entities/credential/credential-matcher.js.map +1 -1
- package/dist/modules/n8n-packages/entities/credential/credential-missing-mode.d.ts +3 -7
- package/dist/modules/n8n-packages/entities/credential/credential-missing-mode.js +6 -13
- package/dist/modules/n8n-packages/entities/credential/credential-missing-mode.js.map +1 -1
- package/dist/modules/n8n-packages/entities/credential/credential.types.d.ts +3 -10
- package/dist/modules/n8n-packages/entities/credential/credential.types.js +0 -4
- package/dist/modules/n8n-packages/entities/credential/credential.types.js.map +1 -1
- package/dist/modules/n8n-packages/entities/credential/id-based-credential-matcher.js +11 -6
- package/dist/modules/n8n-packages/entities/credential/id-based-credential-matcher.js.map +1 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.d.ts +4 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.js +12 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.js.map +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-id-policy.d.ts +2 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-id-policy.js +12 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-id-policy.js.map +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-import-match.service.d.ts +15 -2
- package/dist/modules/n8n-packages/entities/workflow/workflow-import-match.service.js +18 -2
- package/dist/modules/n8n-packages/entities/workflow/workflow-import-match.service.js.map +1 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-import.types.d.ts +47 -0
- package/dist/modules/n8n-packages/entities/workflow/{workflow-conflict-policy.types.js → workflow-import.types.js} +1 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-import.types.js.map +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-importer.d.ts +14 -6
- package/dist/modules/n8n-packages/entities/workflow/workflow-importer.js +136 -19
- package/dist/modules/n8n-packages/entities/workflow/workflow-importer.js.map +1 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.d.ts +16 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.js +87 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publisher.js.map +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.d.ts +2 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.js +28 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.js.map +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.types.d.ts +14 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.types.js +10 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow-publishing-policy.types.js.map +1 -0
- package/dist/modules/n8n-packages/entities/workflow/workflow.serializer.js +1 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow.serializer.js.map +1 -1
- package/dist/modules/n8n-packages/io/tar/tar-package-reader.d.ts +10 -3
- package/dist/modules/n8n-packages/io/tar/tar-package-reader.js +103 -20
- package/dist/modules/n8n-packages/io/tar/tar-package-reader.js.map +1 -1
- package/dist/modules/n8n-packages/n8n-packages.config.d.ts +6 -0
- package/dist/modules/n8n-packages/n8n-packages.config.js +43 -0
- package/dist/modules/n8n-packages/n8n-packages.config.js.map +1 -0
- package/dist/modules/n8n-packages/n8n-packages.controller.js +0 -1
- package/dist/modules/n8n-packages/n8n-packages.controller.js.map +1 -1
- package/dist/modules/n8n-packages/n8n-packages.module.js +0 -2
- package/dist/modules/n8n-packages/n8n-packages.module.js.map +1 -1
- package/dist/modules/n8n-packages/n8n-packages.types.d.ts +41 -7
- package/dist/modules/n8n-packages/n8n-packages.types.js +7 -1
- package/dist/modules/n8n-packages/n8n-packages.types.js.map +1 -1
- package/dist/modules/n8n-packages/spec/serialized/workflow.schema.d.ts +3 -3
- package/dist/modules/n8n-packages/spec/serialized/workflow.schema.js +1 -1
- package/dist/modules/n8n-packages/spec/serialized/workflow.schema.js.map +1 -1
- package/dist/modules/n8n-packages/utils/import-package-upload.js +2 -2
- package/dist/modules/n8n-packages/utils/import-package-upload.js.map +1 -1
- package/dist/modules/oauth-server/database/entities/oauth-access-token.entity.js.map +1 -0
- package/dist/modules/oauth-server/database/entities/oauth-authorization-code.entity.js.map +1 -0
- package/dist/modules/oauth-server/database/entities/oauth-client.entity.js.map +1 -0
- package/dist/modules/oauth-server/database/entities/oauth-refresh-token.entity.js.map +1 -0
- package/dist/modules/oauth-server/database/entities/oauth-user-consent.entity.js.map +1 -0
- package/dist/modules/oauth-server/database/repositories/oauth-access-token.repository.js.map +1 -0
- package/dist/modules/oauth-server/database/repositories/oauth-authorization-code.repository.js.map +1 -0
- package/dist/modules/oauth-server/database/repositories/oauth-client.repository.js.map +1 -0
- package/dist/modules/oauth-server/database/repositories/oauth-refresh-token.repository.js.map +1 -0
- package/dist/modules/oauth-server/database/repositories/oauth-user-consent.repository.js.map +1 -0
- package/dist/modules/oauth-server/dto/approve-consent-request.dto.js.map +1 -0
- package/dist/modules/{mcp/mcp-oauth-authorization-code.service.d.ts → oauth-server/oauth-authorization-code.service.d.ts} +1 -1
- package/dist/modules/{mcp/mcp-oauth-authorization-code.service.js → oauth-server/oauth-authorization-code.service.js} +12 -12
- package/dist/modules/oauth-server/oauth-authorization-code.service.js.map +1 -0
- package/dist/modules/{mcp/mcp.oauth-clients.controller.d.ts → oauth-server/oauth-clients.controller.d.ts} +4 -4
- package/dist/modules/{mcp/mcp.oauth-clients.controller.js → oauth-server/oauth-clients.controller.js} +16 -16
- package/dist/modules/oauth-server/oauth-clients.controller.js.map +1 -0
- package/dist/modules/{mcp/mcp.auth.consent.controller.d.ts → oauth-server/oauth-consent.controller.d.ts} +3 -3
- package/dist/modules/{mcp/mcp.auth.consent.controller.js → oauth-server/oauth-consent.controller.js} +16 -10
- package/dist/modules/oauth-server/oauth-consent.controller.js.map +1 -0
- package/dist/modules/{mcp/mcp-oauth-consent.service.d.ts → oauth-server/oauth-consent.service.d.ts} +16 -7
- package/dist/modules/{mcp/mcp-oauth-consent.service.js → oauth-server/oauth-consent.service.js} +28 -12
- package/dist/modules/oauth-server/oauth-consent.service.js.map +1 -0
- package/dist/modules/oauth-server/oauth-server.config.d.ts +7 -0
- package/dist/modules/oauth-server/oauth-server.config.js +49 -0
- package/dist/modules/oauth-server/oauth-server.config.js.map +1 -0
- package/dist/modules/oauth-server/oauth-server.module.d.ts +5 -0
- package/dist/modules/oauth-server/oauth-server.module.js +75 -0
- package/dist/modules/oauth-server/oauth-server.module.js.map +1 -0
- package/dist/modules/{mcp/mcp-oauth-service.d.ts → oauth-server/oauth-server.service.d.ts} +6 -6
- package/dist/modules/{mcp/mcp-oauth-service.js → oauth-server/oauth-server.service.js} +33 -30
- package/dist/modules/oauth-server/oauth-server.service.js.map +1 -0
- package/dist/modules/oauth-server/oauth-session.service.js.map +1 -0
- package/dist/modules/{mcp/mcp-oauth-token.service.d.ts → oauth-server/oauth-token.service.d.ts} +5 -8
- package/dist/modules/{mcp/mcp-oauth-token.service.js → oauth-server/oauth-token.service.js} +29 -30
- package/dist/modules/oauth-server/oauth-token.service.js.map +1 -0
- package/dist/modules/{mcp/mcp.oauth.controller.d.ts → oauth-server/oauth.controller.d.ts} +5 -3
- package/dist/modules/{mcp/mcp.oauth.controller.js → oauth-server/oauth.controller.js} +86 -72
- package/dist/modules/oauth-server/oauth.controller.js.map +1 -0
- package/dist/modules/oauth-server/oauth.errors.d.ts +13 -0
- package/dist/modules/oauth-server/oauth.errors.js +30 -0
- package/dist/modules/oauth-server/oauth.errors.js.map +1 -0
- package/dist/modules/{mcp/mcp-oauth.helpers.d.ts → oauth-server/oauth.helpers.d.ts} +1 -1
- package/dist/modules/{mcp/mcp-oauth.helpers.js → oauth-server/oauth.helpers.js} +4 -4
- package/dist/modules/oauth-server/oauth.helpers.js.map +1 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/utils.d.ts +4 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/utils.js +41 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/utils.js.map +1 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/workflow-mcp-test-trigger-resource.resolver.d.ts +28 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/workflow-mcp-test-trigger-resource.resolver.js +78 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/workflow-mcp-test-trigger-resource.resolver.js.map +1 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/workflow-mcp-trigger-resource.resolver.d.ts +30 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/workflow-mcp-trigger-resource.resolver.js +95 -0
- package/dist/modules/oauth-server/protected-resource-resolvers/workflow-mcp-trigger-resource.resolver.js.map +1 -0
- package/dist/modules/otel/execution-level-tracer.d.ts +5 -4
- package/dist/modules/otel/execution-level-tracer.js +8 -5
- package/dist/modules/otel/execution-level-tracer.js.map +1 -1
- package/dist/modules/otel/otel-lifecycle-handler.d.ts +8 -4
- package/dist/modules/otel/otel-lifecycle-handler.js +32 -15
- package/dist/modules/otel/otel-lifecycle-handler.js.map +1 -1
- package/dist/modules/otel/otel-settings.controller.d.ts +18 -0
- package/dist/modules/otel/otel-settings.controller.js +79 -0
- package/dist/modules/otel/otel-settings.controller.js.map +1 -0
- package/dist/modules/otel/otel-settings.service.d.ts +21 -0
- package/dist/modules/otel/otel-settings.service.js +89 -0
- package/dist/modules/otel/otel-settings.service.js.map +1 -0
- package/dist/modules/otel/otel.config.js +11 -10
- package/dist/modules/otel/otel.config.js.map +1 -1
- package/dist/modules/otel/otel.constants.d.ts +14 -0
- package/dist/modules/otel/otel.constants.js +15 -1
- package/dist/modules/otel/otel.constants.js.map +1 -1
- package/dist/modules/otel/otel.module.js +9 -17
- package/dist/modules/otel/otel.module.js.map +1 -1
- package/dist/modules/otel/otel.service.d.ts +15 -4
- package/dist/modules/otel/otel.service.js +73 -17
- package/dist/modules/otel/otel.service.js.map +1 -1
- package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.d.ts +1 -0
- package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js +46 -19
- package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js.map +1 -1
- package/dist/modules/redaction/instance-redaction-enforcement.service.js +0 -6
- package/dist/modules/redaction/instance-redaction-enforcement.service.js.map +1 -1
- package/dist/modules/source-control.ee/source-control-git.service.ee.js +2 -5
- package/dist/modules/source-control.ee/source-control-git.service.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.service.ee.js +3 -2
- package/dist/modules/sso-saml/saml.service.ee.js.map +1 -1
- package/dist/modules/workflow-index/workflow-dependency-query.service.js +39 -20
- package/dist/modules/workflow-index/workflow-dependency-query.service.js.map +1 -1
- package/dist/oauth/oauth.service.d.ts +14 -0
- package/dist/oauth/oauth.service.js +220 -102
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/oauth/types.d.ts +1 -0
- package/dist/oauth/types.js.map +1 -1
- package/dist/public-api/index.js +8 -8
- package/dist/public-api/index.js.map +1 -1
- package/dist/public-api/types.d.ts +1 -6
- package/dist/public-api/v1/handlers/credentials/credentials.service.js +7 -8
- package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/public-api/v1/handlers/executions/executions.handler.js +1 -1
- package/dist/public-api/v1/handlers/executions/executions.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/n8n-packages/n8n-packages.handler.js +3 -3
- package/dist/public-api/v1/handlers/n8n-packages/n8n-packages.handler.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +208 -51
- package/dist/push/abstract.push.d.ts +1 -2
- package/dist/push/abstract.push.js +1 -2
- package/dist/push/abstract.push.js.map +1 -1
- package/dist/push/index.d.ts +1 -2
- package/dist/push/index.js +3 -4
- package/dist/push/index.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/job-processor.d.ts +0 -1
- package/dist/scaling/job-processor.js +1 -23
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/multi-main-setup.ee.d.ts +1 -2
- package/dist/scaling/multi-main-setup.ee.js +1 -2
- package/dist/scaling/multi-main-setup.ee.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +7 -0
- package/dist/scaling/pubsub/pubsub.eventbus.d.ts +1 -1
- package/dist/scaling/pubsub/pubsub.eventbus.js +2 -2
- package/dist/scaling/pubsub/pubsub.eventbus.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.types.d.ts +3 -1
- package/dist/scaling/worker-server.d.ts +1 -1
- package/dist/scaling/worker-server.js +5 -5
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/server.js +4 -3
- package/dist/server.js.map +1 -1
- package/dist/services/ai-workflow-builder.service.d.ts +2 -1
- package/dist/services/ai-workflow-builder.service.js +2 -1
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/cache/cache.service.d.ts +1 -1
- package/dist/services/cache/cache.service.js +2 -2
- package/dist/services/cache/cache.service.js.map +1 -1
- package/dist/services/node-resource-explorer.service.d.ts +16 -0
- package/dist/services/node-resource-explorer.service.js +154 -0
- package/dist/services/node-resource-explorer.service.js.map +1 -0
- package/dist/services/oauth-token-verifier-proxy.service.d.ts +22 -0
- package/dist/services/oauth-token-verifier-proxy.service.js +36 -0
- package/dist/services/oauth-token-verifier-proxy.service.js.map +1 -0
- package/dist/services/protected-resource.registry.d.ts +31 -0
- package/dist/services/protected-resource.registry.js +115 -0
- package/dist/services/protected-resource.registry.js.map +1 -0
- package/dist/services/public-api-key.service.d.ts +8 -2
- package/dist/services/public-api-key.service.js +29 -6
- package/dist/services/public-api-key.service.js.map +1 -1
- package/dist/services/redis-client.service.d.ts +2 -2
- package/dist/services/redis-client.service.js +6 -4
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/services/tag.service.d.ts +10 -0
- package/dist/services/tag.service.js +84 -4
- package/dist/services/tag.service.js.map +1 -1
- package/dist/services/workflow-statistics.service.d.ts +1 -2
- package/dist/services/workflow-statistics.service.js +1 -2
- package/dist/services/workflow-statistics.service.js.map +1 -1
- package/dist/task-runners/sliding-window-signal.d.ts +1 -1
- package/dist/task-runners/task-runner-lifecycle-events.d.ts +1 -1
- package/dist/task-runners/task-runner-lifecycle-events.js +2 -2
- package/dist/task-runners/task-runner-lifecycle-events.js.map +1 -1
- package/dist/task-runners/task-runner-process-base.d.ts +1 -2
- package/dist/task-runners/task-runner-process-base.js +1 -2
- package/dist/task-runners/task-runner-process-base.js.map +1 -1
- package/dist/task-runners/task-runner-process-restart-loop-detector.d.ts +1 -1
- package/dist/task-runners/task-runner-process-restart-loop-detector.js +2 -2
- package/dist/task-runners/task-runner-process-restart-loop-detector.js.map +1 -1
- package/dist/user-management/email/templates/api-key-revoked.handlebars +196 -0
- package/dist/user-management/email/user-management-mailer.d.ts +6 -2
- package/dist/user-management/email/user-management-mailer.js +32 -0
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/wait-tracker.d.ts +1 -1
- package/dist/wait-tracker.js +3 -3
- package/dist/wait-tracker.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +30 -1
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook-server.js +2 -2
- package/dist/webhooks/webhook-server.js.map +1 -1
- package/dist/webhooks/webhook.service.d.ts +4 -1
- package/dist/webhooks/webhook.service.js +19 -4
- package/dist/webhooks/webhook.service.js.map +1 -1
- package/dist/workflow-execute-additional-data.d.ts +1 -1
- package/dist/workflow-execute-additional-data.js +4 -1
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-helpers.d.ts +1 -1
- package/dist/workflow-helpers.js +13 -3
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflow-runner.js +0 -2
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/publication/publication-result.d.ts +17 -0
- package/dist/workflows/publication/publication-result.js +3 -0
- package/dist/workflows/publication/publication-result.js.map +1 -0
- package/dist/workflows/publication/publication-status-reporter.d.ts +19 -0
- package/dist/workflows/publication/publication-status-reporter.js +110 -0
- package/dist/workflows/publication/publication-status-reporter.js.map +1 -0
- package/dist/workflows/publication/trigger-diff.d.ts +6 -0
- package/dist/workflows/publication/trigger-diff.js +27 -0
- package/dist/workflows/publication/trigger-diff.js.map +1 -0
- package/dist/workflows/publication/workflow-publication-applier.d.ts +14 -0
- package/dist/workflows/publication/workflow-publication-applier.js +96 -0
- package/dist/workflows/publication/workflow-publication-applier.js.map +1 -0
- package/dist/workflows/{workflow-publication-outbox-consumer.d.ts → publication/workflow-publication-outbox-consumer.d.ts} +9 -13
- package/dist/workflows/{workflow-publication-outbox-consumer.js → publication/workflow-publication-outbox-consumer.js} +25 -93
- package/dist/workflows/publication/workflow-publication-outbox-consumer.js.map +1 -0
- package/dist/workflows/triggers/non-webhook-trigger-registrar.d.ts +39 -0
- package/dist/workflows/triggers/non-webhook-trigger-registrar.js +58 -0
- package/dist/workflows/triggers/non-webhook-trigger-registrar.js.map +1 -0
- package/dist/workflows/triggers/trigger-count.service.d.ts +5 -0
- package/dist/workflows/triggers/trigger-count.service.js +65 -0
- package/dist/workflows/triggers/trigger-count.service.js.map +1 -0
- package/dist/workflows/triggers/trigger-execution-context.factory.d.ts +33 -0
- package/dist/workflows/triggers/trigger-execution-context.factory.js +171 -0
- package/dist/workflows/triggers/trigger-execution-context.factory.js.map +1 -0
- package/dist/workflows/triggers/webhook-trigger-registrar.d.ts +29 -0
- package/dist/workflows/triggers/webhook-trigger-registrar.js +143 -0
- package/dist/workflows/triggers/webhook-trigger-registrar.js.map +1 -0
- package/dist/workflows/triggers/workflow-trigger-activator.d.ts +56 -0
- package/dist/workflows/triggers/workflow-trigger-activator.js +313 -0
- package/dist/workflows/triggers/workflow-trigger-activator.js.map +1 -0
- package/dist/workflows/workflow-validation.service.d.ts +3 -0
- package/dist/workflows/workflow-validation.service.js +63 -37
- package/dist/workflows/workflow-validation.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +5 -3
- package/dist/workflows/workflow.service.js +91 -28
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +3 -3
- package/dist/workflows/workflows.controller.js +3 -3
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +35 -34
- package/templates/oauth-callback.handlebars +3 -0
- package/templates/oauth-error-callback.handlebars +3 -0
- package/dist/metrics/prometheus-metrics.service.d.ts +0 -54
- package/dist/metrics/prometheus-metrics.service.js +0 -607
- package/dist/metrics/prometheus-metrics.service.js.map +0 -1
- package/dist/metrics/types.d.ts +0 -6
- package/dist/metrics/types.js.map +0 -1
- package/dist/modules/agents/agent-knowledge-command.service.d.ts +0 -40
- package/dist/modules/agents/agent-knowledge-command.service.js +0 -221
- package/dist/modules/agents/agent-knowledge-command.service.js.map +0 -1
- package/dist/modules/agents/entities/agent-file.entity.d.ts +0 -11
- package/dist/modules/agents/entities/agent-file.entity.js.map +0 -1
- package/dist/modules/agents/repositories/agent-file.repository.d.ts +0 -7
- package/dist/modules/agents/repositories/agent-file.repository.js +0 -35
- package/dist/modules/agents/repositories/agent-file.repository.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/csv-helpers.d.ts +0 -73
- package/dist/modules/agents/tools/knowledge/csv-helpers.js +0 -341
- package/dist/modules/agents/tools/knowledge/csv-helpers.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/csv.operation.d.ts +0 -61
- package/dist/modules/agents/tools/knowledge/csv.operation.js +0 -207
- package/dist/modules/agents/tools/knowledge/csv.operation.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/file-references.d.ts +0 -16
- package/dist/modules/agents/tools/knowledge/file-references.js +0 -35
- package/dist/modules/agents/tools/knowledge/file-references.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/read.operation.d.ts +0 -8
- package/dist/modules/agents/tools/knowledge/read.operation.js +0 -38
- package/dist/modules/agents/tools/knowledge/read.operation.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/schemas.d.ts +0 -1505
- package/dist/modules/agents/tools/knowledge/schemas.js +0 -441
- package/dist/modules/agents/tools/knowledge/schemas.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/search.operation.d.ts +0 -9
- package/dist/modules/agents/tools/knowledge/search.operation.js +0 -332
- package/dist/modules/agents/tools/knowledge/search.operation.js.map +0 -1
- package/dist/modules/agents/tools/knowledge/tool.d.ts +0 -8
- package/dist/modules/agents/tools/knowledge/tool.js +0 -121
- package/dist/modules/agents/tools/knowledge/tool.js.map +0 -1
- package/dist/modules/mcp/database/entities/oauth-access-token.entity.js.map +0 -1
- package/dist/modules/mcp/database/entities/oauth-authorization-code.entity.js.map +0 -1
- package/dist/modules/mcp/database/entities/oauth-client.entity.js.map +0 -1
- package/dist/modules/mcp/database/entities/oauth-refresh-token.entity.js.map +0 -1
- package/dist/modules/mcp/database/entities/oauth-user-consent.entity.js.map +0 -1
- package/dist/modules/mcp/database/repositories/oauth-access-token.repository.js.map +0 -1
- package/dist/modules/mcp/database/repositories/oauth-authorization-code.repository.js.map +0 -1
- package/dist/modules/mcp/database/repositories/oauth-client.repository.js.map +0 -1
- package/dist/modules/mcp/database/repositories/oauth-refresh-token.repository.js.map +0 -1
- package/dist/modules/mcp/database/repositories/oauth-user-consent.repository.js.map +0 -1
- package/dist/modules/mcp/dto/approve-consent-request.dto.js.map +0 -1
- package/dist/modules/mcp/mcp-oauth-authorization-code.service.js.map +0 -1
- package/dist/modules/mcp/mcp-oauth-consent.service.js.map +0 -1
- package/dist/modules/mcp/mcp-oauth-service.js.map +0 -1
- package/dist/modules/mcp/mcp-oauth-token.service.js.map +0 -1
- package/dist/modules/mcp/mcp-oauth.helpers.js.map +0 -1
- package/dist/modules/mcp/mcp.auth.consent.controller.js.map +0 -1
- package/dist/modules/mcp/mcp.oauth-clients.controller.js.map +0 -1
- package/dist/modules/mcp/mcp.oauth.controller.js.map +0 -1
- package/dist/modules/mcp/oauth-session.service.js.map +0 -1
- package/dist/modules/n8n-packages/entities/credential/credential-missing-mode-factory.d.ts +0 -7
- package/dist/modules/n8n-packages/entities/credential/credential-missing-mode-factory.js +0 -35
- package/dist/modules/n8n-packages/entities/credential/credential-missing-mode-factory.js.map +0 -1
- package/dist/modules/n8n-packages/entities/credential/credential-resolution-error.d.ts +0 -3
- package/dist/modules/n8n-packages/entities/credential/credential-resolution-error.js +0 -14
- package/dist/modules/n8n-packages/entities/credential/credential-resolution-error.js.map +0 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-fail.handler.d.ts +0 -9
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-fail.handler.js +0 -41
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-fail.handler.js.map +0 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-handler.d.ts +0 -10
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-handler.js +0 -20
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-handler.js.map +0 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-new-version.handler.d.ts +0 -11
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-new-version.handler.js +0 -42
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-new-version.handler.js.map +0 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-skip.handler.d.ts +0 -9
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-skip.handler.js +0 -33
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy-skip.handler.js.map +0 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.factory.d.ts +0 -10
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.factory.js +0 -37
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.factory.js.map +0 -1
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.types.d.ts +0 -20
- package/dist/modules/n8n-packages/entities/workflow/workflow-conflict-policy.types.js.map +0 -1
- package/dist/modules/redaction/redaction-enforcement.feature-flag.d.ts +0 -2
- package/dist/modules/redaction/redaction-enforcement.feature-flag.js +0 -9
- package/dist/modules/redaction/redaction-enforcement.feature-flag.js.map +0 -1
- package/dist/typed-emitter.d.ts +0 -14
- package/dist/typed-emitter.js +0 -29
- package/dist/typed-emitter.js.map +0 -1
- package/dist/workflows/workflow-publication-outbox-consumer.js.map +0 -1
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-access-token.entity.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-access-token.entity.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-authorization-code.entity.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-authorization-code.entity.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-client.entity.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-client.entity.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-refresh-token.entity.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-refresh-token.entity.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-user-consent.entity.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/entities/oauth-user-consent.entity.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-access-token.repository.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-access-token.repository.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-authorization-code.repository.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-authorization-code.repository.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-client.repository.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-client.repository.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-refresh-token.repository.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-refresh-token.repository.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-user-consent.repository.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/database/repositories/oauth-user-consent.repository.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/dto/approve-consent-request.dto.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/dto/approve-consent-request.dto.js +0 -0
- /package/dist/modules/{mcp → oauth-server}/oauth-session.service.d.ts +0 -0
- /package/dist/modules/{mcp → oauth-server}/oauth-session.service.js +0 -0
|
@@ -46,7 +46,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
46
46
|
};
|
|
47
47
|
var OauthService_1;
|
|
48
48
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
49
|
-
exports.OauthService = exports.OauthVersion = exports.skipAuthOnOAuthCallback = void 0;
|
|
49
|
+
exports.OauthService = exports.InvalidOAuthUrlError = exports.InvalidTargetError = exports.OauthVersion = exports.skipAuthOnOAuthCallback = void 0;
|
|
50
50
|
exports.shouldSkipAuthOnOAuthCallback = shouldSkipAuthOnOAuthCallback;
|
|
51
51
|
const backend_common_1 = require("@n8n/backend-common");
|
|
52
52
|
const config_1 = require("@n8n/config");
|
|
@@ -87,6 +87,20 @@ function shouldSkipAuthOnOAuthCallback() {
|
|
|
87
87
|
return value === 'true';
|
|
88
88
|
}
|
|
89
89
|
exports.skipAuthOnOAuthCallback = shouldSkipAuthOnOAuthCallback();
|
|
90
|
+
class InvalidTargetError extends bad_request_error_1.BadRequestError {
|
|
91
|
+
constructor(message) {
|
|
92
|
+
super(message, undefined, 'invalid_target');
|
|
93
|
+
this.name = 'InvalidTargetError';
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
exports.InvalidTargetError = InvalidTargetError;
|
|
97
|
+
class InvalidOAuthUrlError extends bad_request_error_1.BadRequestError {
|
|
98
|
+
constructor(message) {
|
|
99
|
+
super(message);
|
|
100
|
+
this.name = 'InvalidOAuthUrlError';
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
exports.InvalidOAuthUrlError = InvalidOAuthUrlError;
|
|
90
104
|
let OauthService = OauthService_1 = class OauthService {
|
|
91
105
|
constructor(logger, credentialsHelper, credentialsRepository, credentialsFinderService, urlService, globalConfig, externalHooks, cipher, dynamicCredentialsProxy, authService, oauthJweServiceProxy, browserBindingService, eventService, cacheService) {
|
|
92
106
|
this.logger = logger;
|
|
@@ -116,6 +130,64 @@ let OauthService = OauthService_1 = class OauthService {
|
|
|
116
130
|
throw e;
|
|
117
131
|
}
|
|
118
132
|
}
|
|
133
|
+
validateAuthServerUrlOrThrow(url) {
|
|
134
|
+
try {
|
|
135
|
+
this.validateOAuthUrlOrThrow(url);
|
|
136
|
+
}
|
|
137
|
+
catch (error) {
|
|
138
|
+
if (error instanceof bad_request_error_1.BadRequestError) {
|
|
139
|
+
throw new InvalidOAuthUrlError(error.message);
|
|
140
|
+
}
|
|
141
|
+
throw error;
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
normalizeResourceUrl(url) {
|
|
145
|
+
return url.trim().replace(/\/+$/, '');
|
|
146
|
+
}
|
|
147
|
+
parseUrlOriginOrThrow(url, message) {
|
|
148
|
+
try {
|
|
149
|
+
return new URL(url).origin;
|
|
150
|
+
}
|
|
151
|
+
catch (error) {
|
|
152
|
+
this.logger.debug('Invalid OAuth URL format', { url, error });
|
|
153
|
+
throw new InvalidTargetError(message);
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
validateResourceUrlOrThrow(resourceUrl) {
|
|
157
|
+
const normalizedResourceUrl = this.normalizeResourceUrl(resourceUrl);
|
|
158
|
+
try {
|
|
159
|
+
this.validateOAuthUrlOrThrow(normalizedResourceUrl);
|
|
160
|
+
new URL(normalizedResourceUrl);
|
|
161
|
+
}
|
|
162
|
+
catch (error) {
|
|
163
|
+
this.logger.debug('Invalid OAuth resource URL', { resourceUrl, error });
|
|
164
|
+
throw new InvalidTargetError('Invalid resource URL format.');
|
|
165
|
+
}
|
|
166
|
+
return normalizedResourceUrl;
|
|
167
|
+
}
|
|
168
|
+
resolveResourceUrl(suppliedResourceUrl, discoveredResource, serverUrl) {
|
|
169
|
+
if (!suppliedResourceUrl)
|
|
170
|
+
return discoveredResource;
|
|
171
|
+
if (discoveredResource && suppliedResourceUrl !== discoveredResource) {
|
|
172
|
+
this.logger.debug('OAuth resource URL does not match discovered resource', {
|
|
173
|
+
suppliedResourceUrl,
|
|
174
|
+
discoveredResource,
|
|
175
|
+
});
|
|
176
|
+
throw new InvalidTargetError("The provided resource URL does not match the server's advertised resource.");
|
|
177
|
+
}
|
|
178
|
+
if (!discoveredResource) {
|
|
179
|
+
const resourceOrigin = this.parseUrlOriginOrThrow(suppliedResourceUrl, 'Invalid resource URL format.');
|
|
180
|
+
const serverOrigin = this.parseUrlOriginOrThrow(serverUrl, 'Invalid OAuth server URL format.');
|
|
181
|
+
if (resourceOrigin !== serverOrigin) {
|
|
182
|
+
this.logger.debug('OAuth resource URL origin does not match server URL origin', {
|
|
183
|
+
resourceOrigin,
|
|
184
|
+
serverOrigin,
|
|
185
|
+
});
|
|
186
|
+
throw new InvalidTargetError('Resource URL origin must match the server URL origin.');
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
return suppliedResourceUrl;
|
|
190
|
+
}
|
|
119
191
|
getBaseUrl(oauthVersion) {
|
|
120
192
|
const restUrl = `${this.urlService.getInstanceBaseUrl()}/${this.globalConfig.endpoints.rest}`;
|
|
121
193
|
return `${restUrl}/oauth${oauthVersion}-credential`;
|
|
@@ -389,6 +461,50 @@ let OauthService = OauthService_1 = class OauthService {
|
|
|
389
461
|
return false;
|
|
390
462
|
}
|
|
391
463
|
}
|
|
464
|
+
async discoverAndResolveResource(oauthCredentials, csrfData, authorizationServerUrl) {
|
|
465
|
+
let discoveredResource;
|
|
466
|
+
let suppliedResourceUrl;
|
|
467
|
+
if (oauthCredentials.resourceUrl) {
|
|
468
|
+
suppliedResourceUrl = this.validateResourceUrlOrThrow(oauthCredentials.resourceUrl);
|
|
469
|
+
}
|
|
470
|
+
try {
|
|
471
|
+
const protectedResourceMetadata = await this.discoverProtectedResourceMetadata(oauthCredentials.serverUrl);
|
|
472
|
+
if (oauthCredentials.useDynamicClientRegistration) {
|
|
473
|
+
const discoveredAuthorizationServerUrl = protectedResourceMetadata.authorization_servers[0]?.trim();
|
|
474
|
+
if (!discoveredAuthorizationServerUrl) {
|
|
475
|
+
throw new InvalidOAuthUrlError('OAuth url is not a valid URL.');
|
|
476
|
+
}
|
|
477
|
+
authorizationServerUrl = discoveredAuthorizationServerUrl;
|
|
478
|
+
this.validateAuthServerUrlOrThrow(authorizationServerUrl);
|
|
479
|
+
}
|
|
480
|
+
discoveredResource = protectedResourceMetadata.resource;
|
|
481
|
+
this.logger.debug('Protected resource discovery succeeded', {
|
|
482
|
+
resourceUrl: oauthCredentials.serverUrl,
|
|
483
|
+
...(oauthCredentials.useDynamicClientRegistration ? { authorizationServerUrl } : {}),
|
|
484
|
+
discoveredResource,
|
|
485
|
+
});
|
|
486
|
+
}
|
|
487
|
+
catch (error) {
|
|
488
|
+
if (error instanceof InvalidOAuthUrlError) {
|
|
489
|
+
throw error;
|
|
490
|
+
}
|
|
491
|
+
this.logger.debug(oauthCredentials.useDynamicClientRegistration
|
|
492
|
+
? 'Protected resource discovery failed, assuming serverUrl is authorization server'
|
|
493
|
+
: 'Protected resource discovery failed', {
|
|
494
|
+
serverUrl: oauthCredentials.serverUrl,
|
|
495
|
+
error: error.message,
|
|
496
|
+
});
|
|
497
|
+
if (oauthCredentials.useDynamicClientRegistration) {
|
|
498
|
+
authorizationServerUrl = oauthCredentials.serverUrl;
|
|
499
|
+
}
|
|
500
|
+
}
|
|
501
|
+
const resolvedResource = this.resolveResourceUrl(suppliedResourceUrl, discoveredResource, oauthCredentials.serverUrl);
|
|
502
|
+
if (resolvedResource) {
|
|
503
|
+
oauthCredentials.resource = resolvedResource;
|
|
504
|
+
csrfData.resource = resolvedResource;
|
|
505
|
+
}
|
|
506
|
+
return { authorizationServerUrl, discoveredResource };
|
|
507
|
+
}
|
|
392
508
|
applyBrowserBindingIfEnabled(csrfData, req, res) {
|
|
393
509
|
if (!req || !res)
|
|
394
510
|
return;
|
|
@@ -401,107 +517,19 @@ let OauthService = OauthService_1 = class OauthService {
|
|
|
401
517
|
this.applyBrowserBindingIfEnabled(csrfData, req, res);
|
|
402
518
|
const oauthCredentials = await this.getOAuthCredentials(credential);
|
|
403
519
|
const toUpdate = {};
|
|
404
|
-
|
|
520
|
+
let authorizationServerUrl = oauthCredentials.serverUrl;
|
|
521
|
+
if (oauthCredentials.serverUrl) {
|
|
405
522
|
this.validateOAuthUrlOrThrow(oauthCredentials.serverUrl);
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
catch (error) {
|
|
417
|
-
if (error instanceof bad_request_error_1.BadRequestError && error.message.includes('OAuth url')) {
|
|
418
|
-
throw error;
|
|
419
|
-
}
|
|
420
|
-
this.logger.debug('Protected resource discovery failed, assuming serverUrl is authorization server', {
|
|
421
|
-
serverUrl: oauthCredentials.serverUrl,
|
|
422
|
-
error: error.message,
|
|
423
|
-
});
|
|
424
|
-
authorizationServerUrl = oauthCredentials.serverUrl;
|
|
425
|
-
}
|
|
426
|
-
const issuerUrl = new URL(authorizationServerUrl);
|
|
427
|
-
const pathComponent = issuerUrl.pathname.replace(/\/$/, '');
|
|
428
|
-
const pathIsWellKnown = pathComponent.startsWith('/.well-known');
|
|
429
|
-
const discoveryUrls = pathComponent && !pathIsWellKnown
|
|
430
|
-
? [
|
|
431
|
-
`${issuerUrl.origin}/.well-known/oauth-authorization-server${pathComponent}`,
|
|
432
|
-
`${issuerUrl.origin}/.well-known/openid-configuration${pathComponent}`,
|
|
433
|
-
`${authorizationServerUrl}/.well-known/openid-configuration`,
|
|
434
|
-
`${issuerUrl.origin}/.well-known/oauth-authorization-server`,
|
|
435
|
-
]
|
|
436
|
-
: [
|
|
437
|
-
`${issuerUrl.origin}/.well-known/oauth-authorization-server`,
|
|
438
|
-
`${issuerUrl.origin}/.well-known/openid-configuration`,
|
|
439
|
-
];
|
|
440
|
-
let data;
|
|
441
|
-
let lastError;
|
|
442
|
-
for (const url of discoveryUrls) {
|
|
443
|
-
try {
|
|
444
|
-
this.validateOAuthUrlOrThrow(url);
|
|
445
|
-
const response = await axios_1.default.get(url, {
|
|
446
|
-
validateStatus: (status) => status === 200,
|
|
447
|
-
});
|
|
448
|
-
data = response.data;
|
|
449
|
-
break;
|
|
450
|
-
}
|
|
451
|
-
catch (error) {
|
|
452
|
-
lastError = error;
|
|
453
|
-
}
|
|
454
|
-
}
|
|
455
|
-
if (!data) {
|
|
456
|
-
throw new bad_request_error_1.BadRequestError(`Failed to discover OAuth2 authorization server metadata. Tried: ${discoveryUrls.join(', ')}. Last error: ${lastError?.message}`);
|
|
457
|
-
}
|
|
458
|
-
const metadataValidation = oauth2_dynamic_client_registration_schema_1.oAuthAuthorizationServerMetadataSchema.safeParse(data);
|
|
459
|
-
if (!metadataValidation.success) {
|
|
460
|
-
throw new bad_request_error_1.BadRequestError(`Invalid OAuth2 server metadata: ${metadataValidation.error.issues.map((e) => e.message).join(', ')}`);
|
|
461
|
-
}
|
|
462
|
-
const { authorization_endpoint, token_endpoint, registration_endpoint, scopes_supported } = metadataValidation.data;
|
|
463
|
-
oauthCredentials.authUrl = authorization_endpoint;
|
|
464
|
-
oauthCredentials.accessTokenUrl = token_endpoint;
|
|
465
|
-
toUpdate.authUrl = authorization_endpoint;
|
|
466
|
-
toUpdate.accessTokenUrl = token_endpoint;
|
|
467
|
-
const scope = scopes_supported ? scopes_supported.join(' ') : undefined;
|
|
468
|
-
if (scope) {
|
|
469
|
-
oauthCredentials.scope = scope;
|
|
470
|
-
toUpdate.scope = scope;
|
|
471
|
-
}
|
|
472
|
-
const { grantType, authentication } = this.selectGrantTypeAndAuthenticationMethod(metadataValidation.data.grant_types_supported ?? ['authorization_code', 'implicit'], metadataValidation.data.token_endpoint_auth_methods_supported ?? ['client_secret_basic'], metadataValidation.data.code_challenge_methods_supported ?? []);
|
|
473
|
-
oauthCredentials.grantType = grantType;
|
|
474
|
-
toUpdate.grantType = grantType;
|
|
475
|
-
if (authentication) {
|
|
476
|
-
oauthCredentials.authentication = authentication;
|
|
477
|
-
toUpdate.authentication = authentication;
|
|
478
|
-
}
|
|
479
|
-
const { grant_types, token_endpoint_auth_method } = this.mapGrantTypeAndAuthenticationMethod(grantType, authentication);
|
|
480
|
-
const registerPayload = {
|
|
481
|
-
redirect_uris: [`${this.getBaseUrl(2)}/callback`],
|
|
482
|
-
token_endpoint_auth_method,
|
|
483
|
-
grant_types,
|
|
484
|
-
response_types: ['code'],
|
|
485
|
-
client_name: 'n8n',
|
|
486
|
-
client_uri: 'https://n8n.io/',
|
|
487
|
-
scope,
|
|
488
|
-
...(oauthCredentials.jweEnabled === true
|
|
489
|
-
? await this.oauthJweServiceProxy.getDcrJweFields(oauthCredentials.inlineJwks === true)
|
|
490
|
-
: {}),
|
|
491
|
-
};
|
|
492
|
-
await this.externalHooks.run('oauth2.dynamicClientRegistration', [registerPayload]);
|
|
493
|
-
const { data: registerResult } = await axios_1.default.post(registration_endpoint, registerPayload);
|
|
494
|
-
const registrationValidation = oauth2_dynamic_client_registration_schema_1.dynamicClientRegistrationResponseSchema.safeParse(registerResult);
|
|
495
|
-
if (!registrationValidation.success) {
|
|
496
|
-
throw new bad_request_error_1.BadRequestError(`Invalid client registration response: ${registrationValidation.error.issues.map((e) => e.message).join(', ')}`);
|
|
497
|
-
}
|
|
498
|
-
const { client_id, client_secret } = registrationValidation.data;
|
|
499
|
-
oauthCredentials.clientId = client_id;
|
|
500
|
-
toUpdate.clientId = client_id;
|
|
501
|
-
if (client_secret) {
|
|
502
|
-
oauthCredentials.clientSecret = client_secret;
|
|
503
|
-
toUpdate.clientSecret = client_secret;
|
|
504
|
-
}
|
|
523
|
+
const { authorizationServerUrl: resolvedAuthUrl } = await this.discoverAndResolveResource(oauthCredentials, csrfData, authorizationServerUrl);
|
|
524
|
+
authorizationServerUrl = resolvedAuthUrl;
|
|
525
|
+
}
|
|
526
|
+
else if (oauthCredentials.resourceUrl) {
|
|
527
|
+
const resolvedResource = this.validateResourceUrlOrThrow(oauthCredentials.resourceUrl);
|
|
528
|
+
oauthCredentials.resource = resolvedResource;
|
|
529
|
+
csrfData.resource = resolvedResource;
|
|
530
|
+
}
|
|
531
|
+
if (oauthCredentials.useDynamicClientRegistration && oauthCredentials.serverUrl) {
|
|
532
|
+
await this.performDynamicClientRegistration(oauthCredentials, authorizationServerUrl, toUpdate);
|
|
505
533
|
}
|
|
506
534
|
this.validateOAuthUrlOrThrow(oauthCredentials.authUrl ?? '');
|
|
507
535
|
this.validateOAuthUrlOrThrow(oauthCredentials.accessTokenUrl ?? '');
|
|
@@ -536,6 +564,88 @@ let OauthService = OauthService_1 = class OauthService {
|
|
|
536
564
|
});
|
|
537
565
|
return returnUri.toString();
|
|
538
566
|
}
|
|
567
|
+
async performDynamicClientRegistration(oauthCredentials, authorizationServerUrl, toUpdate) {
|
|
568
|
+
const dcrAuthorizationServerUrl = authorizationServerUrl ?? oauthCredentials.serverUrl;
|
|
569
|
+
const issuerUrl = new URL(dcrAuthorizationServerUrl);
|
|
570
|
+
const pathComponent = issuerUrl.pathname.replace(/\/$/, '');
|
|
571
|
+
const pathIsWellKnown = pathComponent.startsWith('/.well-known');
|
|
572
|
+
const discoveryUrls = pathComponent && !pathIsWellKnown
|
|
573
|
+
? [
|
|
574
|
+
`${issuerUrl.origin}/.well-known/oauth-authorization-server${pathComponent}`,
|
|
575
|
+
`${issuerUrl.origin}/.well-known/openid-configuration${pathComponent}`,
|
|
576
|
+
`${dcrAuthorizationServerUrl}/.well-known/openid-configuration`,
|
|
577
|
+
`${issuerUrl.origin}/.well-known/oauth-authorization-server`,
|
|
578
|
+
]
|
|
579
|
+
: [
|
|
580
|
+
`${issuerUrl.origin}/.well-known/oauth-authorization-server`,
|
|
581
|
+
`${issuerUrl.origin}/.well-known/openid-configuration`,
|
|
582
|
+
];
|
|
583
|
+
let data;
|
|
584
|
+
let lastError;
|
|
585
|
+
for (const url of discoveryUrls) {
|
|
586
|
+
try {
|
|
587
|
+
this.validateOAuthUrlOrThrow(url);
|
|
588
|
+
const response = await axios_1.default.get(url, {
|
|
589
|
+
validateStatus: (status) => status === 200,
|
|
590
|
+
});
|
|
591
|
+
data = response.data;
|
|
592
|
+
break;
|
|
593
|
+
}
|
|
594
|
+
catch (error) {
|
|
595
|
+
lastError = error;
|
|
596
|
+
}
|
|
597
|
+
}
|
|
598
|
+
if (!data) {
|
|
599
|
+
throw new bad_request_error_1.BadRequestError(`Failed to discover OAuth2 authorization server metadata. Tried: ${discoveryUrls.join(', ')}. Last error: ${lastError?.message}`);
|
|
600
|
+
}
|
|
601
|
+
const metadataValidation = oauth2_dynamic_client_registration_schema_1.oAuthAuthorizationServerMetadataSchema.safeParse(data);
|
|
602
|
+
if (!metadataValidation.success) {
|
|
603
|
+
throw new bad_request_error_1.BadRequestError(`Invalid OAuth2 server metadata: ${metadataValidation.error.issues.map((e) => e.message).join(', ')}`);
|
|
604
|
+
}
|
|
605
|
+
const { authorization_endpoint, token_endpoint, registration_endpoint, scopes_supported } = metadataValidation.data;
|
|
606
|
+
oauthCredentials.authUrl = authorization_endpoint;
|
|
607
|
+
oauthCredentials.accessTokenUrl = token_endpoint;
|
|
608
|
+
toUpdate.authUrl = authorization_endpoint;
|
|
609
|
+
toUpdate.accessTokenUrl = token_endpoint;
|
|
610
|
+
const scope = scopes_supported ? scopes_supported.join(' ') : undefined;
|
|
611
|
+
if (scope) {
|
|
612
|
+
oauthCredentials.scope = scope;
|
|
613
|
+
toUpdate.scope = scope;
|
|
614
|
+
}
|
|
615
|
+
const { grantType, authentication } = this.selectGrantTypeAndAuthenticationMethod(metadataValidation.data.grant_types_supported ?? ['authorization_code', 'implicit'], metadataValidation.data.token_endpoint_auth_methods_supported ?? ['client_secret_basic'], metadataValidation.data.code_challenge_methods_supported ?? []);
|
|
616
|
+
oauthCredentials.grantType = grantType;
|
|
617
|
+
toUpdate.grantType = grantType;
|
|
618
|
+
if (authentication) {
|
|
619
|
+
oauthCredentials.authentication = authentication;
|
|
620
|
+
toUpdate.authentication = authentication;
|
|
621
|
+
}
|
|
622
|
+
const { grant_types, token_endpoint_auth_method } = this.mapGrantTypeAndAuthenticationMethod(grantType, authentication);
|
|
623
|
+
const registerPayload = {
|
|
624
|
+
redirect_uris: [`${this.getBaseUrl(2)}/callback`],
|
|
625
|
+
token_endpoint_auth_method,
|
|
626
|
+
grant_types,
|
|
627
|
+
response_types: ['code'],
|
|
628
|
+
client_name: 'n8n',
|
|
629
|
+
client_uri: 'https://n8n.io/',
|
|
630
|
+
scope,
|
|
631
|
+
...(oauthCredentials.jweEnabled === true
|
|
632
|
+
? await this.oauthJweServiceProxy.getDcrJweFields(oauthCredentials.inlineJwks === true)
|
|
633
|
+
: {}),
|
|
634
|
+
};
|
|
635
|
+
await this.externalHooks.run('oauth2.dynamicClientRegistration', [registerPayload]);
|
|
636
|
+
const { data: registerResult } = await axios_1.default.post(registration_endpoint, registerPayload);
|
|
637
|
+
const registrationValidation = oauth2_dynamic_client_registration_schema_1.dynamicClientRegistrationResponseSchema.safeParse(registerResult);
|
|
638
|
+
if (!registrationValidation.success) {
|
|
639
|
+
throw new bad_request_error_1.BadRequestError(`Invalid client registration response: ${registrationValidation.error.issues.map((e) => e.message).join(', ')}`);
|
|
640
|
+
}
|
|
641
|
+
const { client_id, client_secret } = registrationValidation.data;
|
|
642
|
+
oauthCredentials.clientId = client_id;
|
|
643
|
+
toUpdate.clientId = client_id;
|
|
644
|
+
if (client_secret) {
|
|
645
|
+
oauthCredentials.clientSecret = client_secret;
|
|
646
|
+
toUpdate.clientSecret = client_secret;
|
|
647
|
+
}
|
|
648
|
+
}
|
|
539
649
|
async generateAOauth1AuthUri(credential, csrfData, req, res) {
|
|
540
650
|
this.applyBrowserBindingIfEnabled(csrfData, req, res);
|
|
541
651
|
const oauthCredentials = await this.getOAuthCredentials(credential);
|
|
@@ -639,6 +749,7 @@ let OauthService = OauthService_1 = class OauthService {
|
|
|
639
749
|
redirectUri: `${this.getBaseUrl(2)}/callback`,
|
|
640
750
|
scopes: (0, split_1.default)(credential.scope ?? 'openid', ','),
|
|
641
751
|
scopesSeparator: credential.scope?.includes(',') ? ',' : ' ',
|
|
752
|
+
resource: credential.resource,
|
|
642
753
|
ignoreSSLIssues: credential.ignoreSSLIssues ?? false,
|
|
643
754
|
};
|
|
644
755
|
if (credential.additionalBodyProperties &&
|
|
@@ -671,7 +782,14 @@ let OauthService = OauthService_1 = class OauthService {
|
|
|
671
782
|
if (data &&
|
|
672
783
|
Array.isArray(data.authorization_servers) &&
|
|
673
784
|
data.authorization_servers.length > 0) {
|
|
674
|
-
|
|
785
|
+
const rawResource = data.resource;
|
|
786
|
+
const resource = typeof rawResource === 'string'
|
|
787
|
+
? this.validateResourceUrlOrThrow(rawResource)
|
|
788
|
+
: undefined;
|
|
789
|
+
return {
|
|
790
|
+
authorization_servers: data.authorization_servers,
|
|
791
|
+
...(resource ? { resource } : {}),
|
|
792
|
+
};
|
|
675
793
|
}
|
|
676
794
|
}
|
|
677
795
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"oauth.service.js","sourceRoot":"","sources":["../../src/oauth/oauth.service.ts"],"names":[],"mappings":"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"}
|
package/dist/oauth/types.d.ts
CHANGED
package/dist/oauth/types.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/oauth/types.ts"],"names":[],"mappings":";;;AAAA,8CAAsC;AA2BzB,QAAA,YAAY,GAAG,CAAC,GAAG,gBAAI,CAAC,OAAO,CAAC,cAAc,CAAC;AAE5D,IAAkB,YAGjB;AAHD,WAAkB,YAAY;IAC7B,2CAAM,CAAA;IACN,2CAAM,CAAA;AACP,CAAC,EAHiB,YAAY,4BAAZ,YAAY,QAG7B;AAWY,QAAA,YAAY,GAAG;IAC3B,aAAa,EAAE,QAAQ;IACvB,aAAa,EAAE,QAAQ;IACvB,WAAW,EAAE,MAAM;CACV,CAAC"}
|
package/dist/public-api/index.js
CHANGED
|
@@ -86,17 +86,17 @@ function createLazyValidatorMiddleware(openApiSpecPath, handlersDirectory, versi
|
|
|
86
86
|
if (!cachedRouter) {
|
|
87
87
|
initPromise ??= (async () => {
|
|
88
88
|
const { middleware: openApiValidatorMiddleware } = await Promise.resolve().then(() => __importStar(require('express-openapi-validator')));
|
|
89
|
+
const authStrategyRegistry = di_1.Container.get(auth_strategy_registry_1.AuthStrategyRegistry);
|
|
90
|
+
const eventService = di_1.Container.get(event_service_1.EventService);
|
|
91
|
+
const lastActiveAtService = di_1.Container.get(last_active_at_service_1.LastActiveAtService);
|
|
92
|
+
const logger = di_1.Container.get(backend_common_1.Logger);
|
|
89
93
|
const authenticate = async (req) => {
|
|
90
|
-
const authenticated = await
|
|
94
|
+
const authenticated = await authStrategyRegistry.authenticate(req);
|
|
91
95
|
if (authenticated) {
|
|
92
|
-
|
|
93
|
-
.
|
|
94
|
-
.catch((error) => {
|
|
95
|
-
di_1.Container.get(backend_common_1.Logger).error('Failed to update last active timestamp', {
|
|
96
|
-
error,
|
|
97
|
-
});
|
|
96
|
+
lastActiveAtService.updateLastActiveIfStale(req.user.id).catch((error) => {
|
|
97
|
+
logger.error('Failed to update last active timestamp', { error });
|
|
98
98
|
});
|
|
99
|
-
|
|
99
|
+
eventService.emit('public-api-invoked', {
|
|
100
100
|
userId: req.user.id,
|
|
101
101
|
path: req.path,
|
|
102
102
|
method: req.method,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/public-api/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/public-api/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -229,20 +229,15 @@ export type CursorPagination = PaginationBase & {
|
|
|
229
229
|
};
|
|
230
230
|
export interface IRequired {
|
|
231
231
|
required?: string[];
|
|
232
|
-
not?: {
|
|
233
|
-
required?: string[];
|
|
234
|
-
};
|
|
235
232
|
}
|
|
236
233
|
export interface IDependency {
|
|
237
234
|
if?: {
|
|
238
235
|
properties: {};
|
|
236
|
+
required?: string[];
|
|
239
237
|
};
|
|
240
238
|
then?: {
|
|
241
239
|
allOf: IRequired[];
|
|
242
240
|
};
|
|
243
|
-
else?: {
|
|
244
|
-
allOf: IRequired[];
|
|
245
|
-
};
|
|
246
241
|
}
|
|
247
242
|
export interface IJsonSchema {
|
|
248
243
|
additionalProperties: boolean;
|
|
@@ -297,25 +297,24 @@ function toJsonSchema(properties) {
|
|
|
297
297
|
properties: {
|
|
298
298
|
[dependantName]: conditionalValue,
|
|
299
299
|
},
|
|
300
|
+
required: [dependantName],
|
|
300
301
|
},
|
|
301
302
|
then: {
|
|
302
303
|
allOf: [],
|
|
303
304
|
},
|
|
304
|
-
else: {
|
|
305
|
-
allOf: [],
|
|
306
|
-
},
|
|
307
305
|
};
|
|
308
306
|
resolveProperties.push(dependencyKey);
|
|
309
307
|
}
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
308
|
+
if (property.required) {
|
|
309
|
+
propertyRequiredDependencies[dependencyKey].then?.allOf.push({
|
|
310
|
+
required: [property.name],
|
|
311
|
+
});
|
|
312
|
+
}
|
|
314
313
|
requiredFields = requiredFields.filter((field) => field !== property.name);
|
|
315
314
|
}
|
|
316
315
|
});
|
|
317
316
|
Object.assign(jsonSchema, { required: requiredFields });
|
|
318
|
-
jsonSchema.allOf = Object.values(propertyRequiredDependencies);
|
|
317
|
+
jsonSchema.allOf = Object.values(propertyRequiredDependencies).filter((dependency) => (dependency.then?.allOf.length ?? 0) > 0);
|
|
319
318
|
if (!jsonSchema.allOf.length) {
|
|
320
319
|
delete jsonSchema.allOf;
|
|
321
320
|
}
|