n8n 1.42.1 → 1.43.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/AbstractServer.js +4 -1
- package/dist/AbstractServer.js.map +1 -1
- package/dist/ActiveWebhooks.js +2 -2
- package/dist/ActiveWebhooks.js.map +1 -1
- package/dist/ActiveWorkflowManager.js +2 -7
- package/dist/ActiveWorkflowManager.js.map +1 -1
- package/dist/CredentialsHelper.d.ts +5 -7
- package/dist/CredentialsHelper.js +38 -34
- package/dist/CredentialsHelper.js.map +1 -1
- package/dist/Interfaces.d.ts +2 -1
- package/dist/Interfaces.js.map +1 -1
- package/dist/InternalHooks.d.ts +29 -3
- package/dist/InternalHooks.js +39 -9
- package/dist/InternalHooks.js.map +1 -1
- package/dist/Ldap/helpers.d.ts +1 -29
- package/dist/Ldap/helpers.js +16 -7
- package/dist/Ldap/helpers.js.map +1 -1
- package/dist/Ldap/ldap.service.js +1 -1
- package/dist/Ldap/ldap.service.js.map +1 -1
- package/dist/License.d.ts +4 -0
- package/dist/License.js +13 -0
- package/dist/License.js.map +1 -1
- package/dist/Mfa/mfa.service.d.ts +1 -1
- package/dist/Mfa/mfa.service.js +22 -10
- package/dist/Mfa/mfa.service.js.map +1 -1
- package/dist/PublicApi/types.d.ts +5 -2
- package/dist/PublicApi/types.js.map +1 -1
- package/dist/PublicApi/v1/handlers/audit/audit.handler.d.ts +3 -1
- package/dist/PublicApi/v1/handlers/audit/audit.handler.js +1 -1
- package/dist/PublicApi/v1/handlers/audit/audit.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/credentials/credentials.handler.d.ts +6 -5
- package/dist/PublicApi/v1/handlers/credentials/credentials.handler.js +1 -3
- package/dist/PublicApi/v1/handlers/credentials/credentials.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/credentials/credentials.service.js +4 -2
- package/dist/PublicApi/v1/handlers/credentials/credentials.service.js.map +1 -1
- package/dist/PublicApi/v1/handlers/executions/executions.handler.d.ts +2 -2
- package/dist/PublicApi/v1/handlers/executions/executions.handler.js +3 -6
- package/dist/PublicApi/v1/handlers/executions/executions.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/sourceControl/sourceControl.handler.d.ts +3 -1
- package/dist/PublicApi/v1/handlers/sourceControl/sourceControl.handler.js +1 -1
- package/dist/PublicApi/v1/handlers/sourceControl/sourceControl.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/tags/tags.handler.d.ts +15 -5
- package/dist/PublicApi/v1/handlers/tags/tags.handler.js +5 -5
- package/dist/PublicApi/v1/handlers/tags/tags.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/users/users.handler.ee.d.ts +6 -3
- package/dist/PublicApi/v1/handlers/users/users.handler.ee.js +2 -2
- package/dist/PublicApi/v1/handlers/users/users.handler.ee.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.d.ts +22 -8
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js +48 -44
- package/dist/PublicApi/v1/handlers/workflows/workflows.handler.js.map +1 -1
- package/dist/PublicApi/v1/handlers/workflows/workflows.service.d.ts +4 -2
- package/dist/PublicApi/v1/handlers/workflows/workflows.service.js +18 -13
- package/dist/PublicApi/v1/handlers/workflows/workflows.service.js.map +1 -1
- package/dist/PublicApi/v1/shared/middlewares/global.middleware.d.ts +8 -2
- package/dist/PublicApi/v1/shared/middlewares/global.middleware.js +22 -7
- package/dist/PublicApi/v1/shared/middlewares/global.middleware.js.map +1 -1
- package/dist/Server.js +4 -0
- package/dist/Server.js.map +1 -1
- package/dist/UserManagement/PermissionChecker.d.ts +4 -6
- package/dist/UserManagement/PermissionChecker.js +22 -31
- package/dist/UserManagement/PermissionChecker.js.map +1 -1
- package/dist/UserManagement/email/NodeMailer.js +1 -0
- package/dist/UserManagement/email/NodeMailer.js.map +1 -1
- package/dist/WaitTracker.js +3 -3
- package/dist/WaitTracker.js.map +1 -1
- package/dist/WaitingWebhooks.js +1 -8
- package/dist/WaitingWebhooks.js.map +1 -1
- package/dist/WebhookHelpers.js +7 -14
- package/dist/WebhookHelpers.js.map +1 -1
- package/dist/WorkflowExecuteAdditionalData.d.ts +2 -2
- package/dist/WorkflowExecuteAdditionalData.js +10 -11
- package/dist/WorkflowExecuteAdditionalData.js.map +1 -1
- package/dist/WorkflowRunner.js +1 -1
- package/dist/WorkflowRunner.js.map +1 -1
- package/dist/auth/auth.service.js +2 -2
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/import/credentials.d.ts +2 -2
- package/dist/commands/import/credentials.js +55 -31
- package/dist/commands/import/credentials.js.map +1 -1
- package/dist/commands/import/workflow.d.ts +2 -1
- package/dist/commands/import/workflow.js +50 -21
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/ldap/reset.d.ts +9 -0
- package/dist/commands/ldap/reset.js +96 -1
- package/dist/commands/ldap/reset.js.map +1 -1
- package/dist/commands/mfa/disable.js +11 -2
- package/dist/commands/mfa/disable.js.map +1 -1
- package/dist/commands/user-management/reset.js +5 -3
- package/dist/commands/user-management/reset.js.map +1 -1
- package/dist/commands/worker.js +1 -3
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +1 -0
- package/dist/config/schema.d.ts +6 -0
- package/dist/config/schema.js +6 -0
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +19 -14
- package/dist/constants.js +5 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/auth.controller.js +2 -2
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/dynamicNodeParameters.controller.d.ts +3 -5
- package/dist/controllers/dynamicNodeParameters.controller.js +11 -39
- package/dist/controllers/dynamicNodeParameters.controller.js.map +1 -1
- package/dist/controllers/invitation.controller.js +3 -3
- package/dist/controllers/invitation.controller.js.map +1 -1
- package/dist/controllers/oauth/abstractOAuth.controller.js +1 -1
- package/dist/controllers/oauth/abstractOAuth.controller.js.map +1 -1
- package/dist/controllers/passwordReset.controller.js +4 -4
- package/dist/controllers/passwordReset.controller.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +32 -0
- package/dist/controllers/project.controller.js +227 -0
- package/dist/controllers/project.controller.js.map +1 -0
- package/dist/controllers/role.controller.d.ts +13 -0
- package/dist/controllers/role.controller.js +42 -0
- package/dist/controllers/role.controller.js.map +1 -0
- package/dist/controllers/users.controller.d.ts +9 -3
- package/dist/controllers/users.controller.js +62 -64
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/controllers/workflowStatistics.controller.d.ts +1 -1
- package/dist/controllers/workflowStatistics.controller.js +5 -3
- package/dist/controllers/workflowStatistics.controller.js.map +1 -1
- package/dist/credentials/credentials.controller.d.ts +25 -12
- package/dist/credentials/credentials.controller.js +67 -137
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/credentials.service.d.ts +30 -7
- package/dist/credentials/credentials.service.ee.d.ts +23 -15
- package/dist/credentials/credentials.service.ee.js +42 -39
- package/dist/credentials/credentials.service.ee.js.map +1 -1
- package/dist/credentials/credentials.service.js +157 -28
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/databases/config.js +2 -0
- package/dist/databases/config.js.map +1 -1
- package/dist/databases/dsl/Column.js +5 -2
- package/dist/databases/dsl/Column.js.map +1 -1
- package/dist/databases/dsl/Table.d.ts +1 -0
- package/dist/databases/dsl/Table.js +2 -0
- package/dist/databases/dsl/Table.js.map +1 -1
- package/dist/databases/entities/ExecutionEntity.js +1 -1
- package/dist/databases/entities/ExecutionEntity.js.map +1 -1
- package/dist/databases/entities/Project.d.ts +12 -0
- package/dist/databases/entities/Project.js +41 -0
- package/dist/databases/entities/Project.js.map +1 -0
- package/dist/databases/entities/ProjectRelation.d.ts +11 -0
- package/dist/databases/entities/ProjectRelation.js +43 -0
- package/dist/databases/entities/ProjectRelation.js.map +1 -0
- package/dist/databases/entities/SharedCredentials.d.ts +3 -3
- package/dist/databases/entities/SharedCredentials.js +9 -9
- package/dist/databases/entities/SharedCredentials.js.map +1 -1
- package/dist/databases/entities/SharedWorkflow.d.ts +4 -4
- package/dist/databases/entities/SharedWorkflow.js +9 -9
- package/dist/databases/entities/SharedWorkflow.js.map +1 -1
- package/dist/databases/entities/User.d.ts +4 -1
- package/dist/databases/entities/User.js +20 -5
- package/dist/databases/entities/User.js.map +1 -1
- package/dist/databases/entities/index.d.ts +4 -0
- package/dist/databases/entities/index.js +4 -0
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.js +4 -0
- package/dist/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.js.map +1 -1
- package/dist/databases/migrations/common/1714133768519-CreateProject.d.ts +13 -0
- package/dist/databases/migrations/common/1714133768519-CreateProject.js +221 -0
- package/dist/databases/migrations/common/1714133768519-CreateProject.js.map +1 -0
- package/dist/databases/migrations/common/1714133768521-MakeExecutionStatusNonNullable.d.ts +4 -0
- package/dist/databases/migrations/common/1714133768521-MakeExecutionStatusNonNullable.js +22 -0
- package/dist/databases/migrations/common/1714133768521-MakeExecutionStatusNonNullable.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +4 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +4 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/index.js +4 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/credentials.repository.d.ts +0 -2
- package/dist/databases/repositories/credentials.repository.js +10 -10
- package/dist/databases/repositories/credentials.repository.js.map +1 -1
- package/dist/databases/repositories/project.repository.d.ts +13 -0
- package/dist/databases/repositories/project.repository.js +56 -0
- package/dist/databases/repositories/project.repository.js.map +1 -0
- package/dist/databases/repositories/projectRelation.repository.d.ts +12 -0
- package/dist/databases/repositories/projectRelation.repository.js +59 -0
- package/dist/databases/repositories/projectRelation.repository.js.map +1 -0
- package/dist/databases/repositories/sharedCredentials.repository.d.ts +19 -8
- package/dist/databases/repositories/sharedCredentials.repository.js +73 -24
- package/dist/databases/repositories/sharedCredentials.repository.js.map +1 -1
- package/dist/databases/repositories/sharedWorkflow.repository.d.ts +14 -21
- package/dist/databases/repositories/sharedWorkflow.repository.js +104 -71
- package/dist/databases/repositories/sharedWorkflow.repository.js.map +1 -1
- package/dist/databases/repositories/user.repository.d.ts +7 -1
- package/dist/databases/repositories/user.repository.js +25 -0
- package/dist/databases/repositories/user.repository.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.d.ts +3 -6
- package/dist/databases/repositories/workflow.repository.js +13 -24
- package/dist/databases/repositories/workflow.repository.js.map +1 -1
- package/dist/databases/repositories/workflowStatistics.repository.js +13 -11
- package/dist/databases/repositories/workflowStatistics.repository.js.map +1 -1
- package/dist/databases/subscribers/UserSubscriber.d.ts +6 -0
- package/dist/databases/subscribers/UserSubscriber.js +64 -0
- package/dist/databases/subscribers/UserSubscriber.js.map +1 -0
- package/dist/databases/subscribers/index.d.ts +4 -0
- package/dist/databases/subscribers/index.js +8 -0
- package/dist/databases/subscribers/index.js.map +1 -0
- package/dist/decorators/{Scopes.d.ts → Scoped.d.ts} +1 -0
- package/dist/decorators/Scoped.js +26 -0
- package/dist/decorators/Scoped.js.map +1 -0
- package/dist/decorators/constants.d.ts +1 -1
- package/dist/decorators/constants.js +2 -2
- package/dist/decorators/constants.js.map +1 -1
- package/dist/decorators/index.d.ts +1 -1
- package/dist/decorators/index.js +4 -3
- package/dist/decorators/index.js.map +1 -1
- package/dist/decorators/registerController.d.ts +2 -2
- package/dist/decorators/registerController.js +17 -13
- package/dist/decorators/registerController.js.map +1 -1
- package/dist/decorators/types.d.ts +6 -1
- package/dist/environments/sourceControl/sourceControlExport.service.ee.js +44 -2
- package/dist/environments/sourceControl/sourceControlExport.service.ee.js.map +1 -1
- package/dist/environments/sourceControl/sourceControlImport.service.ee.d.ts +2 -1
- package/dist/environments/sourceControl/sourceControlImport.service.ee.js +75 -55
- package/dist/environments/sourceControl/sourceControlImport.service.ee.js.map +1 -1
- package/dist/environments/sourceControl/types/exportableCredential.d.ts +2 -1
- package/dist/environments/sourceControl/types/exportableWorkflow.d.ts +2 -1
- package/dist/environments/sourceControl/types/resourceOwner.d.ts +8 -0
- package/dist/environments/sourceControl/types/resourceOwner.js +3 -0
- package/dist/environments/sourceControl/types/resourceOwner.js.map +1 -0
- package/dist/errors/aborted-execution-retry.error.d.ts +4 -0
- package/dist/errors/aborted-execution-retry.error.js +13 -0
- package/dist/errors/aborted-execution-retry.error.js.map +1 -0
- package/dist/errors/response-errors/forbidden.error.d.ts +4 -0
- package/dist/errors/response-errors/forbidden.error.js +11 -0
- package/dist/errors/response-errors/forbidden.error.js.map +1 -0
- package/dist/errors/response-errors/unauthenticated.error.d.ts +4 -0
- package/dist/errors/response-errors/unauthenticated.error.js +11 -0
- package/dist/errors/response-errors/unauthenticated.error.js.map +1 -0
- package/dist/executions/execution.service.ee.js +8 -7
- package/dist/executions/execution.service.ee.js.map +1 -1
- package/dist/executions/execution.service.js +5 -0
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/executions.controller.js +15 -9
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/middlewares/listQuery/dtos/credentials.filter.dto.d.ts +1 -0
- package/dist/middlewares/listQuery/dtos/credentials.filter.dto.js +6 -0
- package/dist/middlewares/listQuery/dtos/credentials.filter.dto.js.map +1 -1
- package/dist/middlewares/listQuery/dtos/workflow.filter.dto.d.ts +1 -0
- package/dist/middlewares/listQuery/dtos/workflow.filter.dto.js +6 -0
- package/dist/middlewares/listQuery/dtos/workflow.filter.dto.js.map +1 -1
- package/dist/permissions/checkAccess.d.ts +7 -0
- package/dist/permissions/checkAccess.js +64 -0
- package/dist/permissions/checkAccess.js.map +1 -0
- package/dist/permissions/global-roles.d.ts +4 -0
- package/dist/permissions/{roles.js → global-roles.js} +11 -5
- package/dist/permissions/global-roles.js.map +1 -0
- package/dist/permissions/project-roles.d.ts +4 -0
- package/dist/permissions/project-roles.js +53 -0
- package/dist/permissions/project-roles.js.map +1 -0
- package/dist/permissions/resource-roles.d.ts +5 -0
- package/dist/permissions/resource-roles.js +23 -0
- package/dist/permissions/resource-roles.js.map +1 -0
- package/dist/push/index.d.ts +1 -1
- package/dist/requests.d.ts +85 -19
- package/dist/requests.js.map +1 -1
- package/dist/services/activeWorkflows.service.js +4 -2
- package/dist/services/activeWorkflows.service.js.map +1 -1
- package/dist/services/credentials-tester.service.js +1 -1
- package/dist/services/credentials-tester.service.js.map +1 -1
- package/dist/services/events.service.js +19 -13
- package/dist/services/events.service.js.map +1 -1
- package/dist/services/frontend.service.js +6 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/import.service.d.ts +1 -1
- package/dist/services/import.service.js +4 -5
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/ownership.service.d.ts +9 -3
- package/dist/services/ownership.service.js +47 -15
- package/dist/services/ownership.service.js.map +1 -1
- package/dist/services/project.service.d.ts +61 -0
- package/dist/services/project.service.js +277 -0
- package/dist/services/project.service.js.map +1 -0
- package/dist/services/role.service.d.ts +31 -0
- package/dist/services/role.service.js +142 -0
- package/dist/services/role.service.js.map +1 -0
- package/dist/services/user.service.d.ts +3 -3
- package/dist/services/user.service.js +14 -6
- package/dist/services/user.service.js.map +1 -1
- package/dist/services/userOnboarding.service.js +6 -1
- package/dist/services/userOnboarding.service.js.map +1 -1
- package/dist/sso/saml/saml.service.ee.js +1 -1
- package/dist/sso/saml/saml.service.ee.js.map +1 -1
- package/dist/sso/saml/samlHelpers.d.ts +1 -1
- package/dist/sso/saml/samlHelpers.js +14 -22
- package/dist/sso/saml/samlHelpers.js.map +1 -1
- package/dist/telemetry/index.js +4 -0
- package/dist/telemetry/index.js.map +1 -1
- package/dist/utils.d.ts +1 -0
- package/dist/utils.js +3 -1
- package/dist/utils.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +12 -4
- package/dist/workflows/workflow.service.d.ts +16 -7
- package/dist/workflows/workflow.service.ee.d.ts +8 -8
- package/dist/workflows/workflow.service.ee.js +28 -35
- package/dist/workflows/workflow.service.ee.js.map +1 -1
- package/dist/workflows/workflow.service.js +93 -39
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflowExecution.service.d.ts +2 -1
- package/dist/workflows/workflowExecution.service.js +2 -2
- package/dist/workflows/workflowExecution.service.js.map +1 -1
- package/dist/workflows/workflowHistory/workflowHistory.service.ee.d.ts +0 -1
- package/dist/workflows/workflowHistory/workflowHistory.service.ee.js +10 -14
- package/dist/workflows/workflowHistory/workflowHistory.service.ee.js.map +1 -1
- package/dist/workflows/workflowSharing.service.d.ts +12 -3
- package/dist/workflows/workflowSharing.service.js +24 -10
- package/dist/workflows/workflowSharing.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +98 -11
- package/dist/workflows/workflows.controller.js +106 -77
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/dist/workflows/workflows.types.d.ts +8 -2
- package/package.json +8 -8
- package/dist/decorators/Scopes.js +0 -15
- package/dist/decorators/Scopes.js.map +0 -1
- package/dist/errors/response-errors/unauthorized.error.d.ts +0 -4
- package/dist/errors/response-errors/unauthorized.error.js +0 -11
- package/dist/errors/response-errors/unauthorized.error.js.map +0 -1
- package/dist/permissions/roles.d.ts +0 -4
- package/dist/permissions/roles.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.service.ee.js","sourceRoot":"","sources":["../../src/workflows/workflow.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAiC;AACjC,uDAA+B;AAC/B,+CAAoE;AAKpE,oFAAgF;AAChF,8EAA0E;AAC1E,0FAAsF;AACtF,2EAAuE;AACvE,kFAA6E;AAC7E,8EAAyE;AACzE,qCAAkC;
|
|
1
|
+
{"version":3,"file":"workflow.service.ee.js","sourceRoot":"","sources":["../../src/workflows/workflow.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,6 @@ const omit_1 = __importDefault(require("lodash/omit"));
|
|
|
43
43
|
const uuid_1 = require("uuid");
|
|
44
44
|
const n8n_core_1 = require("n8n-core");
|
|
45
45
|
const config_1 = __importDefault(require("../config"));
|
|
46
|
-
const execution_repository_1 = require("../databases/repositories/execution.repository");
|
|
47
46
|
const sharedWorkflow_repository_1 = require("../databases/repositories/sharedWorkflow.repository");
|
|
48
47
|
const workflowTagMapping_repository_1 = require("../databases/repositories/workflowTagMapping.repository");
|
|
49
48
|
const workflow_repository_1 = require("../databases/repositories/workflow.repository");
|
|
@@ -60,10 +59,15 @@ const Logger_1 = require("../Logger");
|
|
|
60
59
|
const orchestration_service_1 = require("../services/orchestration.service");
|
|
61
60
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
62
61
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
62
|
+
const role_service_1 = require("../services/role.service");
|
|
63
|
+
const workflowSharing_service_1 = require("./workflowSharing.service");
|
|
64
|
+
const project_service_1 = require("../services/project.service");
|
|
65
|
+
const execution_repository_1 = require("../databases/repositories/execution.repository");
|
|
66
|
+
const typeorm_1 = require("@n8n/typeorm");
|
|
67
|
+
const SharedWorkflow_1 = require("../databases/entities/SharedWorkflow");
|
|
63
68
|
let WorkflowService = class WorkflowService {
|
|
64
|
-
constructor(logger,
|
|
69
|
+
constructor(logger, sharedWorkflowRepository, workflowRepository, workflowTagMappingRepository, binaryDataService, ownershipService, tagService, workflowHistoryService, orchestrationService, externalHooks, activeWorkflowManager, roleService, workflowSharingService, projectService, executionRepository) {
|
|
65
70
|
this.logger = logger;
|
|
66
|
-
this.executionRepository = executionRepository;
|
|
67
71
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
68
72
|
this.workflowRepository = workflowRepository;
|
|
69
73
|
this.workflowTagMappingRepository = workflowTagMappingRepository;
|
|
@@ -74,20 +78,34 @@ let WorkflowService = class WorkflowService {
|
|
|
74
78
|
this.orchestrationService = orchestrationService;
|
|
75
79
|
this.externalHooks = externalHooks;
|
|
76
80
|
this.activeWorkflowManager = activeWorkflowManager;
|
|
81
|
+
this.roleService = roleService;
|
|
82
|
+
this.workflowSharingService = workflowSharingService;
|
|
83
|
+
this.projectService = projectService;
|
|
84
|
+
this.executionRepository = executionRepository;
|
|
77
85
|
}
|
|
78
|
-
async getMany(
|
|
79
|
-
const
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
+
async getMany(user, options, includeScopes) {
|
|
87
|
+
const sharedWorkflowIds = await this.workflowSharingService.getSharedWorkflowIds(user, {
|
|
88
|
+
scopes: ['workflow:read'],
|
|
89
|
+
});
|
|
90
|
+
let { workflows, count } = await this.workflowRepository.getMany(sharedWorkflowIds, options);
|
|
91
|
+
if ((0, requests_1.hasSharing)(workflows)) {
|
|
92
|
+
workflows = workflows.map((w) => this.ownershipService.addOwnedByAndSharedWith(w));
|
|
93
|
+
}
|
|
94
|
+
if (includeScopes) {
|
|
95
|
+
const projectRelations = await this.projectService.getProjectRelationsForUser(user);
|
|
96
|
+
workflows = workflows.map((w) => this.roleService.addScopes(w, user, projectRelations));
|
|
97
|
+
}
|
|
98
|
+
workflows.forEach((w) => {
|
|
99
|
+
delete w.shared;
|
|
100
|
+
});
|
|
101
|
+
return { workflows, count };
|
|
86
102
|
}
|
|
87
|
-
async update(user,
|
|
103
|
+
async update(user, workflowUpdateData, workflowId, tagIds, forceSave) {
|
|
88
104
|
var _a, _b;
|
|
89
|
-
const
|
|
90
|
-
|
|
105
|
+
const workflow = await this.sharedWorkflowRepository.findWorkflowForUser(workflowId, user, [
|
|
106
|
+
'workflow:update',
|
|
107
|
+
]);
|
|
108
|
+
if (!workflow) {
|
|
91
109
|
this.logger.verbose('User attempted to update a workflow without permissions', {
|
|
92
110
|
workflowId,
|
|
93
111
|
userId: user.id,
|
|
@@ -95,24 +113,24 @@ let WorkflowService = class WorkflowService {
|
|
|
95
113
|
throw new not_found_error_1.NotFoundError('You do not have permission to update this workflow. Ask the owner to share it with you.');
|
|
96
114
|
}
|
|
97
115
|
if (!forceSave &&
|
|
98
|
-
|
|
99
|
-
|
|
116
|
+
workflowUpdateData.versionId !== '' &&
|
|
117
|
+
workflowUpdateData.versionId !== workflow.versionId) {
|
|
100
118
|
throw new bad_request_error_1.BadRequestError('Your most recent changes may be lost, because someone else just updated this workflow. Open this workflow in a new tab to see those new updates.', 100);
|
|
101
119
|
}
|
|
102
|
-
if (Object.keys((0, omit_1.default)(
|
|
103
|
-
|
|
120
|
+
if (Object.keys((0, omit_1.default)(workflowUpdateData, ['id', 'versionId', 'active'])).length > 0) {
|
|
121
|
+
workflowUpdateData.versionId = (0, uuid_1.v4)();
|
|
104
122
|
this.logger.verbose(`Updating versionId for workflow ${workflowId} for user ${user.id} after saving`, {
|
|
105
|
-
previousVersionId:
|
|
106
|
-
newVersionId:
|
|
123
|
+
previousVersionId: workflow.versionId,
|
|
124
|
+
newVersionId: workflowUpdateData.versionId,
|
|
107
125
|
});
|
|
108
126
|
}
|
|
109
|
-
await WorkflowHelpers.replaceInvalidCredentials(
|
|
110
|
-
WorkflowHelpers.addNodeIds(
|
|
111
|
-
await this.externalHooks.run('workflow.update', [
|
|
112
|
-
if (
|
|
127
|
+
await WorkflowHelpers.replaceInvalidCredentials(workflowUpdateData);
|
|
128
|
+
WorkflowHelpers.addNodeIds(workflowUpdateData);
|
|
129
|
+
await this.externalHooks.run('workflow.update', [workflowUpdateData]);
|
|
130
|
+
if (workflow.active) {
|
|
113
131
|
await this.activeWorkflowManager.remove(workflowId);
|
|
114
132
|
}
|
|
115
|
-
const workflowSettings = (_a =
|
|
133
|
+
const workflowSettings = (_a = workflowUpdateData.settings) !== null && _a !== void 0 ? _a : {};
|
|
116
134
|
const keysAllowingDefault = [
|
|
117
135
|
'timezone',
|
|
118
136
|
'saveDataErrorExecution',
|
|
@@ -128,11 +146,11 @@ let WorkflowService = class WorkflowService {
|
|
|
128
146
|
if (workflowSettings.executionTimeout === config_1.default.get('executions.timeout')) {
|
|
129
147
|
delete workflowSettings.executionTimeout;
|
|
130
148
|
}
|
|
131
|
-
if (
|
|
132
|
-
|
|
133
|
-
await (0, GenericHelpers_1.validateEntity)(
|
|
149
|
+
if (workflowUpdateData.name) {
|
|
150
|
+
workflowUpdateData.updatedAt = new Date();
|
|
151
|
+
await (0, GenericHelpers_1.validateEntity)(workflowUpdateData);
|
|
134
152
|
}
|
|
135
|
-
await this.workflowRepository.update(workflowId, (0, pick_1.default)(
|
|
153
|
+
await this.workflowRepository.update(workflowId, (0, pick_1.default)(workflowUpdateData, [
|
|
136
154
|
'name',
|
|
137
155
|
'active',
|
|
138
156
|
'nodes',
|
|
@@ -146,8 +164,8 @@ let WorkflowService = class WorkflowService {
|
|
|
146
164
|
if (tagIds && !config_1.default.getEnv('workflowTagsDisabled')) {
|
|
147
165
|
await this.workflowTagMappingRepository.overwriteTaggings(workflowId, tagIds);
|
|
148
166
|
}
|
|
149
|
-
if (
|
|
150
|
-
await this.workflowHistoryService.saveVersion(user,
|
|
167
|
+
if (workflowUpdateData.versionId !== workflow.versionId) {
|
|
168
|
+
await this.workflowHistoryService.saveVersion(user, workflowUpdateData, workflowId);
|
|
151
169
|
}
|
|
152
170
|
const relations = config_1.default.getEnv('workflowTagsDisabled') ? [] : ['tags'];
|
|
153
171
|
const updatedWorkflow = await this.workflowRepository.findOne({
|
|
@@ -167,12 +185,12 @@ let WorkflowService = class WorkflowService {
|
|
|
167
185
|
if (updatedWorkflow.active) {
|
|
168
186
|
try {
|
|
169
187
|
await this.externalHooks.run('workflow.activate', [updatedWorkflow]);
|
|
170
|
-
await this.activeWorkflowManager.add(workflowId,
|
|
188
|
+
await this.activeWorkflowManager.add(workflowId, workflow.active ? 'update' : 'activate');
|
|
171
189
|
}
|
|
172
190
|
catch (error) {
|
|
173
191
|
await this.workflowRepository.update(workflowId, {
|
|
174
192
|
active: false,
|
|
175
|
-
versionId:
|
|
193
|
+
versionId: workflow.versionId,
|
|
176
194
|
});
|
|
177
195
|
updatedWorkflow.active = false;
|
|
178
196
|
let message;
|
|
@@ -187,11 +205,13 @@ let WorkflowService = class WorkflowService {
|
|
|
187
205
|
}
|
|
188
206
|
async delete(user, workflowId) {
|
|
189
207
|
await this.externalHooks.run('workflow.delete', [workflowId]);
|
|
190
|
-
const
|
|
191
|
-
|
|
208
|
+
const workflow = await this.sharedWorkflowRepository.findWorkflowForUser(workflowId, user, [
|
|
209
|
+
'workflow:delete',
|
|
210
|
+
]);
|
|
211
|
+
if (!workflow) {
|
|
192
212
|
return;
|
|
193
213
|
}
|
|
194
|
-
if (
|
|
214
|
+
if (workflow.active) {
|
|
195
215
|
await this.activeWorkflowManager.remove(workflowId);
|
|
196
216
|
}
|
|
197
217
|
const idsForDeletion = await this.executionRepository
|
|
@@ -204,14 +224,44 @@ let WorkflowService = class WorkflowService {
|
|
|
204
224
|
await this.binaryDataService.deleteMany(idsForDeletion);
|
|
205
225
|
void typedi_1.default.get(InternalHooks_1.InternalHooks).onWorkflowDeleted(user, workflowId, false);
|
|
206
226
|
await this.externalHooks.run('workflow.afterDelete', [workflowId]);
|
|
207
|
-
return
|
|
227
|
+
return workflow;
|
|
228
|
+
}
|
|
229
|
+
async getWorkflowScopes(user, workflowId) {
|
|
230
|
+
const userProjectRelations = await this.projectService.getProjectRelationsForUser(user);
|
|
231
|
+
const shared = await this.sharedWorkflowRepository.find({
|
|
232
|
+
where: {
|
|
233
|
+
projectId: (0, typeorm_1.In)([...new Set(userProjectRelations.map((pr) => pr.projectId))]),
|
|
234
|
+
workflowId,
|
|
235
|
+
},
|
|
236
|
+
});
|
|
237
|
+
return this.roleService.combineResourceScopes('workflow', user, shared, userProjectRelations);
|
|
238
|
+
}
|
|
239
|
+
async transferAll(fromProjectId, toProjectId, trx) {
|
|
240
|
+
trx = trx !== null && trx !== void 0 ? trx : this.workflowRepository.manager;
|
|
241
|
+
const allSharedWorkflows = await trx.findBy(SharedWorkflow_1.SharedWorkflow, {
|
|
242
|
+
projectId: (0, typeorm_1.In)([fromProjectId, toProjectId]),
|
|
243
|
+
});
|
|
244
|
+
const sharedWorkflowsOfFromProject = allSharedWorkflows.filter((sw) => sw.projectId === fromProjectId);
|
|
245
|
+
const ownedWorkflowIds = sharedWorkflowsOfFromProject
|
|
246
|
+
.filter((sw) => sw.role === 'workflow:owner')
|
|
247
|
+
.map((sw) => sw.workflowId);
|
|
248
|
+
await this.sharedWorkflowRepository.makeOwner(ownedWorkflowIds, toProjectId, trx);
|
|
249
|
+
await this.sharedWorkflowRepository.deleteByIds(ownedWorkflowIds, fromProjectId, trx);
|
|
250
|
+
const sharedWorkflowIdsOfTransferee = allSharedWorkflows
|
|
251
|
+
.filter((sw) => sw.projectId === toProjectId)
|
|
252
|
+
.map((sw) => sw.workflowId);
|
|
253
|
+
const sharedWorkflowsToTransfer = sharedWorkflowsOfFromProject.filter((sw) => sw.role !== 'workflow:owner' && !sharedWorkflowIdsOfTransferee.includes(sw.workflowId));
|
|
254
|
+
await trx.insert(SharedWorkflow_1.SharedWorkflow, sharedWorkflowsToTransfer.map((sw) => ({
|
|
255
|
+
workflowId: sw.workflowId,
|
|
256
|
+
projectId: toProjectId,
|
|
257
|
+
role: sw.role,
|
|
258
|
+
})));
|
|
208
259
|
}
|
|
209
260
|
};
|
|
210
261
|
exports.WorkflowService = WorkflowService;
|
|
211
262
|
exports.WorkflowService = WorkflowService = __decorate([
|
|
212
263
|
(0, typedi_1.Service)(),
|
|
213
264
|
__metadata("design:paramtypes", [Logger_1.Logger,
|
|
214
|
-
execution_repository_1.ExecutionRepository,
|
|
215
265
|
sharedWorkflow_repository_1.SharedWorkflowRepository,
|
|
216
266
|
workflow_repository_1.WorkflowRepository,
|
|
217
267
|
workflowTagMapping_repository_1.WorkflowTagMappingRepository,
|
|
@@ -221,6 +271,10 @@ exports.WorkflowService = WorkflowService = __decorate([
|
|
|
221
271
|
workflowHistory_service_ee_1.WorkflowHistoryService,
|
|
222
272
|
orchestration_service_1.OrchestrationService,
|
|
223
273
|
ExternalHooks_1.ExternalHooks,
|
|
224
|
-
ActiveWorkflowManager_1.ActiveWorkflowManager
|
|
274
|
+
ActiveWorkflowManager_1.ActiveWorkflowManager,
|
|
275
|
+
role_service_1.RoleService,
|
|
276
|
+
workflowSharing_service_1.WorkflowSharingService,
|
|
277
|
+
project_service_1.ProjectService,
|
|
278
|
+
execution_repository_1.ExecutionRepository])
|
|
225
279
|
], WorkflowService);
|
|
226
280
|
//# sourceMappingURL=workflow.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow.service.js","sourceRoot":"","sources":["../../src/workflows/workflow.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iDAA4C;AAC5C,+CAA4C;AAC5C,uDAA+B;AAC/B,uDAA+B;AAC/B,+BAAkC;AAClC,uCAA6C;AAE7C,sDAA8B;
|
|
1
|
+
{"version":3,"file":"workflow.service.js","sourceRoot":"","sources":["../../src/workflows/workflow.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ import { WorkflowRunner } from '../WorkflowRunner';
|
|
|
9
9
|
import { TestWebhooks } from '../TestWebhooks';
|
|
10
10
|
import { Logger } from '../Logger';
|
|
11
11
|
import { PermissionChecker } from '../UserManagement/PermissionChecker';
|
|
12
|
+
import type { Project } from '../databases/entities/Project';
|
|
12
13
|
export declare class WorkflowExecutionService {
|
|
13
14
|
private readonly logger;
|
|
14
15
|
private readonly executionRepository;
|
|
@@ -26,7 +27,7 @@ export declare class WorkflowExecutionService {
|
|
|
26
27
|
executionId: string;
|
|
27
28
|
waitingForWebhook?: undefined;
|
|
28
29
|
}>;
|
|
29
|
-
executeErrorWorkflow(workflowId: string, workflowErrorData: IWorkflowErrorData,
|
|
30
|
+
executeErrorWorkflow(workflowId: string, workflowErrorData: IWorkflowErrorData, runningProject: Project): Promise<void>;
|
|
30
31
|
selectPinnedActivatorStarter(workflow: IWorkflowDb, startNodes?: string[], pinData?: IPinData): INode | null;
|
|
31
32
|
private findAllPinnedActivators;
|
|
32
33
|
}
|
|
@@ -121,7 +121,7 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
121
121
|
executionId,
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
|
-
async executeErrorWorkflow(workflowId, workflowErrorData,
|
|
124
|
+
async executeErrorWorkflow(workflowId, workflowErrorData, runningProject) {
|
|
125
125
|
var _a, _b;
|
|
126
126
|
try {
|
|
127
127
|
const workflowData = await this.workflowRepository.findOneBy({ id: workflowId });
|
|
@@ -214,7 +214,7 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
214
214
|
executionMode,
|
|
215
215
|
executionData: runExecutionData,
|
|
216
216
|
workflowData,
|
|
217
|
-
|
|
217
|
+
projectId: runningProject.id,
|
|
218
218
|
};
|
|
219
219
|
await this.workflowRunner.run(runData);
|
|
220
220
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowExecution.service.js","sourceRoot":"","sources":["../../src/workflows/workflowExecution.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAiC;AAYjC,+CAIsB;AAEtB,sDAA8B;AAE9B,gFAA4E;AAC5E,8EAA0E;AAC1E,mEAAqD;AAQrD,2CAAwC;AACxC,qDAAkD;AAClD,+FAAiF;AACjF,iDAA8C;AAC9C,qCAAkC;AAClC,0EAAuE;
|
|
1
|
+
{"version":3,"file":"workflowExecution.service.js","sourceRoot":"","sources":["../../src/workflows/workflowExecution.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,6 @@ export declare class WorkflowHistoryService {
|
|
|
9
9
|
private readonly workflowHistoryRepository;
|
|
10
10
|
private readonly sharedWorkflowRepository;
|
|
11
11
|
constructor(logger: Logger, workflowHistoryRepository: WorkflowHistoryRepository, sharedWorkflowRepository: SharedWorkflowRepository);
|
|
12
|
-
private getSharedWorkflow;
|
|
13
12
|
getList(user: User, workflowId: string, take: number, skip: number): Promise<Array<Omit<WorkflowHistory, 'nodes' | 'connections'>>>;
|
|
14
13
|
getVersion(user: User, workflowId: string, versionId: string): Promise<WorkflowHistory>;
|
|
15
14
|
saveVersion(user: User, workflow: WorkflowEntity, workflowId: string): Promise<void>;
|
|
@@ -23,22 +23,16 @@ let WorkflowHistoryService = class WorkflowHistoryService {
|
|
|
23
23
|
this.workflowHistoryRepository = workflowHistoryRepository;
|
|
24
24
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
25
25
|
}
|
|
26
|
-
async getSharedWorkflow(user, workflowId) {
|
|
27
|
-
return await this.sharedWorkflowRepository.findOne({
|
|
28
|
-
where: {
|
|
29
|
-
...(!user.hasGlobalScope('workflow:read') && { userId: user.id }),
|
|
30
|
-
workflowId,
|
|
31
|
-
},
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
26
|
async getList(user, workflowId, take, skip) {
|
|
35
|
-
const
|
|
36
|
-
|
|
27
|
+
const workflow = await this.sharedWorkflowRepository.findWorkflowForUser(workflowId, user, [
|
|
28
|
+
'workflow:read',
|
|
29
|
+
]);
|
|
30
|
+
if (!workflow) {
|
|
37
31
|
throw new shared_workflow_not_found_error_1.SharedWorkflowNotFoundError('');
|
|
38
32
|
}
|
|
39
33
|
return await this.workflowHistoryRepository.find({
|
|
40
34
|
where: {
|
|
41
|
-
workflowId:
|
|
35
|
+
workflowId: workflow.id,
|
|
42
36
|
},
|
|
43
37
|
take,
|
|
44
38
|
skip,
|
|
@@ -47,13 +41,15 @@ let WorkflowHistoryService = class WorkflowHistoryService {
|
|
|
47
41
|
});
|
|
48
42
|
}
|
|
49
43
|
async getVersion(user, workflowId, versionId) {
|
|
50
|
-
const
|
|
51
|
-
|
|
44
|
+
const workflow = await this.sharedWorkflowRepository.findWorkflowForUser(workflowId, user, [
|
|
45
|
+
'workflow:read',
|
|
46
|
+
]);
|
|
47
|
+
if (!workflow) {
|
|
52
48
|
throw new shared_workflow_not_found_error_1.SharedWorkflowNotFoundError('');
|
|
53
49
|
}
|
|
54
50
|
const hist = await this.workflowHistoryRepository.findOne({
|
|
55
51
|
where: {
|
|
56
|
-
workflowId:
|
|
52
|
+
workflowId: workflow.id,
|
|
57
53
|
versionId,
|
|
58
54
|
},
|
|
59
55
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowHistory.service.ee.js","sourceRoot":"","sources":["../../../src/workflows/workflowHistory/workflowHistory.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"workflowHistory.service.ee.js","sourceRoot":"","sources":["../../../src/workflows/workflowHistory/workflowHistory.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,0FAAsF;AACtF,4FAAwF;AACxF,mCAAiC;AACjC,yEAAsE;AACtE,qCAAkC;AAClC,8FAAuF;AACvF,gHAAwG;AAGjG,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,MAAc,EACd,yBAAoD,EACpD,wBAAkD;QAFlD,WAAM,GAAN,MAAM,CAAQ;QACd,8BAAyB,GAAzB,yBAAyB,CAA2B;QACpD,6BAAwB,GAAxB,wBAAwB,CAA0B;IACjE,CAAC;IAEJ,KAAK,CAAC,OAAO,CACZ,IAAU,EACV,UAAkB,EAClB,IAAY,EACZ,IAAY;QAEZ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE;YAC1F,eAAe;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,6DAA2B,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC;YAChD,KAAK,EAAE;gBACN,UAAU,EAAE,QAAQ,CAAC,EAAE;aACvB;YACD,IAAI;YACJ,IAAI;YACJ,MAAM,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC;YACxE,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE;SAC5B,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAU,EAAE,UAAkB,EAAE,SAAiB;QACjE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE;YAC1F,eAAe;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,MAAM,IAAI,6DAA2B,CAAC,EAAE,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC;YACzD,KAAK,EAAE;gBACN,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,SAAS;aACT;SACD,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,8EAAmC,CAAC,EAAE,CAAC,CAAC;QACnD,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAU,EAAE,QAAwB,EAAE,UAAkB;QAIzE,IAAI,IAAA,mDAAwB,GAAE,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,WAAW,EAAE,CAAC;YAC1E,IAAI,CAAC;gBACJ,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC;oBAC3C,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ;oBAC7C,WAAW,EAAE,QAAQ,CAAC,WAAW;oBACjC,KAAK,EAAE,QAAQ,CAAC,KAAK;oBACrB,SAAS,EAAE,QAAQ,CAAC,SAAS;oBAC7B,UAAU;iBACV,CAAC,CAAC;YACJ,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,wDAAwD,UAAU,EAAE,EACpE,CAAU,CACV,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;CACD,CAAA;AA1EY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,gBAAO,GAAE;qCAGiB,eAAM;QACa,sDAAyB;QAC1B,oDAAwB;GAJxD,sBAAsB,CA0ElC"}
|
|
@@ -1,8 +1,17 @@
|
|
|
1
|
-
import type { WorkflowSharingRole } from '../databases/entities/SharedWorkflow';
|
|
2
1
|
import type { User } from '../databases/entities/User';
|
|
3
2
|
import { SharedWorkflowRepository } from '../databases/repositories/sharedWorkflow.repository';
|
|
3
|
+
import { RoleService } from '../services/role.service';
|
|
4
|
+
import type { Scope } from '@n8n/permissions';
|
|
5
|
+
import type { ProjectRole } from '../databases/entities/ProjectRelation';
|
|
6
|
+
import type { WorkflowSharingRole } from '../databases/entities/SharedWorkflow';
|
|
4
7
|
export declare class WorkflowSharingService {
|
|
5
8
|
private readonly sharedWorkflowRepository;
|
|
6
|
-
|
|
7
|
-
|
|
9
|
+
private readonly roleService;
|
|
10
|
+
constructor(sharedWorkflowRepository: SharedWorkflowRepository, roleService: RoleService);
|
|
11
|
+
getSharedWorkflowIds(user: User, options: {
|
|
12
|
+
scopes: Scope[];
|
|
13
|
+
} | {
|
|
14
|
+
projectRoles: ProjectRole[];
|
|
15
|
+
workflowRoles: WorkflowSharingRole[];
|
|
16
|
+
}): Promise<string[]>;
|
|
8
17
|
}
|
|
@@ -13,20 +13,33 @@ exports.WorkflowSharingService = void 0;
|
|
|
13
13
|
const typedi_1 = require("typedi");
|
|
14
14
|
const typeorm_1 = require("@n8n/typeorm");
|
|
15
15
|
const sharedWorkflow_repository_1 = require("../databases/repositories/sharedWorkflow.repository");
|
|
16
|
+
const role_service_1 = require("../services/role.service");
|
|
16
17
|
let WorkflowSharingService = class WorkflowSharingService {
|
|
17
|
-
constructor(sharedWorkflowRepository) {
|
|
18
|
+
constructor(sharedWorkflowRepository, roleService) {
|
|
18
19
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
20
|
+
this.roleService = roleService;
|
|
19
21
|
}
|
|
20
|
-
async getSharedWorkflowIds(user,
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
}
|
|
25
|
-
if (roles === null || roles === void 0 ? void 0 : roles.length) {
|
|
26
|
-
where.role = (0, typeorm_1.In)(roles);
|
|
22
|
+
async getSharedWorkflowIds(user, options) {
|
|
23
|
+
if (user.hasGlobalScope('workflow:read')) {
|
|
24
|
+
const sharedWorkflows = await this.sharedWorkflowRepository.find({ select: ['workflowId'] });
|
|
25
|
+
return sharedWorkflows.map(({ workflowId }) => workflowId);
|
|
27
26
|
}
|
|
27
|
+
const projectRoles = 'scopes' in options
|
|
28
|
+
? this.roleService.rolesWithScope('project', options.scopes)
|
|
29
|
+
: options.projectRoles;
|
|
30
|
+
const workflowRoles = 'scopes' in options
|
|
31
|
+
? this.roleService.rolesWithScope('workflow', options.scopes)
|
|
32
|
+
: options.workflowRoles;
|
|
28
33
|
const sharedWorkflows = await this.sharedWorkflowRepository.find({
|
|
29
|
-
where
|
|
34
|
+
where: {
|
|
35
|
+
role: (0, typeorm_1.In)(workflowRoles),
|
|
36
|
+
project: {
|
|
37
|
+
projectRelations: {
|
|
38
|
+
userId: user.id,
|
|
39
|
+
role: (0, typeorm_1.In)(projectRoles),
|
|
40
|
+
},
|
|
41
|
+
},
|
|
42
|
+
},
|
|
30
43
|
select: ['workflowId'],
|
|
31
44
|
});
|
|
32
45
|
return sharedWorkflows.map(({ workflowId }) => workflowId);
|
|
@@ -35,6 +48,7 @@ let WorkflowSharingService = class WorkflowSharingService {
|
|
|
35
48
|
exports.WorkflowSharingService = WorkflowSharingService;
|
|
36
49
|
exports.WorkflowSharingService = WorkflowSharingService = __decorate([
|
|
37
50
|
(0, typedi_1.Service)(),
|
|
38
|
-
__metadata("design:paramtypes", [sharedWorkflow_repository_1.SharedWorkflowRepository
|
|
51
|
+
__metadata("design:paramtypes", [sharedWorkflow_repository_1.SharedWorkflowRepository,
|
|
52
|
+
role_service_1.RoleService])
|
|
39
53
|
], WorkflowSharingService);
|
|
40
54
|
//# sourceMappingURL=workflowSharing.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflowSharing.service.js","sourceRoot":"","sources":["../../src/workflows/workflowSharing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"workflowSharing.service.js","sourceRoot":"","sources":["../../src/workflows/workflowSharing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAiC;AACjC,0CAAkC;AAGlC,0FAAsF;AACtF,0DAAsD;AAM/C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,wBAAkD,EAClD,WAAwB;QADxB,6BAAwB,GAAxB,wBAAwB,CAA0B;QAClD,gBAAW,GAAX,WAAW,CAAa;IACvC,CAAC;IAUJ,KAAK,CAAC,oBAAoB,CACzB,IAAU,EACV,OAEwE;QAExE,IAAI,IAAI,CAAC,cAAc,CAAC,eAAe,CAAC,EAAE,CAAC;YAC1C,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;YAC7F,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,YAAY,GACjB,QAAQ,IAAI,OAAO;YAClB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC;YAC5D,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC;QACzB,MAAM,aAAa,GAClB,QAAQ,IAAI,OAAO;YAClB,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC;YAC7D,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC;QAE1B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC;YAChE,KAAK,EAAE;gBACN,IAAI,EAAE,IAAA,YAAE,EAAC,aAAa,CAAC;gBACvB,OAAO,EAAE;oBACR,gBAAgB,EAAE;wBACjB,MAAM,EAAE,IAAI,CAAC,EAAE;wBACf,IAAI,EAAE,IAAA,YAAE,EAAC,YAAY,CAAC;qBACtB;iBACD;aACD;YACD,MAAM,EAAE,CAAC,YAAY,CAAC;SACtB,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;IAC5D,CAAC;CACD,CAAA;AAjDY,wDAAsB;iCAAtB,sBAAsB;IADlC,IAAA,gBAAO,GAAE;qCAGmC,oDAAwB;QACrC,0BAAW;GAH9B,sBAAsB,CAiDlC"}
|