n8n 2.18.3 → 2.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/abstract-server.d.ts +0 -1
- package/dist/abstract-server.js +11 -10
- package/dist/abstract-server.js.map +1 -1
- package/dist/active-executions.js +1 -0
- package/dist/active-executions.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/collaboration/collaboration.service.d.ts +3 -1
- package/dist/collaboration/collaboration.service.js +19 -0
- package/dist/collaboration/collaboration.service.js.map +1 -1
- package/dist/commands/base-command.js +7 -1
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/export/credentials.d.ts +5 -0
- package/dist/commands/export/credentials.js +21 -5
- package/dist/commands/export/credentials.js.map +1 -1
- package/dist/commands/export/workflow.d.ts +4 -0
- package/dist/commands/export/workflow.js +17 -5
- package/dist/commands/export/workflow.js.map +1 -1
- package/dist/controller.registry.js +3 -0
- package/dist/controller.registry.js.map +1 -1
- package/dist/controllers/e2e.controller.d.ts +35 -2
- package/dist/controllers/e2e.controller.js +129 -2
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/folder.controller.js +1 -1
- package/dist/controllers/folder.controller.js.map +1 -1
- package/dist/controllers/me.controller.js +3 -2
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/mfa.controller.js +1 -1
- package/dist/controllers/mfa.controller.js.map +1 -1
- package/dist/controllers/security-settings.controller.js +1 -1
- package/dist/controllers/security-settings.controller.js.map +1 -1
- package/dist/controllers/users.controller.d.ts +1 -3
- package/dist/controllers/users.controller.js +2 -16
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/credentials/credentials.service.js +4 -1
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/credentials/external-secrets.utils.js +3 -3
- package/dist/credentials/external-secrets.utils.js.map +1 -1
- package/dist/credentials-helper.js +2 -1
- package/dist/credentials-helper.js.map +1 -1
- package/dist/deprecation/deprecation.service.js.map +1 -1
- package/dist/eventbus/event-message-classes/index.d.ts +2 -2
- package/dist/eventbus/event-message-classes/index.js +3 -0
- package/dist/eventbus/event-message-classes/index.js.map +1 -1
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.d.ts +1 -0
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js +78 -38
- package/dist/eventbus/message-event-bus-writer/message-event-bus-log-writer.js.map +1 -1
- package/dist/events/maps/ai.event-map.d.ts +1 -0
- package/dist/events/maps/relay.event-map.d.ts +15 -0
- package/dist/events/relays/log-streaming.event-relay.d.ts +3 -0
- package/dist/events/relays/log-streaming.event-relay.js +35 -0
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +18 -2
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/execution-lifecycle/restore-binary-data-id.js +39 -21
- package/dist/execution-lifecycle/restore-binary-data-id.js.map +1 -1
- package/dist/executions/parse-range-query.middleware.js +6 -4
- package/dist/executions/parse-range-query.middleware.js.map +1 -1
- package/dist/expression-observability/expression-observability.constants.d.ts +8 -0
- package/dist/expression-observability/expression-observability.constants.js +14 -0
- package/dist/expression-observability/expression-observability.constants.js.map +1 -0
- package/dist/expression-observability/expression-observability.formatters.d.ts +4 -0
- package/dist/expression-observability/expression-observability.formatters.js +36 -0
- package/dist/expression-observability/expression-observability.formatters.js.map +1 -0
- package/dist/expression-observability/expression-observability.provider.d.ts +22 -0
- package/dist/expression-observability/expression-observability.provider.js +193 -0
- package/dist/expression-observability/expression-observability.provider.js.map +1 -0
- package/dist/external-hooks.js.map +1 -1
- package/dist/instance-settings-loader/instance-settings-loader.service.d.ts +5 -3
- package/dist/instance-settings-loader/instance-settings-loader.service.js +10 -6
- package/dist/instance-settings-loader/instance-settings-loader.service.js.map +1 -1
- package/dist/instance-settings-loader/loaders/log-streaming.instance-settings-loader.d.ts +12 -0
- package/dist/instance-settings-loader/loaders/log-streaming.instance-settings-loader.js +136 -0
- package/dist/instance-settings-loader/loaders/log-streaming.instance-settings-loader.js.map +1 -0
- package/dist/instance-settings-loader/loaders/sso.instance-settings-loader.d.ts +20 -0
- package/dist/instance-settings-loader/loaders/sso.instance-settings-loader.js +198 -0
- package/dist/instance-settings-loader/loaders/sso.instance-settings-loader.js.map +1 -0
- package/dist/middlewares/list-query/filter.d.ts +2 -3
- package/dist/middlewares/list-query/filter.js +3 -2
- package/dist/middlewares/list-query/filter.js.map +1 -1
- package/dist/middlewares/list-query/index.d.ts +2 -2
- package/dist/middlewares/list-query/index.js.map +1 -1
- package/dist/middlewares/list-query/pagination.js +8 -3
- package/dist/middlewares/list-query/pagination.js.map +1 -1
- package/dist/middlewares/list-query/select.js +3 -2
- package/dist/middlewares/list-query/select.js.map +1 -1
- package/dist/middlewares/list-query/sort-by.js +3 -2
- package/dist/middlewares/list-query/sort-by.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +1 -1
- package/dist/modules/chat-hub/stream-capturer.js.map +1 -1
- package/dist/modules/community-packages/npm-utils.js +79 -3
- package/dist/modules/community-packages/npm-utils.js.map +1 -1
- package/dist/modules/data-table/data-table-column.repository.d.ts +2 -0
- package/dist/modules/data-table/data-table-column.repository.js +21 -5
- package/dist/modules/data-table/data-table-column.repository.js.map +1 -1
- package/dist/modules/data-table/data-table.service.d.ts +8 -2
- package/dist/modules/data-table/data-table.service.js +16 -2
- package/dist/modules/data-table/data-table.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.d.ts +2 -2
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/utils.d.ts +2 -1
- package/dist/modules/dynamic-credentials.ee/utils.js.map +1 -1
- package/dist/modules/encryption-key-manager/encryption-bootstrap.service.d.ts +6 -0
- package/dist/modules/encryption-key-manager/encryption-bootstrap.service.js +28 -0
- package/dist/modules/encryption-key-manager/encryption-bootstrap.service.js.map +1 -0
- package/dist/modules/encryption-key-manager/encryption-key-manager.module.js +10 -1
- package/dist/modules/encryption-key-manager/encryption-key-manager.module.js.map +1 -1
- package/dist/modules/encryption-key-manager/encryption-key.controller.d.ts +8 -0
- package/dist/modules/encryption-key-manager/encryption-key.controller.js +62 -0
- package/dist/modules/encryption-key-manager/encryption-key.controller.js.map +1 -0
- package/dist/modules/encryption-key-manager/key-manager.service.d.ts +8 -5
- package/dist/modules/encryption-key-manager/key-manager.service.js +37 -10
- package/dist/modules/encryption-key-manager/key-manager.service.js.map +1 -1
- package/dist/modules/insights/database/entities/insights-by-period.js +8 -6
- package/dist/modules/insights/database/entities/insights-by-period.js.map +1 -1
- package/dist/modules/insights/database/entities/insights-raw.js +4 -3
- package/dist/modules/insights/database/entities/insights-raw.js.map +1 -1
- package/dist/modules/insights/database/entities/insights-shared.d.ts +6 -6
- package/dist/modules/insights/database/entities/insights-shared.js +3 -8
- package/dist/modules/insights/database/entities/insights-shared.js.map +1 -1
- package/dist/modules/instance-ai/entities/instance-ai-run-snapshot.entity.d.ts +2 -0
- package/dist/modules/instance-ai/entities/instance-ai-run-snapshot.entity.js +8 -0
- package/dist/modules/instance-ai/entities/instance-ai-run-snapshot.entity.js.map +1 -1
- package/dist/modules/instance-ai/eval/execution.service.js +4 -5
- package/dist/modules/instance-ai/eval/execution.service.js.map +1 -1
- package/dist/modules/instance-ai/eval/sub-agent-eval.service.d.ts +13 -0
- package/dist/modules/instance-ai/eval/sub-agent-eval.service.js +132 -0
- package/dist/modules/instance-ai/eval/sub-agent-eval.service.js.map +1 -0
- package/dist/modules/instance-ai/eval/sub-agent-roles.d.ts +7 -0
- package/dist/modules/instance-ai/eval/sub-agent-roles.js +21 -0
- package/dist/modules/instance-ai/eval/sub-agent-roles.js.map +1 -0
- package/dist/modules/instance-ai/eval/workflow-analysis.js +59 -51
- package/dist/modules/instance-ai/eval/workflow-analysis.js.map +1 -1
- package/dist/modules/instance-ai/filesystem/local-gateway.d.ts +7 -2
- package/dist/modules/instance-ai/filesystem/local-gateway.js +7 -0
- package/dist/modules/instance-ai/filesystem/local-gateway.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.adapter.service.d.ts +3 -2
- package/dist/modules/instance-ai/instance-ai.adapter.service.js +92 -9
- package/dist/modules/instance-ai/instance-ai.adapter.service.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.controller.d.ts +11 -2
- package/dist/modules/instance-ai/instance-ai.controller.js +66 -3
- package/dist/modules/instance-ai/instance-ai.controller.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.module.js +1 -1
- package/dist/modules/instance-ai/instance-ai.module.js.map +1 -1
- package/dist/modules/instance-ai/instance-ai.service.d.ts +14 -3
- package/dist/modules/instance-ai/instance-ai.service.js +266 -42
- package/dist/modules/instance-ai/instance-ai.service.js.map +1 -1
- package/dist/modules/instance-ai/storage/db-snapshot-storage.d.ts +12 -2
- package/dist/modules/instance-ai/storage/db-snapshot-storage.js +25 -3
- package/dist/modules/instance-ai/storage/db-snapshot-storage.js.map +1 -1
- package/dist/modules/instance-ai/web-research/cache.js.map +1 -1
- package/dist/modules/instance-registry/instance-registry.module.js +4 -1
- package/dist/modules/instance-registry/instance-registry.module.js.map +1 -1
- package/dist/modules/ldap.ee/helpers.ee.js +13 -0
- package/dist/modules/ldap.ee/helpers.ee.js.map +1 -1
- package/dist/modules/ldap.ee/ldap.service.ee.d.ts +1 -0
- package/dist/modules/ldap.ee/ldap.service.ee.js +33 -8
- package/dist/modules/ldap.ee/ldap.service.ee.js.map +1 -1
- package/dist/modules/log-streaming.ee/destinations/message-event-bus-destination-webhook.ee.js.map +1 -1
- package/dist/modules/log-streaming.ee/log-streaming.controller.d.ts +4 -1
- package/dist/modules/log-streaming.ee/log-streaming.controller.js +13 -2
- package/dist/modules/log-streaming.ee/log-streaming.controller.js.map +1 -1
- package/dist/modules/mcp/mcp-api-key.service.d.ts +4 -3
- package/dist/modules/mcp/mcp-api-key.service.js +17 -24
- package/dist/modules/mcp/mcp-api-key.service.js.map +1 -1
- package/dist/modules/mcp/mcp-oauth-consent.service.js +2 -2
- package/dist/modules/mcp/mcp-oauth-consent.service.js.map +1 -1
- package/dist/modules/mcp/mcp-server-middleware.service.d.ts +2 -2
- package/dist/modules/mcp/mcp-server-middleware.service.js +3 -3
- package/dist/modules/mcp/mcp-server-middleware.service.js.map +1 -1
- package/dist/modules/mcp/mcp.service.d.ts +3 -1
- package/dist/modules/mcp/mcp.service.js +9 -6
- package/dist/modules/mcp/mcp.service.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.d.ts +3 -1
- package/dist/modules/mcp/mcp.settings.controller.js +15 -2
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.types.d.ts +1 -0
- package/dist/modules/mcp/tools/execute-workflow.tool.d.ts +6 -6
- package/dist/modules/mcp/tools/publish-workflow.tool.d.ts +2 -1
- package/dist/modules/mcp/tools/publish-workflow.tool.js +3 -1
- package/dist/modules/mcp/tools/publish-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/unpublish-workflow.tool.d.ts +2 -1
- package/dist/modules/mcp/tools/unpublish-workflow.tool.js +3 -1
- package/dist/modules/mcp/tools/unpublish-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js +1 -0
- package/dist/modules/mcp/tools/workflow-builder/create-workflow-from-code.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/delete-workflow.tool.d.ts +3 -1
- package/dist/modules/mcp/tools/workflow-builder/delete-workflow.tool.js +5 -1
- package/dist/modules/mcp/tools/workflow-builder/delete-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.d.ts +2 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js +4 -1
- package/dist/modules/mcp/tools/workflow-builder/update-workflow.tool.js.map +1 -1
- package/dist/modules/otel/execution-level-tracer.d.ts +22 -0
- package/dist/modules/otel/execution-level-tracer.js +241 -0
- package/dist/modules/otel/execution-level-tracer.js.map +1 -0
- package/dist/modules/otel/execution-level-tracer.types.d.ts +41 -0
- package/dist/modules/otel/execution-level-tracer.types.js +3 -0
- package/dist/modules/otel/execution-level-tracer.types.js.map +1 -0
- package/dist/modules/otel/otel-lifecycle-handler.d.ts +17 -0
- package/dist/modules/otel/otel-lifecycle-handler.js +157 -0
- package/dist/modules/otel/otel-lifecycle-handler.js.map +1 -0
- package/dist/modules/otel/otel.config.d.ts +1 -0
- package/dist/modules/otel/otel.config.js +5 -0
- package/dist/modules/otel/otel.config.js.map +1 -1
- package/dist/modules/otel/otel.constants.d.ts +1 -0
- package/dist/modules/otel/otel.constants.js +1 -0
- package/dist/modules/otel/otel.constants.js.map +1 -1
- package/dist/modules/otel/otel.module.d.ts +2 -1
- package/dist/modules/otel/otel.module.js +12 -1
- package/dist/modules/otel/otel.module.js.map +1 -1
- package/dist/modules/otel/tracing-context.d.ts +13 -0
- package/dist/modules/otel/tracing-context.js +55 -0
- package/dist/modules/otel/tracing-context.js.map +1 -0
- package/dist/modules/provisioning.ee/provisioning.controller.ee.d.ts +5 -5
- package/dist/modules/provisioning.ee/provisioning.controller.ee.js +8 -8
- package/dist/modules/provisioning.ee/provisioning.controller.ee.js.map +1 -1
- package/dist/modules/provisioning.ee/provisioning.service.ee.d.ts +3 -2
- package/dist/modules/provisioning.ee/provisioning.service.ee.js +30 -15
- package/dist/modules/provisioning.ee/provisioning.service.ee.js.map +1 -1
- package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.d.ts +2 -0
- package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js +18 -3
- package/dist/modules/provisioning.ee/role-mapping-rule.service.ee.js.map +1 -1
- package/dist/modules/quick-connect/quick-connect.config.js.map +1 -1
- package/dist/modules/sso-oidc/oidc.controller.ee.d.ts +3 -4
- package/dist/modules/sso-oidc/oidc.controller.ee.js +6 -6
- package/dist/modules/sso-oidc/oidc.controller.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml-helpers.d.ts +1 -0
- package/dist/modules/sso-saml/saml-helpers.js +15 -1
- package/dist/modules/sso-saml/saml-helpers.js.map +1 -1
- package/dist/modules/sso-saml/saml.controller.ee.d.ts +3 -1
- package/dist/modules/sso-saml/saml.controller.ee.js +45 -14
- package/dist/modules/sso-saml/saml.controller.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.service.ee.d.ts +8 -3
- package/dist/modules/sso-saml/saml.service.ee.js +43 -18
- package/dist/modules/sso-saml/saml.service.ee.js.map +1 -1
- package/dist/modules/token-exchange/services/scoped-jwt.strategy.d.ts +3 -2
- package/dist/modules/token-exchange/services/scoped-jwt.strategy.js +17 -6
- package/dist/modules/token-exchange/services/scoped-jwt.strategy.js.map +1 -1
- package/dist/modules/token-exchange/services/trusted-key.service.d.ts +0 -1
- package/dist/modules/token-exchange/services/trusted-key.service.js +8 -9
- package/dist/modules/token-exchange/services/trusted-key.service.js.map +1 -1
- package/dist/oauth/oauth.service.d.ts +1 -0
- package/dist/oauth/oauth.service.js +12 -1
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/public-api/index.js +0 -3
- package/dist/public-api/index.js.map +1 -1
- package/dist/public-api/types.d.ts +15 -1
- package/dist/public-api/v1/handlers/credentials/credentials.service.js +10 -2
- package/dist/public-api/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/public-api/v1/handlers/data-tables/data-tables.columns.handler.d.ts +21 -0
- package/dist/public-api/v1/handlers/data-tables/data-tables.columns.handler.js +85 -0
- package/dist/public-api/v1/handlers/data-tables/data-tables.columns.handler.js.map +1 -0
- package/dist/public-api/v1/handlers/data-tables/data-tables.handler.js +10 -10
- package/dist/public-api/v1/handlers/data-tables/data-tables.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/data-tables/data-tables.rows.handler.js +7 -18
- package/dist/public-api/v1/handlers/data-tables/data-tables.rows.handler.js.map +1 -1
- package/dist/public-api/v1/handlers/data-tables/data-tables.service.d.ts +0 -1
- package/dist/public-api/v1/handlers/data-tables/data-tables.service.js +0 -13
- package/dist/public-api/v1/handlers/data-tables/data-tables.service.js.map +1 -1
- package/dist/public-api/v1/handlers/folders/folders.handler.d.ts +29 -0
- package/dist/public-api/v1/handlers/folders/folders.handler.js +112 -0
- package/dist/public-api/v1/handlers/folders/folders.handler.js.map +1 -0
- package/dist/public-api/v1/handlers/users/users.handler.ee.js +2 -12
- package/dist/public-api/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +494 -0
- package/dist/public-api/v1/shared/handler.types.d.ts +3 -0
- package/dist/{modules/otel/handlers/interfaces.js → public-api/v1/shared/handler.types.js} +1 -1
- package/dist/public-api/v1/shared/handler.types.js.map +1 -0
- package/dist/public-api/v1/shared/middlewares/global.middleware.d.ts +3 -1
- package/dist/public-api/v1/shared/middlewares/global.middleware.js.map +1 -1
- package/dist/public-api/v1/shared/services/utils.service.d.ts +3 -0
- package/dist/public-api/v1/shared/services/utils.service.js +18 -0
- package/dist/public-api/v1/shared/services/utils.service.js.map +1 -0
- package/dist/push/index.d.ts +1 -1
- package/dist/push/index.js +11 -1
- package/dist/push/index.js.map +1 -1
- package/dist/push/push-helpers.d.ts +6 -0
- package/dist/push/push-helpers.js +20 -0
- package/dist/push/push-helpers.js.map +1 -0
- package/dist/requests.d.ts +2 -0
- package/dist/requests.js +5 -0
- package/dist/requests.js.map +1 -1
- package/dist/scaling/job-processor.js +7 -2
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/multi-main-setup.ee.js +1 -1
- package/dist/scaling/multi-main-setup.ee.js.map +1 -1
- package/dist/server.js +4 -0
- package/dist/server.js.map +1 -1
- package/dist/services/ai-gateway.service.d.ts +4 -1
- package/dist/services/ai-gateway.service.js +17 -2
- package/dist/services/ai-gateway.service.js.map +1 -1
- package/dist/services/api-key-auth.strategy.d.ts +3 -2
- package/dist/services/api-key-auth.strategy.js +24 -13
- package/dist/services/api-key-auth.strategy.js.map +1 -1
- package/dist/services/auth-strategy.registry.d.ts +3 -2
- package/dist/services/auth-strategy.registry.js +12 -0
- package/dist/services/auth-strategy.registry.js.map +1 -1
- package/dist/services/auth-strategy.types.d.ts +7 -1
- package/dist/services/dynamic-node-parameters.service.js +23 -8
- package/dist/services/dynamic-node-parameters.service.js.map +1 -1
- package/dist/services/folder.service.d.ts +3 -2
- package/dist/services/folder.service.js +4 -2
- package/dist/services/folder.service.js.map +1 -1
- package/dist/services/frontend.service.d.ts +1 -0
- package/dist/services/frontend.service.js +9 -1
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/instance-registry-proxy.service.d.ts +11 -0
- package/dist/services/instance-registry-proxy.service.js +33 -0
- package/dist/services/instance-registry-proxy.service.js.map +1 -0
- package/dist/services/last-active-at.service.d.ts +1 -2
- package/dist/services/last-active-at.service.js.map +1 -1
- package/dist/services/rate-limit.service.js.map +1 -1
- package/dist/services/redis-client.service.js +1 -1
- package/dist/services/redis-client.service.js.map +1 -1
- package/dist/services/user.service.d.ts +4 -1
- package/dist/services/user.service.js +26 -2
- package/dist/services/user.service.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.js +1 -1
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/utils/inverter.d.ts +1 -0
- package/dist/utils/inverter.js +11 -0
- package/dist/utils/inverter.js.map +1 -0
- package/dist/webhooks/live-webhooks.d.ts +3 -2
- package/dist/webhooks/live-webhooks.js +8 -3
- package/dist/webhooks/live-webhooks.js.map +1 -1
- package/dist/webhooks/node-type-matcher.d.ts +3 -0
- package/dist/webhooks/node-type-matcher.js +7 -0
- package/dist/webhooks/node-type-matcher.js.map +1 -0
- package/dist/webhooks/test-webhooks.d.ts +5 -3
- package/dist/webhooks/test-webhooks.js +14 -5
- package/dist/webhooks/test-webhooks.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.d.ts +4 -1
- package/dist/webhooks/waiting-webhooks.js +17 -2
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/webhooks/webhook-helpers.js +10 -0
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook-request-handler.d.ts +3 -2
- package/dist/webhooks/webhook-request-handler.js +8 -6
- package/dist/webhooks/webhook-request-handler.js.map +1 -1
- package/dist/webhooks/webhook.service.js +2 -2
- package/dist/webhooks/webhook.service.js.map +1 -1
- package/dist/webhooks/webhook.types.d.ts +3 -1
- package/dist/workflow-execute-additional-data.d.ts +6 -2
- package/dist/workflow-execute-additional-data.js +3 -1
- package/dist/workflow-execute-additional-data.js.map +1 -1
- package/dist/workflow-runner.js.map +1 -1
- package/dist/workflows/workflow-validation.service.js +3 -0
- package/dist/workflows/workflow-validation.service.js.map +1 -1
- package/dist/workflows/workflow.service.d.ts +1 -0
- package/dist/workflows/workflow.service.js +6 -1
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +2 -2
- package/package.json +34 -33
- package/dist/instance-settings-loader/loaders/oidc.instance-settings-loader.d.ts +0 -13
- package/dist/instance-settings-loader/loaders/oidc.instance-settings-loader.js +0 -116
- package/dist/instance-settings-loader/loaders/oidc.instance-settings-loader.js.map +0 -1
- package/dist/modules/otel/handlers/interfaces.d.ts +0 -5
- package/dist/modules/otel/handlers/interfaces.js.map +0 -1
- package/dist/modules/otel/handlers/node-end.handler.d.ts +0 -8
- package/dist/modules/otel/handlers/node-end.handler.js +0 -71
- package/dist/modules/otel/handlers/node-end.handler.js.map +0 -1
- package/dist/modules/otel/handlers/node-start.handler.d.ts +0 -7
- package/dist/modules/otel/handlers/node-start.handler.js +0 -37
- package/dist/modules/otel/handlers/node-start.handler.js.map +0 -1
- package/dist/modules/otel/handlers/workflow-end.handler.d.ts +0 -8
- package/dist/modules/otel/handlers/workflow-end.handler.js +0 -73
- package/dist/modules/otel/handlers/workflow-end.handler.js.map +0 -1
- package/dist/modules/otel/handlers/workflow-start.handler.d.ts +0 -7
- package/dist/modules/otel/handlers/workflow-start.handler.js +0 -30
- package/dist/modules/otel/handlers/workflow-start.handler.js.map +0 -1
- package/dist/modules/otel/n8n-instrumentation.d.ts +0 -21
- package/dist/modules/otel/n8n-instrumentation.js +0 -103
- package/dist/modules/otel/n8n-instrumentation.js.map +0 -1
- package/dist/modules/otel/span-registry.d.ts +0 -14
- package/dist/modules/otel/span-registry.js +0 -58
- package/dist/modules/otel/span-registry.js.map +0 -1
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.TraceContextService = void 0;
|
|
13
|
+
const backend_common_1 = require("@n8n/backend-common");
|
|
14
|
+
const db_1 = require("@n8n/db");
|
|
15
|
+
const di_1 = require("@n8n/di");
|
|
16
|
+
let TraceContextService = class TraceContextService {
|
|
17
|
+
constructor(executionRepository, logger) {
|
|
18
|
+
this.executionRepository = executionRepository;
|
|
19
|
+
this.logger = logger;
|
|
20
|
+
}
|
|
21
|
+
async persist(executionId, tracingContext) {
|
|
22
|
+
try {
|
|
23
|
+
await this.executionRepository.update(executionId, { tracingContext });
|
|
24
|
+
}
|
|
25
|
+
catch (error) {
|
|
26
|
+
this.logger.error('Failed to persist tracing context', {
|
|
27
|
+
executionId,
|
|
28
|
+
error: error instanceof Error ? error.message : String(error),
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
async get(executionId) {
|
|
33
|
+
try {
|
|
34
|
+
const execution = await this.executionRepository.findOne({
|
|
35
|
+
where: { id: executionId },
|
|
36
|
+
select: ['tracingContext'],
|
|
37
|
+
});
|
|
38
|
+
return execution?.tracingContext ?? undefined;
|
|
39
|
+
}
|
|
40
|
+
catch (error) {
|
|
41
|
+
this.logger.error('Failed to load tracing context', {
|
|
42
|
+
executionId,
|
|
43
|
+
error: error instanceof Error ? error.message : String(error),
|
|
44
|
+
});
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
exports.TraceContextService = TraceContextService;
|
|
50
|
+
exports.TraceContextService = TraceContextService = __decorate([
|
|
51
|
+
(0, di_1.Service)(),
|
|
52
|
+
__metadata("design:paramtypes", [db_1.ExecutionRepository,
|
|
53
|
+
backend_common_1.Logger])
|
|
54
|
+
], TraceContextService);
|
|
55
|
+
//# sourceMappingURL=tracing-context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tracing-context.js","sourceRoot":"","sources":["../../../src/modules/otel/tracing-context.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAA6C;AAC7C,gCAA8C;AAC9C,gCAAkC;AAK3B,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YACkB,mBAAwC,EACxC,MAAc;QADd,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAMJ,KAAK,CAAC,OAAO,CAAC,WAAmB,EAAE,cAA8B;QAChE,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QACxE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE;gBACtD,WAAW;gBACX,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAKD,KAAK,CAAC,GAAG,CAAC,WAAmB;QAC5B,IAAI,CAAC;YACJ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE;gBAC1B,MAAM,EAAE,CAAC,gBAAgB,CAAC;aAC1B,CAAC,CAAC;YACH,OAAO,SAAS,EAAE,cAAc,IAAI,SAAS,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE;gBACnD,WAAW;gBACX,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;aAC7D,CAAC,CAAC;YACH,OAAO,SAAS,CAAC;QAClB,CAAC;IACF,CAAC;CACD,CAAA;AAvCY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,YAAO,GAAE;qCAG8B,wBAAmB;QAChC,uBAAM;GAHpB,mBAAmB,CAuC/B"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { AuthenticatedRequest } from '@n8n/db';
|
|
2
1
|
import { LicenseState } from '@n8n/backend-common';
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
2
|
+
import { InstanceSettingsLoaderConfig } from '@n8n/config';
|
|
3
|
+
import { AuthenticatedRequest } from '@n8n/db';
|
|
5
4
|
import { Response } from 'express';
|
|
5
|
+
import { ProvisioningService } from './provisioning.service.ee';
|
|
6
6
|
export declare class ProvisioningController {
|
|
7
7
|
private readonly provisioningService;
|
|
8
8
|
private readonly licenseState;
|
|
9
|
-
private readonly
|
|
10
|
-
constructor(provisioningService: ProvisioningService, licenseState: LicenseState,
|
|
9
|
+
private readonly instanceSettingsLoaderConfig;
|
|
10
|
+
constructor(provisioningService: ProvisioningService, licenseState: LicenseState, instanceSettingsLoaderConfig: InstanceSettingsLoaderConfig);
|
|
11
11
|
getConfig(_req: AuthenticatedRequest, res: Response): Promise<Response<any, Record<string, any>> | import("@n8n/api-types").ProvisioningConfigDto>;
|
|
12
12
|
patchConfig(req: AuthenticatedRequest, res: Response): Promise<Response<any, Record<string, any>> | import("@n8n/api-types").ProvisioningConfigDto>;
|
|
13
13
|
}
|
|
@@ -10,16 +10,16 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ProvisioningController = void 0;
|
|
13
|
-
const decorators_1 = require("@n8n/decorators");
|
|
14
13
|
const backend_common_1 = require("@n8n/backend-common");
|
|
15
|
-
const
|
|
16
|
-
const
|
|
14
|
+
const config_1 = require("@n8n/config");
|
|
15
|
+
const decorators_1 = require("@n8n/decorators");
|
|
16
|
+
const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
|
|
17
17
|
const provisioning_service_ee_1 = require("./provisioning.service.ee");
|
|
18
18
|
let ProvisioningController = class ProvisioningController {
|
|
19
|
-
constructor(provisioningService, licenseState,
|
|
19
|
+
constructor(provisioningService, licenseState, instanceSettingsLoaderConfig) {
|
|
20
20
|
this.provisioningService = provisioningService;
|
|
21
21
|
this.licenseState = licenseState;
|
|
22
|
-
this.
|
|
22
|
+
this.instanceSettingsLoaderConfig = instanceSettingsLoaderConfig;
|
|
23
23
|
}
|
|
24
24
|
async getConfig(_req, res) {
|
|
25
25
|
if (!this.licenseState.isProvisioningLicensed()) {
|
|
@@ -31,8 +31,8 @@ let ProvisioningController = class ProvisioningController {
|
|
|
31
31
|
if (!this.licenseState.isProvisioningLicensed()) {
|
|
32
32
|
return res.status(403).json({ message: 'Provisioning is not licensed' });
|
|
33
33
|
}
|
|
34
|
-
if (this.
|
|
35
|
-
throw new
|
|
34
|
+
if (this.instanceSettingsLoaderConfig.ssoManagedByEnv) {
|
|
35
|
+
throw new forbidden_error_1.ForbiddenError('Provisioning configuration is managed via environment variables and cannot be modified through the API');
|
|
36
36
|
}
|
|
37
37
|
return await this.provisioningService.patchConfig(req.body);
|
|
38
38
|
}
|
|
@@ -56,6 +56,6 @@ exports.ProvisioningController = ProvisioningController = __decorate([
|
|
|
56
56
|
(0, decorators_1.RestController)('/sso/provisioning'),
|
|
57
57
|
__metadata("design:paramtypes", [provisioning_service_ee_1.ProvisioningService,
|
|
58
58
|
backend_common_1.LicenseState,
|
|
59
|
-
|
|
59
|
+
config_1.InstanceSettingsLoaderConfig])
|
|
60
60
|
], ProvisioningController);
|
|
61
61
|
//# sourceMappingURL=provisioning.controller.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioning.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"provisioning.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAmD;AACnD,wCAA2D;AAE3D,gDAA0E;AAG1E,8EAA0E;AAE1E,uEAAgE;AAGzD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,mBAAwC,EACxC,YAA0B,EAC1B,4BAA0D;QAF1D,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,iCAA4B,GAA5B,4BAA4B,CAA8B;IACzE,CAAC;IAIE,AAAN,KAAK,CAAC,SAAS,CAAC,IAA0B,EAAE,GAAa;QACxD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,sBAAsB,EAAE,EAAE,CAAC;YACjD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC;IACnD,CAAC;IAIK,AAAN,KAAK,CAAC,WAAW,CAAC,GAAyB,EAAE,GAAa;QACzD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,sBAAsB,EAAE,EAAE,CAAC;YACjD,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,CAAC;QAC1E,CAAC;QAED,IAAI,IAAI,CAAC,4BAA4B,CAAC,eAAe,EAAE,CAAC;YACvD,MAAM,IAAI,gCAAc,CACvB,wGAAwG,CACxG,CAAC;QACH,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;CACD,CAAA;AAhCY,wDAAsB;AAS5B;IAFL,IAAA,gBAAG,EAAC,SAAS,CAAC;IACd,IAAA,wBAAW,EAAC,qBAAqB,CAAC;;;;uDAOlC;AAIK;IAFL,IAAA,kBAAK,EAAC,SAAS,CAAC;IAChB,IAAA,wBAAW,EAAC,qBAAqB,CAAC;;;;yDAalC;iCA/BW,sBAAsB;IADlC,IAAA,2BAAc,EAAC,mBAAmB,CAAC;qCAGI,6CAAmB;QAC1B,6BAAY;QACI,qCAA4B;GAJhE,sBAAsB,CAgClC"}
|
|
@@ -7,9 +7,9 @@ import { EventService } from '../../events/event.service';
|
|
|
7
7
|
import { Publisher } from '../../scaling/pubsub/publisher.service';
|
|
8
8
|
import { ProjectService } from '../../services/project.service.ee';
|
|
9
9
|
import { UserService } from '../../services/user.service';
|
|
10
|
+
import { RoleMappingRuleService } from './role-mapping-rule.service.ee';
|
|
10
11
|
import type { RoleResolverContext } from './role-resolver-types';
|
|
11
12
|
import { RoleResolverService } from './role-resolver.service.ee';
|
|
12
|
-
export declare function isExpressionMappingFlagEnabled(): boolean;
|
|
13
13
|
export declare class ProvisioningService {
|
|
14
14
|
private readonly eventService;
|
|
15
15
|
private readonly globalConfig;
|
|
@@ -24,8 +24,9 @@ export declare class ProvisioningService {
|
|
|
24
24
|
private readonly instanceSettings;
|
|
25
25
|
private readonly roleMappingRuleRepository;
|
|
26
26
|
private readonly roleResolverService;
|
|
27
|
+
private readonly roleMappingRuleService;
|
|
27
28
|
private provisioningConfig;
|
|
28
|
-
constructor(eventService: EventService, globalConfig: GlobalConfig, settingsRepository: SettingsRepository, projectRepository: ProjectRepository, projectService: ProjectService, roleRepository: RoleRepository, userRepository: UserRepository, userService: UserService, logger: Logger, publisher: Publisher, instanceSettings: InstanceSettings, roleMappingRuleRepository: RoleMappingRuleRepository, roleResolverService: RoleResolverService);
|
|
29
|
+
constructor(eventService: EventService, globalConfig: GlobalConfig, settingsRepository: SettingsRepository, projectRepository: ProjectRepository, projectService: ProjectService, roleRepository: RoleRepository, userRepository: UserRepository, userService: UserService, logger: Logger, publisher: Publisher, instanceSettings: InstanceSettings, roleMappingRuleRepository: RoleMappingRuleRepository, roleResolverService: RoleResolverService, roleMappingRuleService: RoleMappingRuleService);
|
|
29
30
|
init(): Promise<void>;
|
|
30
31
|
getConfig(): Promise<ProvisioningConfigDto>;
|
|
31
32
|
provisionInstanceRoleForUser(user: User, roleSlug: unknown): Promise<void>;
|
|
@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.ProvisioningService = void 0;
|
|
13
|
-
exports.isExpressionMappingFlagEnabled = isExpressionMappingFlagEnabled;
|
|
14
13
|
const api_types_1 = require("@n8n/api-types");
|
|
15
14
|
const backend_common_1 = require("@n8n/backend-common");
|
|
16
15
|
const config_1 = require("@n8n/config");
|
|
@@ -27,12 +26,10 @@ const publisher_service_1 = require("../../scaling/pubsub/publisher.service");
|
|
|
27
26
|
const project_service_ee_1 = require("../../services/project.service.ee");
|
|
28
27
|
const user_service_1 = require("../../services/user.service");
|
|
29
28
|
const constants_1 = require("./constants");
|
|
29
|
+
const role_mapping_rule_service_ee_1 = require("./role-mapping-rule.service.ee");
|
|
30
30
|
const role_resolver_service_ee_1 = require("./role-resolver.service.ee");
|
|
31
|
-
function isExpressionMappingFlagEnabled() {
|
|
32
|
-
return process.env.N8N_ENV_FEAT_ROLE_MAPPING_STRATEGY === 'true';
|
|
33
|
-
}
|
|
34
31
|
let ProvisioningService = class ProvisioningService {
|
|
35
|
-
constructor(eventService, globalConfig, settingsRepository, projectRepository, projectService, roleRepository, userRepository, userService, logger, publisher, instanceSettings, roleMappingRuleRepository, roleResolverService) {
|
|
32
|
+
constructor(eventService, globalConfig, settingsRepository, projectRepository, projectService, roleRepository, userRepository, userService, logger, publisher, instanceSettings, roleMappingRuleRepository, roleResolverService, roleMappingRuleService) {
|
|
36
33
|
this.eventService = eventService;
|
|
37
34
|
this.globalConfig = globalConfig;
|
|
38
35
|
this.settingsRepository = settingsRepository;
|
|
@@ -46,6 +43,7 @@ let ProvisioningService = class ProvisioningService {
|
|
|
46
43
|
this.instanceSettings = instanceSettings;
|
|
47
44
|
this.roleMappingRuleRepository = roleMappingRuleRepository;
|
|
48
45
|
this.roleResolverService = roleResolverService;
|
|
46
|
+
this.roleMappingRuleService = roleMappingRuleService;
|
|
49
47
|
}
|
|
50
48
|
async init() {
|
|
51
49
|
this.provisioningConfig = await this.loadConfig();
|
|
@@ -206,12 +204,13 @@ let ProvisioningService = class ProvisioningService {
|
|
|
206
204
|
'scopesProjectsRolesClaimName',
|
|
207
205
|
'scopesUseExpressionMapping',
|
|
208
206
|
];
|
|
207
|
+
const { deleteProjectRules: explicitDeleteProjectRules, ...configPatch } = patchConfig;
|
|
209
208
|
const updatedConfig = {
|
|
210
209
|
...currentConfig,
|
|
211
|
-
...
|
|
210
|
+
...configPatch,
|
|
212
211
|
};
|
|
213
212
|
for (const supportedPatchField of supportedPatchFields) {
|
|
214
|
-
if (
|
|
213
|
+
if (configPatch[supportedPatchField] === null) {
|
|
215
214
|
delete updatedConfig[supportedPatchField];
|
|
216
215
|
}
|
|
217
216
|
}
|
|
@@ -220,11 +219,28 @@ let ProvisioningService = class ProvisioningService {
|
|
|
220
219
|
throw new bad_request_error_1.BadRequestError('Expression-based mapping and direct-claim provisioning cannot both be enabled at the same time.');
|
|
221
220
|
}
|
|
222
221
|
api_types_1.ProvisioningConfigDto.parse(updatedConfig);
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
222
|
+
const previousProjectRoleManaged = currentConfig.scopesProvisionProjectRoles || currentConfig.scopesUseExpressionMapping;
|
|
223
|
+
const newProjectRoleManaged = updatedConfig.scopesProvisionProjectRoles ||
|
|
224
|
+
updatedConfig.scopesUseExpressionMapping;
|
|
225
|
+
const shouldDeleteProjectRules = explicitDeleteProjectRules === true || (previousProjectRoleManaged && !newProjectRoleManaged);
|
|
226
|
+
let deletedProjectRulesCount = 0;
|
|
227
|
+
await this.settingsRepository.manager.transaction(async (tx) => {
|
|
228
|
+
await tx.getRepository(db_1.Settings).upsert({
|
|
229
|
+
key: constants_1.PROVISIONING_PREFERENCES_DB_KEY,
|
|
230
|
+
value: JSON.stringify(updatedConfig),
|
|
231
|
+
loadOnStartup: true,
|
|
232
|
+
}, { conflictPaths: ['key'] });
|
|
233
|
+
if (shouldDeleteProjectRules) {
|
|
234
|
+
deletedProjectRulesCount = await this.roleMappingRuleService.deleteAllOfType('project', tx);
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
if (shouldDeleteProjectRules) {
|
|
238
|
+
this.eventService.emit('role-mapping-rules-bulk-deleted', {
|
|
239
|
+
ruleType: 'project',
|
|
240
|
+
count: deletedProjectRulesCount,
|
|
241
|
+
reason: 'strategy-switch',
|
|
242
|
+
});
|
|
243
|
+
}
|
|
228
244
|
this.provisioningConfig = await this.loadConfig();
|
|
229
245
|
if (this.instanceSettings.isMultiMain) {
|
|
230
246
|
await this.publisher.publishCommand({ command: 'reload-sso-provisioning-configuration' });
|
|
@@ -286,8 +302,6 @@ let ProvisioningService = class ProvisioningService {
|
|
|
286
302
|
return provisioningConfig.scopesProvisionProjectRoles;
|
|
287
303
|
}
|
|
288
304
|
async isExpressionMappingEnabled() {
|
|
289
|
-
if (!isExpressionMappingFlagEnabled())
|
|
290
|
-
return false;
|
|
291
305
|
const provisioningConfig = await this.getConfig();
|
|
292
306
|
return provisioningConfig.scopesUseExpressionMapping;
|
|
293
307
|
}
|
|
@@ -480,6 +494,7 @@ exports.ProvisioningService = ProvisioningService = __decorate([
|
|
|
480
494
|
publisher_service_1.Publisher,
|
|
481
495
|
n8n_core_1.InstanceSettings,
|
|
482
496
|
db_1.RoleMappingRuleRepository,
|
|
483
|
-
role_resolver_service_ee_1.RoleResolverService
|
|
497
|
+
role_resolver_service_ee_1.RoleResolverService,
|
|
498
|
+
role_mapping_rule_service_ee_1.RoleMappingRuleService])
|
|
484
499
|
], ProvisioningService);
|
|
485
500
|
//# sourceMappingURL=provisioning.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provisioning.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.service.ee.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"provisioning.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/provisioning.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { CreateRoleMappingRuleDto, type ListRoleMappingRuleQueryInput, type PatchRoleMappingRuleInput } from '@n8n/api-types';
|
|
2
2
|
import { ProjectRepository, RoleMappingRuleRepository, RoleRepository } from '@n8n/db';
|
|
3
|
+
import { type EntityManager } from '@n8n/typeorm';
|
|
3
4
|
import type { z } from 'zod';
|
|
4
5
|
type CreateRoleMappingRuleInput = z.infer<(typeof CreateRoleMappingRuleDto)['schema']>;
|
|
5
6
|
export type RoleMappingRuleResponse = {
|
|
@@ -27,6 +28,7 @@ export declare class RoleMappingRuleService {
|
|
|
27
28
|
delete(id: string): Promise<{
|
|
28
29
|
ruleType: 'instance' | 'project';
|
|
29
30
|
}>;
|
|
31
|
+
deleteAllOfType(type: 'instance' | 'project', tx?: EntityManager): Promise<number>;
|
|
30
32
|
move(id: string, targetIndex: number): Promise<RoleMappingRuleResponse>;
|
|
31
33
|
private applyOrder;
|
|
32
34
|
private normalizeOrderForType;
|
|
@@ -52,21 +52,31 @@ let RoleMappingRuleService = class RoleMappingRuleService {
|
|
|
52
52
|
throw new not_found_error_1.NotFoundError(`Could not find role with slug "${dto.role}"`);
|
|
53
53
|
}
|
|
54
54
|
(0, role_mapping_rule_validation_1.assertRoleCompatibleWithMappingType)(role, dto.type);
|
|
55
|
-
await this.assertOrderAvailable(dto.type, dto.order);
|
|
56
55
|
const projects = uniqueProjectIds.length > 0
|
|
57
56
|
? await this.projectRepository.findBy({ id: (0, typeorm_1.In)(uniqueProjectIds) })
|
|
58
57
|
: [];
|
|
59
58
|
if (projects.length !== uniqueProjectIds.length) {
|
|
60
59
|
throw new bad_request_error_1.BadRequestError('One or more projects were not found');
|
|
61
60
|
}
|
|
61
|
+
const existingRules = await this.roleMappingRuleRepository.find({
|
|
62
|
+
where: { type: dto.type },
|
|
63
|
+
select: ['id', 'order'],
|
|
64
|
+
order: { order: 'ASC' },
|
|
65
|
+
});
|
|
66
|
+
const requestedOrder = dto.order ?? existingRules.length;
|
|
67
|
+
const targetIndex = Math.min(Math.max(requestedOrder, 0), existingRules.length);
|
|
68
|
+
const maxOrder = existingRules.length > 0 ? existingRules[existingRules.length - 1].order : -1;
|
|
69
|
+
const tempOrder = Math.max(maxOrder, existingRules.length - 1) + 1;
|
|
62
70
|
const rule = new db_1.RoleMappingRule();
|
|
63
71
|
rule.expression = dto.expression;
|
|
64
72
|
rule.role = role;
|
|
65
73
|
rule.type = dto.type;
|
|
66
|
-
rule.order =
|
|
74
|
+
rule.order = tempOrder;
|
|
67
75
|
rule.projects = projects;
|
|
68
76
|
const saved = await this.roleMappingRuleRepository.save(rule);
|
|
69
|
-
|
|
77
|
+
const reorderedIds = existingRules.map((r) => r.id);
|
|
78
|
+
reorderedIds.splice(targetIndex, 0, saved.id);
|
|
79
|
+
await this.applyOrder(reorderedIds);
|
|
70
80
|
const loaded = await this.roleMappingRuleRepository.findOneOrFail({
|
|
71
81
|
where: { id: saved.id },
|
|
72
82
|
relations: ['projects', 'role'],
|
|
@@ -137,6 +147,11 @@ let RoleMappingRuleService = class RoleMappingRuleService {
|
|
|
137
147
|
await this.normalizeOrderForType(ruleType);
|
|
138
148
|
return { ruleType };
|
|
139
149
|
}
|
|
150
|
+
async deleteAllOfType(type, tx) {
|
|
151
|
+
const repo = tx ? tx.getRepository(db_1.RoleMappingRule) : this.roleMappingRuleRepository;
|
|
152
|
+
const result = await repo.delete({ type });
|
|
153
|
+
return result.affected ?? 0;
|
|
154
|
+
}
|
|
140
155
|
async move(id, targetIndex) {
|
|
141
156
|
if (typeof id !== 'string' || id.length === 0) {
|
|
142
157
|
throw new bad_request_error_1.BadRequestError('Rule id is required');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role-mapping-rule.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/role-mapping-rule.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAKA,gCAKiB;AACjB,gCAAkC;AAElC,
|
|
1
|
+
{"version":3,"file":"role-mapping-rule.service.ee.js","sourceRoot":"","sources":["../../../src/modules/provisioning.ee/role-mapping-rule.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-connect.config.js","sourceRoot":"","sources":["../../../src/modules/quick-connect/quick-connect.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAC1C,6BAAwB;AAExB,MAAM,4BAA4B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC7C,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;IAC1B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE;IAC5B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,MAAM,EAAE,OAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;IAC5B,iBAAiB,EAAE,OAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAEH,MAAM,gCAAgC,GAAG,4BAA4B,CAAC,MAAM,CAAC;IAC5E,gBAAgB,EAAE,OAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IACvC,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC;QAChB,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE;KACzB,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,4BAA4B,CAAC,MAAM,CAAC;IACvE,gBAAgB,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACxC,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,iBAAiB,EAAE,OAAC,CAAC,MAAM,CAAC;QAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;KAClB,CAAC;CACF,CAAC,CAAC;AAIH,MAAM,wBAAwB,GAAG,OAAC,CAAC,KAAK,CAAC;IACxC,2BAA2B;IAC3B,gCAAgC;IAChC,4BAA4B;CAC5B,CAAC,CAAC;AAIH,MAAM,yBAAyB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAChD,OAAC,CAAC,UAAU,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"quick-connect.config.js","sourceRoot":"","sources":["../../../src/modules/quick-connect/quick-connect.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA0C;AAC1C,6BAAwB;AAExB,MAAM,4BAA4B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC7C,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE;IAC1B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE;IAC5B,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAClC,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACtC,MAAM,EAAE,OAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;IAC5B,iBAAiB,EAAE,OAAC,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;CACvC,CAAC,CAAC;AAEH,MAAM,gCAAgC,GAAG,4BAA4B,CAAC,MAAM,CAAC;IAC5E,gBAAgB,EAAE,OAAC,CAAC,OAAO,CAAC,UAAU,CAAC;IACvC,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC;QAChB,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE;KACzB,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,2BAA2B,GAAG,4BAA4B,CAAC,MAAM,CAAC;IACvE,gBAAgB,EAAE,OAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IACxC,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE;IACvB,iBAAiB,EAAE,OAAC,CAAC,MAAM,CAAC;QAC3B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;KAClB,CAAC;CACF,CAAC,CAAC;AAIH,MAAM,wBAAwB,GAAG,OAAC,CAAC,KAAK,CAAC;IACxC,2BAA2B;IAC3B,gCAAgC;IAChC,4BAA4B;CAC5B,CAAC,CAAC;AAIH,MAAM,yBAAyB,GAAG,OAAC,CAAC,MAAM,EAAE,CAAC,IAAI,CAChD,OAAC,CAAC,UAAU,CAAC,CAAC,KAAc,EAAE,EAAE;IAC/B,IAAI,CAAC;QACJ,OAAO,IAAI,CAAC,KAAK,CAAC,KAAe,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,EAAE,CAAC;IACX,CAAC;AACF,CAAC,EAAE,OAAC,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC,CACrC,CAAC;AAKK,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAGN,YAAO,GAAwB,EAAE,CAAC;IACnC,CAAC;CAAA,CAAA;AAJY,gDAAkB;AAG9B;IADC,IAAA,YAAG,EAAC,2BAA2B,EAAE,yBAAyB,CAAC;;mDAC1B;6BAHtB,kBAAkB;IAD9B,eAAM;GACM,kBAAkB,CAI9B"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { OidcConfigDto } from '@n8n/api-types';
|
|
2
2
|
import { Logger } from '@n8n/backend-common';
|
|
3
|
-
import { GlobalConfig } from '@n8n/config';
|
|
3
|
+
import { GlobalConfig, InstanceSettingsLoaderConfig } from '@n8n/config';
|
|
4
4
|
import { AuthenticatedRequest } from '@n8n/db';
|
|
5
5
|
import { Request, Response } from 'express';
|
|
6
6
|
import { AuthService } from '../../auth/auth.service';
|
|
7
|
-
import { OidcInstanceSettingsLoader } from '../../instance-settings-loader/loaders/oidc.instance-settings-loader';
|
|
8
7
|
import { AuthlessRequest } from '../../requests';
|
|
9
8
|
import { UrlService } from '../../services/url.service';
|
|
10
9
|
import { OidcService } from './oidc.service.ee';
|
|
@@ -14,8 +13,8 @@ export declare class OidcController {
|
|
|
14
13
|
private readonly urlService;
|
|
15
14
|
private readonly globalConfig;
|
|
16
15
|
private readonly logger;
|
|
17
|
-
private readonly
|
|
18
|
-
constructor(oidcService: OidcService, authService: AuthService, urlService: UrlService, globalConfig: GlobalConfig, logger: Logger,
|
|
16
|
+
private readonly instanceSettingsLoaderConfig;
|
|
17
|
+
constructor(oidcService: OidcService, authService: AuthService, urlService: UrlService, globalConfig: GlobalConfig, logger: Logger, instanceSettingsLoaderConfig: InstanceSettingsLoaderConfig);
|
|
19
18
|
retrieveConfiguration(_req: AuthenticatedRequest): Promise<Pick<OidcConfigDto, "clientId" | "clientSecret" | "loginEnabled" | "prompt" | "authenticationContextClassReference"> & {
|
|
20
19
|
discoveryEndpoint: URL;
|
|
21
20
|
}>;
|
|
@@ -21,19 +21,19 @@ const decorators_1 = require("@n8n/decorators");
|
|
|
21
21
|
const auth_service_1 = require("../../auth/auth.service");
|
|
22
22
|
const constants_2 = require("../../constants");
|
|
23
23
|
const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
|
|
24
|
-
const
|
|
24
|
+
const forbidden_error_1 = require("../../errors/response-errors/forbidden.error");
|
|
25
25
|
const url_service_1 = require("../../services/url.service");
|
|
26
26
|
const constants_3 = require("./constants");
|
|
27
27
|
const oidc_service_ee_1 = require("./oidc.service.ee");
|
|
28
28
|
const oidc_test_result_1 = require("./views/oidc-test-result");
|
|
29
29
|
let OidcController = class OidcController {
|
|
30
|
-
constructor(oidcService, authService, urlService, globalConfig, logger,
|
|
30
|
+
constructor(oidcService, authService, urlService, globalConfig, logger, instanceSettingsLoaderConfig) {
|
|
31
31
|
this.oidcService = oidcService;
|
|
32
32
|
this.authService = authService;
|
|
33
33
|
this.urlService = urlService;
|
|
34
34
|
this.globalConfig = globalConfig;
|
|
35
35
|
this.logger = logger;
|
|
36
|
-
this.
|
|
36
|
+
this.instanceSettingsLoaderConfig = instanceSettingsLoaderConfig;
|
|
37
37
|
}
|
|
38
38
|
async retrieveConfiguration(_req) {
|
|
39
39
|
const config = await this.oidcService.loadConfig();
|
|
@@ -43,8 +43,8 @@ let OidcController = class OidcController {
|
|
|
43
43
|
return config;
|
|
44
44
|
}
|
|
45
45
|
async saveConfiguration(_req, _res, payload) {
|
|
46
|
-
if (this.
|
|
47
|
-
throw new
|
|
46
|
+
if (this.instanceSettingsLoaderConfig.ssoManagedByEnv) {
|
|
47
|
+
throw new forbidden_error_1.ForbiddenError('OIDC configuration is managed via environment variables and cannot be modified through the API');
|
|
48
48
|
}
|
|
49
49
|
await this.oidcService.updateConfig(payload);
|
|
50
50
|
const config = this.oidcService.getRedactedConfig();
|
|
@@ -161,6 +161,6 @@ exports.OidcController = OidcController = __decorate([
|
|
|
161
161
|
url_service_1.UrlService,
|
|
162
162
|
config_1.GlobalConfig,
|
|
163
163
|
backend_common_1.Logger,
|
|
164
|
-
|
|
164
|
+
config_1.InstanceSettingsLoaderConfig])
|
|
165
165
|
], OidcController);
|
|
166
166
|
//# sourceMappingURL=oidc.controller.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/sso-oidc/oidc.controller.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAA+C;AAC/C,wDAA6C;AAC7C,
|
|
1
|
+
{"version":3,"file":"oidc.controller.ee.js","sourceRoot":"","sources":["../../../src/modules/sso-oidc/oidc.controller.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,4 +17,5 @@ export declare function getMappedSamlAttributesFromFlowResult(flowResult: FlowRe
|
|
|
17
17
|
projectRoles: string | null;
|
|
18
18
|
}): GetMappedSamlReturn;
|
|
19
19
|
export declare function isConnectionTestRequest(payload: SamlAcsDto): boolean;
|
|
20
|
+
export declare function extractTestIdFromRelayState(relayState: string | undefined): string | undefined;
|
|
20
21
|
export {};
|
|
@@ -7,6 +7,7 @@ exports.createUserFromSamlAttributes = createUserFromSamlAttributes;
|
|
|
7
7
|
exports.updateUserFromSamlAttributes = updateUserFromSamlAttributes;
|
|
8
8
|
exports.getMappedSamlAttributesFromFlowResult = getMappedSamlAttributesFromFlowResult;
|
|
9
9
|
exports.isConnectionTestRequest = isConnectionTestRequest;
|
|
10
|
+
exports.extractTestIdFromRelayState = extractTestIdFromRelayState;
|
|
10
11
|
const config_1 = require("@n8n/config");
|
|
11
12
|
const db_1 = require("@n8n/db");
|
|
12
13
|
const di_1 = require("@n8n/di");
|
|
@@ -127,6 +128,19 @@ function getMappedSamlAttributesFromFlowResult(flowResult, attributeMapping, jit
|
|
|
127
128
|
return result;
|
|
128
129
|
}
|
|
129
130
|
function isConnectionTestRequest(payload) {
|
|
130
|
-
|
|
131
|
+
if (!payload.RelayState)
|
|
132
|
+
return false;
|
|
133
|
+
return payload.RelayState.startsWith((0, service_provider_ee_1.getServiceProviderConfigTestReturnUrl)());
|
|
134
|
+
}
|
|
135
|
+
function extractTestIdFromRelayState(relayState) {
|
|
136
|
+
if (!relayState)
|
|
137
|
+
return undefined;
|
|
138
|
+
try {
|
|
139
|
+
const url = new URL(relayState);
|
|
140
|
+
return url.searchParams.get('t') ?? undefined;
|
|
141
|
+
}
|
|
142
|
+
catch {
|
|
143
|
+
return undefined;
|
|
144
|
+
}
|
|
131
145
|
}
|
|
132
146
|
//# sourceMappingURL=saml-helpers.js.map
|