n8n 2.10.2 → 2.11.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/build.tsbuildinfo +1 -1
- package/dist/chat/chat-execution-manager.js +11 -0
- package/dist/chat/chat-execution-manager.js.map +1 -1
- package/dist/collaboration/collaboration.service.d.ts +4 -1
- package/dist/collaboration/collaboration.service.js +17 -2
- package/dist/collaboration/collaboration.service.js.map +1 -1
- package/dist/collaboration/collaboration.state.d.ts +1 -1
- package/dist/collaboration/collaboration.state.js +27 -13
- package/dist/collaboration/collaboration.state.js.map +1 -1
- package/dist/commands/start.js +1 -2
- package/dist/commands/start.js.map +1 -1
- package/dist/controllers/oauth/oauth1-credential.controller.js +1 -1
- package/dist/controllers/oauth/oauth1-credential.controller.js.map +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js +1 -1
- package/dist/controllers/oauth/oauth2-credential.controller.js.map +1 -1
- package/dist/controllers/role.controller.d.ts +3 -0
- package/dist/controllers/role.controller.js +25 -0
- package/dist/controllers/role.controller.js.map +1 -1
- package/dist/credentials/credential-resolution-provider.interface.d.ts +5 -1
- package/dist/credentials/credentials.controller.js +24 -8
- package/dist/credentials/credentials.controller.js.map +1 -1
- package/dist/credentials/dynamic-credentials-proxy.d.ts +2 -2
- package/dist/credentials/dynamic-credentials-proxy.js +1 -1
- package/dist/credentials/dynamic-credentials-proxy.js.map +1 -1
- package/dist/credentials-helper.js +5 -1
- package/dist/credentials-helper.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.js +1 -1
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/executions/execution-redaction-proxy.service.d.ts +7 -0
- package/dist/executions/execution-redaction-proxy.service.js +26 -0
- package/dist/executions/execution-redaction-proxy.service.js.map +1 -0
- package/dist/executions/execution-redaction.d.ts +8 -0
- package/dist/{modules/external-secrets.ee/secrets-providers.responses.ee.js → executions/execution-redaction.js} +1 -1
- package/dist/executions/execution-redaction.js.map +1 -0
- package/dist/executions/execution.service.d.ts +3 -1
- package/dist/executions/execution.service.ee.d.ts +1 -2
- package/dist/executions/execution.service.js +21 -4
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/executions.controller.d.ts +1 -1
- package/dist/metrics/prometheus-metrics.service.d.ts +1 -0
- package/dist/metrics/prometheus-metrics.service.js +31 -0
- package/dist/metrics/prometheus-metrics.service.js.map +1 -1
- package/dist/modules/breaking-changes/breaking-changes.module.js +3 -0
- package/dist/modules/breaking-changes/breaking-changes.module.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.d.ts +14 -1
- package/dist/modules/chat-hub/chat-hub-workflow.service.js +44 -0
- package/dist/modules/chat-hub/chat-hub-workflow.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.attachment.service.d.ts +2 -0
- package/dist/modules/chat-hub/chat-hub.attachment.service.js +27 -0
- package/dist/modules/chat-hub/chat-hub.attachment.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.constants.d.ts +5 -1
- package/dist/modules/chat-hub/chat-hub.constants.js +42 -9
- package/dist/modules/chat-hub/chat-hub.constants.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.models.service.d.ts +2 -0
- package/dist/modules/chat-hub/chat-hub.models.service.js +18 -5
- package/dist/modules/chat-hub/chat-hub.models.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.service.js +4 -0
- package/dist/modules/chat-hub/chat-hub.service.js.map +1 -1
- package/dist/modules/chat-hub/chat-hub.types.d.ts +35 -0
- package/dist/modules/chat-hub/chat-hub.types.js +10 -0
- package/dist/modules/chat-hub/chat-hub.types.js.map +1 -1
- package/dist/modules/community-packages/community-node-types.service.js +7 -2
- package/dist/modules/community-packages/community-node-types.service.js.map +1 -1
- package/dist/modules/data-table/data-table.repository.d.ts +1 -0
- package/dist/modules/data-table/data-table.repository.js +14 -4
- package/dist/modules/data-table/data-table.repository.js.map +1 -1
- package/dist/modules/data-table/data-table.service.js +13 -5
- package/dist/modules/data-table/data-table.service.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/index.d.ts +1 -0
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/index.js +1 -0
- package/dist/modules/dynamic-credentials.ee/credential-resolvers/index.js.map +1 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.js +2 -1
- package/dist/modules/dynamic-credentials.ee/dynamic-credentials.controller.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 +5 -5
- package/dist/modules/dynamic-credentials.ee/services/dynamic-credential.service.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.config.d.ts +1 -0
- package/dist/modules/external-secrets.ee/external-secrets.config.js +6 -1
- package/dist/modules/external-secrets.ee/external-secrets.config.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.module.d.ts +1 -0
- package/dist/modules/external-secrets.ee/external-secrets.module.js +1 -0
- package/dist/modules/external-secrets.ee/external-secrets.module.js.map +1 -1
- package/dist/modules/external-secrets.ee/redaction.service.ee.js +2 -1
- package/dist/modules/external-secrets.ee/redaction.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.d.ts +5 -6
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js +2 -2
- package/dist/modules/external-secrets.ee/secrets-providers-connections.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.d.ts +4 -5
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js +7 -0
- package/dist/modules/external-secrets.ee/secrets-providers-connections.service.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.d.ts +5 -6
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js +4 -4
- package/dist/modules/external-secrets.ee/secrets-providers-project.controller.ee.js.map +1 -1
- package/dist/modules/external-secrets.ee/secrets-providers-types.controller.ee.js +0 -2
- package/dist/modules/external-secrets.ee/secrets-providers-types.controller.ee.js.map +1 -1
- package/dist/modules/instance-registry/instance-registry.module.d.ts +4 -0
- package/dist/modules/instance-registry/instance-registry.module.js +23 -0
- package/dist/modules/instance-registry/instance-registry.module.js.map +1 -0
- package/dist/modules/instance-registry/instance-registry.types.d.ts +11 -0
- package/dist/modules/instance-registry/instance-registry.types.js +15 -0
- package/dist/modules/instance-registry/instance-registry.types.js.map +1 -0
- package/dist/modules/instance-registry/storage/instance-storage.interface.d.ts +12 -0
- package/dist/modules/instance-registry/storage/instance-storage.interface.js +3 -0
- package/dist/modules/instance-registry/storage/instance-storage.interface.js.map +1 -0
- package/dist/modules/mcp/mcp.constants.d.ts +7 -0
- package/dist/modules/mcp/mcp.constants.js +6 -2
- package/dist/modules/mcp/mcp.constants.js.map +1 -1
- package/dist/modules/mcp/mcp.module.js +0 -2
- package/dist/modules/mcp/mcp.module.js.map +1 -1
- package/dist/modules/mcp/mcp.settings.controller.js +0 -16
- package/dist/modules/mcp/mcp.settings.controller.js.map +1 -1
- package/dist/modules/mcp/mcp.types.d.ts +5 -9
- package/dist/modules/mcp/mcp.utils.d.ts +3 -1
- package/dist/modules/mcp/mcp.utils.js +4 -2
- package/dist/modules/mcp/mcp.utils.js.map +1 -1
- package/dist/modules/mcp/tools/execute-workflow.tool.d.ts +4 -1
- package/dist/modules/mcp/tools/execute-workflow.tool.js +55 -18
- package/dist/modules/mcp/tools/execute-workflow.tool.js.map +1 -1
- package/dist/modules/mcp/tools/get-workflow-details.tool.js +10 -2
- package/dist/modules/mcp/tools/get-workflow-details.tool.js.map +1 -1
- package/dist/modules/mcp/tools/schemas.d.ts +94 -0
- package/dist/modules/mcp/tools/schemas.js +12 -1
- package/dist/modules/mcp/tools/schemas.js.map +1 -1
- package/dist/modules/mcp/tools/search-workflows.tool.js +4 -11
- package/dist/modules/mcp/tools/search-workflows.tool.js.map +1 -1
- package/dist/modules/mcp/tools/webhook-utils.js +1 -1
- package/dist/modules/mcp/tools/webhook-utils.js.map +1 -1
- package/dist/modules/redaction/executions/execution-redaction.service.d.ts +17 -0
- package/dist/modules/redaction/executions/execution-redaction.service.js +109 -0
- package/dist/modules/redaction/executions/execution-redaction.service.js.map +1 -0
- package/dist/modules/redaction/redaction.module.d.ts +4 -0
- package/dist/modules/redaction/redaction.module.js +65 -0
- package/dist/modules/redaction/redaction.module.js.map +1 -0
- package/dist/modules/source-control.ee/source-control-helper.ee.js +3 -5
- package/dist/modules/source-control.ee/source-control-helper.ee.js.map +1 -1
- package/dist/modules/source-control.ee/source-control.controller.ee.d.ts +4 -4
- package/dist/modules/source-control.ee/source-control.service.ee.d.ts +2 -2
- package/dist/modules/sso-saml/saml-validator.d.ts +1 -1
- package/dist/modules/sso-saml/saml-validator.js +2 -2
- package/dist/modules/sso-saml/saml-validator.js.map +1 -1
- package/dist/modules/sso-saml/saml.controller.ee.d.ts +1 -1
- package/dist/modules/sso-saml/saml.controller.ee.js +16 -7
- package/dist/modules/sso-saml/saml.controller.ee.js.map +1 -1
- package/dist/modules/sso-saml/saml.service.ee.d.ts +2 -4
- package/dist/modules/sso-saml/saml.service.ee.js +36 -32
- package/dist/modules/sso-saml/saml.service.ee.js.map +1 -1
- package/dist/oauth/oauth.service.d.ts +1 -1
- package/dist/oauth/oauth.service.js +2 -2
- package/dist/oauth/oauth.service.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +1 -1
- package/dist/services/role.service.d.ts +6 -0
- package/dist/services/role.service.js +42 -9
- package/dist/services/role.service.js.map +1 -1
- package/dist/utils.d.ts +1 -0
- package/dist/utils.js +4 -0
- package/dist/utils.js.map +1 -1
- package/dist/webhooks/waiting-webhooks.js +3 -13
- package/dist/webhooks/waiting-webhooks.js.map +1 -1
- package/dist/workflow-helpers.d.ts +1 -0
- package/dist/workflow-helpers.js +17 -0
- package/dist/workflow-helpers.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +1 -1
- package/dist/workflows/workflow-execution.service.js +22 -25
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflow.request.d.ts +1 -4
- package/dist/workflows/workflow.service.js +11 -1
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +2 -2
- package/dist/workflows/workflows.controller.js +34 -21
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +23 -23
- package/dist/modules/external-secrets.ee/secrets-providers.responses.ee.d.ts +0 -12
- package/dist/modules/external-secrets.ee/secrets-providers.responses.ee.js.map +0 -1
- package/dist/modules/mcp/mcp.event-relay.d.ts +0 -11
- package/dist/modules/mcp/mcp.event-relay.js +0 -63
- package/dist/modules/mcp/mcp.event-relay.js.map +0 -1
|
@@ -27,12 +27,13 @@ let RoleService = class RoleService {
|
|
|
27
27
|
this.roleCacheService = roleCacheService;
|
|
28
28
|
this.logger = logger;
|
|
29
29
|
}
|
|
30
|
-
dbRoleToRoleDTO(role, usedByUsers) {
|
|
30
|
+
dbRoleToRoleDTO(role, usedByUsers, usedByProjects) {
|
|
31
31
|
return {
|
|
32
32
|
...role,
|
|
33
33
|
scopes: role.scopes.map((s) => s.slug),
|
|
34
34
|
licensed: this.isRoleLicensed(role.slug),
|
|
35
35
|
usedByUsers,
|
|
36
|
+
usedByProjects,
|
|
36
37
|
};
|
|
37
38
|
}
|
|
38
39
|
async getAllRoles(withCount = false) {
|
|
@@ -40,22 +41,52 @@ let RoleService = class RoleService {
|
|
|
40
41
|
if (!withCount) {
|
|
41
42
|
return roles.map((r) => this.dbRoleToRoleDTO(r));
|
|
42
43
|
}
|
|
43
|
-
const roleCounts = await
|
|
44
|
+
const [roleCounts, projectCounts] = await Promise.all([
|
|
45
|
+
this.roleRepository.findAllRoleCounts(),
|
|
46
|
+
this.roleRepository.findAllProjectCounts(),
|
|
47
|
+
]);
|
|
44
48
|
return roles.map((role) => {
|
|
45
49
|
const usedByUsers = roleCounts[role.slug] ?? 0;
|
|
46
|
-
|
|
50
|
+
const usedByProjects = projectCounts[role.slug] ?? 0;
|
|
51
|
+
return this.dbRoleToRoleDTO(role, usedByUsers, usedByProjects);
|
|
47
52
|
});
|
|
48
53
|
}
|
|
49
54
|
async getRole(slug, withCount = false) {
|
|
50
55
|
const role = await this.roleRepository.findBySlug(slug);
|
|
51
56
|
if (role) {
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
57
|
+
let usedByUsers;
|
|
58
|
+
let usedByProjects;
|
|
59
|
+
if (withCount) {
|
|
60
|
+
const [userCount, projectCounts] = await Promise.all([
|
|
61
|
+
this.roleRepository.countUsersWithRole(role),
|
|
62
|
+
this.roleRepository.findAllProjectCounts(),
|
|
63
|
+
]);
|
|
64
|
+
usedByUsers = userCount;
|
|
65
|
+
usedByProjects = projectCounts[role.slug] ?? 0;
|
|
66
|
+
}
|
|
67
|
+
return this.dbRoleToRoleDTO(role, usedByUsers, usedByProjects);
|
|
56
68
|
}
|
|
57
69
|
throw new not_found_error_1.NotFoundError('Role not found');
|
|
58
70
|
}
|
|
71
|
+
async getRoleAssignments(slug) {
|
|
72
|
+
const role = await this.roleRepository.findBySlug(slug);
|
|
73
|
+
if (!role) {
|
|
74
|
+
throw new not_found_error_1.NotFoundError('Role not found');
|
|
75
|
+
}
|
|
76
|
+
const projects = await this.roleRepository.findProjectAssignments(role.slug);
|
|
77
|
+
return {
|
|
78
|
+
projects,
|
|
79
|
+
totalProjects: projects.length,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
async getRoleProjectMembers(slug, projectId) {
|
|
83
|
+
const role = await this.roleRepository.findBySlug(slug);
|
|
84
|
+
if (!role) {
|
|
85
|
+
throw new not_found_error_1.NotFoundError('Role not found');
|
|
86
|
+
}
|
|
87
|
+
const members = await this.roleRepository.findAllProjectMembers(projectId, role.slug);
|
|
88
|
+
return { members };
|
|
89
|
+
}
|
|
59
90
|
async removeCustomRole(slug) {
|
|
60
91
|
const role = await this.roleRepository.findBySlug(slug);
|
|
61
92
|
if (!role) {
|
|
@@ -152,10 +183,12 @@ let RoleService = class RoleService {
|
|
|
152
183
|
if (shared === undefined) {
|
|
153
184
|
return entity;
|
|
154
185
|
}
|
|
155
|
-
|
|
186
|
+
const isWorkflow = 'versionId' in entity || 'activeVersionId' in entity || 'triggerCount' in entity;
|
|
187
|
+
const isCredential = 'type' in entity;
|
|
188
|
+
if (!isWorkflow && !isCredential) {
|
|
156
189
|
throw new n8n_workflow_1.UnexpectedError('Cannot detect if entity is a workflow or credential.');
|
|
157
190
|
}
|
|
158
|
-
const entityType =
|
|
191
|
+
const entityType = isWorkflow ? 'workflow' : 'credential';
|
|
159
192
|
entity.scopes = this.combineResourceScopes(entityType, user, shared, userProjectRelations);
|
|
160
193
|
if (entityType === 'credential' &&
|
|
161
194
|
'isGlobal' in entity &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,wDAA2D;AAC3D,gCAaiB;AAEjB,gCAAkC;AAOlC,kDAQ0B;AAC1B,+CAA0D;AAE1D,kFAA6E;AAC7E,8EAAyE;AACzE,uDAA4D;AAE5D,6DAAwD;AAGjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACvB,YACkB,OAAqB,EACrB,cAA8B,EAC9B,eAAgC,EAChC,gBAAkC,EAClC,MAAc;QAJd,YAAO,GAAP,OAAO,CAAc;QACrB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,oBAAe,GAAf,eAAe,CAAiB;QAChC,qBAAgB,GAAhB,gBAAgB,CAAkB;QAClC,WAAM,GAAN,MAAM,CAAQ;IAC7B,CAAC;IAEI,eAAe,CAAC,IAAU,EAAE,WAAoB,EAAE,cAAuB;QAChF,OAAO;YACN,GAAG,IAAI;YACP,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACtC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC;YACxC,WAAW;YACX,cAAc;SACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,YAAqB,KAAK;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;QAElD,IAAI,CAAC,SAAS,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACrD,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE;YACvC,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE;SAC1C,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACzB,MAAM,WAAW,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACrD,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY,EAAE,YAAqB,KAAK;QACrD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,IAAI,EAAE,CAAC;YACV,IAAI,WAA+B,CAAC;YACpC,IAAI,cAAkC,CAAC;YACvC,IAAI,SAAS,EAAE,CAAC;gBACf,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;oBACpD,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC;oBAC5C,IAAI,CAAC,cAAc,CAAC,oBAAoB,EAAE;iBAC1C,CAAC,CAAC;gBACH,WAAW,GAAG,SAAS,CAAC;gBACxB,cAAc,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,CAAC;YACD,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAAY;QACpC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7E,OAAO;YACN,QAAQ;YACR,aAAa,EAAE,QAAQ,CAAC,MAAM;SAC9B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAC1B,IAAY,EACZ,SAAiB;QAEjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,qBAAqB,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACtF,OAAO,EAAE,OAAO,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;QAC3C,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,mCAAe,CAAC,4BAA4B,CAAC,CAAC;QACzD,CAAC;QAGD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,IAAI,mCAAe,CAAC,sCAAsC,CAAC,CAAC;QACnE,CAAC;QAED,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QAG7C,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;QAE9C,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACnC,CAAC;IAEO,KAAK,CAAC,aAAa,CAAC,UAAgC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO,SAAS,CAAC;QAClB,CAAC;QAED,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,EAAE,CAAC;QACX,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACjE,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;YACxF,MAAM,IAAI,KAAK,CAAC,qCAAqC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClF,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAAY,EAAE,OAAsB;QAC1D,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QAEjE,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC9D,WAAW;gBACX,WAAW;gBACX,MAAM,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;aAC5C,CAAC,CAAC;YAGH,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAE9C,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,OAAO,KAAK,gBAAgB,EAAE,CAAC;gBACtE,MAAM,IAAI,+BAAa,CAAC,gBAAgB,CAAC,CAAC;YAC3C,CAAC;YAED,IAAI,KAAK,YAAY,wBAAS,IAAI,KAAK,CAAC,OAAO,KAAK,4BAA4B,EAAE,CAAC;gBAClF,MAAM,IAAI,mCAAe,CAAC,4BAA4B,CAAC,CAAC;YACzD,CAAC;YAED,IAAI,KAAK,YAAY,KAAK,IAAI,IAAA,yCAAuB,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,mCAAe,CAAC,yBAAyB,WAAW,kBAAkB,CAAC,CAAC;YACnF,CAAC;YAED,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAsB;QAC5C,MAAM,IAAI,GAAG,IAAI,SAAI,EAAE,CAAC;QACxB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACzB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;QACxC,CAAC;QACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxD,IAAI,MAAM,KAAK,SAAS;YAAE,MAAM,IAAI,mCAAe,CAAC,qBAAqB,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,UAAU,GAAG,KAAK,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QACjC,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;QAEjJ,IAAI,CAAC;YACJ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAGzD,MAAM,IAAI,CAAC,gBAAgB,CAAC,eAAe,EAAE,CAAC;YAE9C,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,KAAK,IAAI,IAAA,yCAAuB,EAAC,KAAK,CAAC,EAAE,CAAC;gBAC9D,MAAM,IAAI,mCAAe,CAAC,yBAAyB,OAAO,CAAC,WAAW,kBAAkB,CAAC,CAAC;YAC3F,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,SAAmB,EACnB,QAA0D;QAE1D,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE3F,IAAI,KAAK,CAAC,MAAM,GAAG,eAAe,CAAC,IAAI,EAAE,CAAC;YACzC,MAAM,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAC1D,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CACnD,CAAC;YACF,MAAM,IAAI,mCAAe,CACxB,gBAAgB,CAAC,MAAM,KAAK,CAAC;gBAC5B,CAAC,CAAC,QAAQ,gBAAgB,CAAC,CAAC,CAAC,iBAAiB;gBAC9C,CAAC,CAAC,SAAS,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CACtD,CAAC;QACH,CAAC;IACF,CAAC;IAmBD,SAAS,CACR,SAKgD,EAChD,IAAU,EACV,oBAAuC;QAKvC,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;QAChC,MAAM,MAAM,GAAG,SAGsB,CAAC;QAEtC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC;QAEnB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QACf,CAAC;QAED,MAAM,UAAU,GACf,WAAW,IAAI,MAAM,IAAI,iBAAiB,IAAI,MAAM,IAAI,cAAc,IAAI,MAAM,CAAC;QAClF,MAAM,YAAY,GAAG,MAAM,IAAI,MAAM,CAAC;QAEtC,IAAI,CAAC,UAAU,IAAI,CAAC,YAAY,EAAE,CAAC;YAClC,MAAM,IAAI,8BAAe,CAAC,sDAAsD,CAAC,CAAC;QACnF,CAAC;QAED,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC;QAC1D,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,CAAC,CAAC;QAE3F,IACC,UAAU,KAAK,YAAY;YAC3B,UAAU,IAAI,MAAM;YACpB,MAAM,CAAC,QAAQ;YACf,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EACzC,CAAC;YACF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,MAAM,CAAC;IACf,CAAC;IAED,qBAAqB,CACpB,IAA+B,EAC/B,IAAU,EACV,MAA8C,EAC9C,oBAAuC;QAEvC,MAAM,YAAY,GAAG,IAAA,oCAAsB,EAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAe,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;QACpD,KAAK,MAAM,YAAY,IAAI,MAAM,EAAE,CAAC;YACnC,MAAM,EAAE,GAAG,oBAAoB,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,YAAY,CAAC,SAAS,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC,CAC1E,CAAC;YACF,IAAI,aAAa,GAAY,EAAE,CAAC;YAChC,IAAI,EAAE,EAAE,CAAC;gBACR,aAAa,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACnD,CAAC;YACD,MAAM,YAAY,GAAG,IAAA,2BAAa,EAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACtD,MAAM,YAAY,GAAG,IAAA,2BAAa,EACjC;gBACC,MAAM,EAAE,YAAY;gBACpB,OAAO,EAAE,aAAa;aACtB,EACD,EAAE,OAAO,EAAE,YAAY,EAAE,CACzB,CAAC;YACF,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC;QACD,OAAO,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;IAC9B,CAAC;IAMD,KAAK,CAAC,cAAc,CACnB,SAAwB,EACxB,MAAuB,EACvB,GAAmB;QAEnB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC;QACnB,CAAC;QAED,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;IAClF,CAAC;IAED,cAAc,CAAC,IAA2B;QAGzC,IAAI,CAAC,IAAA,2BAAa,EAAC,IAAI,CAAC,EAAE,CAAC;YAG1B,OAAO,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,CAAC;QAC7C,CAAC;QAED,QAAQ,IAAI,EAAE,CAAC;YACd,KAAK,qCAAuB;gBAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC;YAClD,KAAK,sCAAwB;gBAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACnD,KAAK,sCAAwB;gBAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,2BAA2B,EAAE,CAAC;YACnD,KAAK,sBAAiB,CAAC,IAAI;gBAC1B,OAAO,IAAI,CAAC,OAAO,CAAC,6BAA6B,EAAE,CAAC;YACrD;gBAEC,OAAO,IAAI,CAAC;QACd,CAAC;IACF,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,QAAsB,EAAE,UAAoB;QACjE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,QAAQ,QAAQ,qCAAqC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC5E,CAAC;YACF,MAAM,IAAI,+BAAa,CAAC,QAAQ,QAAQ,YAAY,CAAC,CAAC;QACvD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAEvE,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE5E,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,wBAAwB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,iCAAiC,QAAQ,EAAE,CACxF,CAAC;YACF,OAAO;QACR,CAAC;QAED,IAAI,WAAW,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;YACxC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/E,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,UAAU,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,iCAAiC,QAAQ,EAAE,CAClG,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,iBAAiB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,QAAQ,EAAE,CAChF,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,WAAW,CAAC,CAAC;QACjC,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,gBAAgB,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,QAAQ,EAAE,CAC/E,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,QAAgB,EAAE,UAAoB;QAChE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,QAAQ,QAAQ,wCAAwC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC/E,CAAC;YACF,MAAM,IAAI,+BAAa,CAAC,QAAQ,QAAQ,YAAY,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrC,MAAM,IAAI,CAAC,gBAAgB,CAAC,YAAY,EAAE,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,QAAQ,EAAE,CAAC,CAAC;IACpF,CAAC;CACD,CAAA;AArYY,kCAAW;sBAAX,WAAW;IADvB,IAAA,YAAO,GAAE;qCAGkB,6BAAY;QACL,mBAAc;QACb,oBAAe;QACd,qCAAgB;QAC1B,uBAAM;GANpB,WAAW,CAqYvB"}
|
package/dist/utils.d.ts
CHANGED
|
@@ -11,3 +11,4 @@ export declare const isPositiveInteger: (maybeInt: string) => boolean;
|
|
|
11
11
|
export declare const shouldAssignExecuteMethod: (nodeType: INodeType) => boolean;
|
|
12
12
|
export declare const getAllKeyPaths: (obj: unknown, currentPath: string | undefined, paths: string[] | undefined, valueFilter: (value: string) => boolean) => string[];
|
|
13
13
|
export declare function setMicrosoftObservabilityDefaults(): void;
|
|
14
|
+
export declare function containsExpression(testString: string): boolean;
|
package/dist/utils.js
CHANGED
|
@@ -5,6 +5,7 @@ exports.isWorkflowIdValid = isWorkflowIdValid;
|
|
|
5
5
|
exports.removeTrailingSlash = removeTrailingSlash;
|
|
6
6
|
exports.rightDiff = rightDiff;
|
|
7
7
|
exports.setMicrosoftObservabilityDefaults = setMicrosoftObservabilityDefaults;
|
|
8
|
+
exports.containsExpression = containsExpression;
|
|
8
9
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
9
10
|
const constants_1 = require("./constants");
|
|
10
11
|
function isWorkflowIdValid(id) {
|
|
@@ -88,4 +89,7 @@ function setMicrosoftObservabilityDefaults() {
|
|
|
88
89
|
process.env.ENABLE_A365_OBSERVABILITY_EXPORTER = 'true';
|
|
89
90
|
}
|
|
90
91
|
}
|
|
92
|
+
function containsExpression(testString) {
|
|
93
|
+
return /^=.*\{\{.+\}\}/.test(testString);
|
|
94
|
+
}
|
|
91
95
|
//# sourceMappingURL=utils.js.map
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AASA,8CAEC;AAoCD,kDAEC;AAGD,8BAiBC;AA6DD,8EAUC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,9 +58,10 @@ const conflict_error_1 = require("../errors/response-errors/conflict.error");
|
|
|
58
58
|
const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
59
59
|
const execution_utils_1 = require("../executions/execution.utils");
|
|
60
60
|
const node_types_1 = require("../node-types");
|
|
61
|
+
const cors_util_1 = require("../utils/cors.util");
|
|
61
62
|
const WebhookHelpers = __importStar(require("../webhooks/webhook-helpers"));
|
|
62
63
|
const WorkflowExecuteAdditionalData = __importStar(require("../workflow-execute-additional-data"));
|
|
63
|
-
const
|
|
64
|
+
const workflow_helpers_1 = require("../workflow-helpers");
|
|
64
65
|
let WaitingWebhooks = class WaitingWebhooks {
|
|
65
66
|
constructor(logger, nodeTypes, executionRepository, webhookService, instanceSettings) {
|
|
66
67
|
this.logger = logger;
|
|
@@ -177,18 +178,7 @@ let WaitingWebhooks = class WaitingWebhooks {
|
|
|
177
178
|
executionStackEntry.node.rewireOutputLogTo = n8n_workflow_1.NodeConnectionTypes.AiTool;
|
|
178
179
|
}
|
|
179
180
|
const runDataArray = execution.data.resultData.runData[lastNodeExecuted];
|
|
180
|
-
|
|
181
|
-
const preservedInputOverride = entryToPop?.inputOverride;
|
|
182
|
-
runDataArray.pop();
|
|
183
|
-
if (preservedInputOverride) {
|
|
184
|
-
runDataArray.push({
|
|
185
|
-
startTime: 0,
|
|
186
|
-
executionTime: 0,
|
|
187
|
-
executionIndex: 0,
|
|
188
|
-
source: entryToPop?.source ?? [],
|
|
189
|
-
inputOverride: preservedInputOverride,
|
|
190
|
-
});
|
|
191
|
-
}
|
|
181
|
+
(0, workflow_helpers_1.preserveInputOverride)(runDataArray);
|
|
192
182
|
const { workflowData } = execution;
|
|
193
183
|
const workflow = this.createWorkflow(workflowData);
|
|
194
184
|
const workflowStartNode = workflow.getNode(lastNodeExecuted);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waiting-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/waiting-webhooks.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAE7C,gCAA8C;AAC9C,gCAAkC;AAClC,oDAA4B;AAE5B,uCAKkB;AAClB,+CAQsB;AAEtB,2EAAqE;AACrE,uDAAmD;AAOnD,4EAAwE;AACxE,8EAAyE;AACzE,kEAAuF;AACvF,6CAAyC;AACzC,2EAA6D;AAC7D,kGAAoF;AACpF,
|
|
1
|
+
{"version":3,"file":"waiting-webhooks.js","sourceRoot":"","sources":["../../src/webhooks/waiting-webhooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,3 +8,4 @@ export declare function getVariables(workflowId?: string, projectId?: string): P
|
|
|
8
8
|
export declare function shouldRestartParentExecution(parentExecution: RelatedExecution | undefined): parentExecution is RelatedExecution;
|
|
9
9
|
export declare function updateParentExecutionWithChildResults(executionRepository: ExecutionRepository, parentExecutionId: string, subworkflowResults: IRun): Promise<void>;
|
|
10
10
|
export declare function getActiveVersionUpdateValue(dbWorkflow: WorkflowEntity, updatedVersion: WorkflowHistory, updatedActive?: boolean): WorkflowHistory | null;
|
|
11
|
+
export declare function preserveInputOverride(runDataArray: ITaskData[]): void;
|
package/dist/workflow-helpers.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.getVariables = getVariables;
|
|
|
8
8
|
exports.shouldRestartParentExecution = shouldRestartParentExecution;
|
|
9
9
|
exports.updateParentExecutionWithChildResults = updateParentExecutionWithChildResults;
|
|
10
10
|
exports.getActiveVersionUpdateValue = getActiveVersionUpdateValue;
|
|
11
|
+
exports.preserveInputOverride = preserveInputOverride;
|
|
11
12
|
const db_1 = require("@n8n/db");
|
|
12
13
|
const di_1 = require("@n8n/di");
|
|
13
14
|
const uuid_1 = require("uuid");
|
|
@@ -68,6 +69,9 @@ function removeDefaultValues(settings, defaultExecutionTimeout) {
|
|
|
68
69
|
if (cleanedSettings.executionTimeout === defaultExecutionTimeout) {
|
|
69
70
|
delete cleanedSettings.executionTimeout;
|
|
70
71
|
}
|
|
72
|
+
if (!cleanedSettings.credentialResolverId) {
|
|
73
|
+
delete cleanedSettings.credentialResolverId;
|
|
74
|
+
}
|
|
71
75
|
return cleanedSettings;
|
|
72
76
|
}
|
|
73
77
|
async function replaceInvalidCredentials(workflow) {
|
|
@@ -204,4 +208,17 @@ function getActiveVersionUpdateValue(dbWorkflow, updatedVersion, updatedActive)
|
|
|
204
208
|
}
|
|
205
209
|
return dbWorkflow.activeVersionId ? updatedVersion : null;
|
|
206
210
|
}
|
|
211
|
+
function preserveInputOverride(runDataArray) {
|
|
212
|
+
const entryToPop = runDataArray.pop();
|
|
213
|
+
const preservedInputOverride = entryToPop.inputOverride;
|
|
214
|
+
if (preservedInputOverride) {
|
|
215
|
+
runDataArray.push({
|
|
216
|
+
startTime: 0,
|
|
217
|
+
executionTime: 0,
|
|
218
|
+
executionIndex: 0,
|
|
219
|
+
source: entryToPop.source,
|
|
220
|
+
inputOverride: preservedInputOverride,
|
|
221
|
+
});
|
|
222
|
+
}
|
|
223
|
+
}
|
|
207
224
|
//# sourceMappingURL=workflow-helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-helpers.js","sourceRoot":"","sources":["../src/workflow-helpers.ts"],"names":[],"mappings":";;AAqBA,kEAiCC;AAKD,gCASC;AAUD,
|
|
1
|
+
{"version":3,"file":"workflow-helpers.js","sourceRoot":"","sources":["../src/workflow-helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,7 @@ export declare class WorkflowExecutionService {
|
|
|
29
29
|
constructor(logger: Logger, errorReporter: ErrorReporter, executionPersistence: ExecutionPersistence, workflowRepository: WorkflowRepository, nodeTypes: NodeTypes, testWebhooks: TestWebhooks, workflowRunner: WorkflowRunner, globalConfig: GlobalConfig, subworkflowPolicyChecker: SubworkflowPolicyChecker, failedRunFactory: FailedRunFactory, eventService: EventService);
|
|
30
30
|
runWorkflow(workflowData: IWorkflowBase, node: INode, data: INodeExecutionData[][], additionalData: IWorkflowExecuteAdditionalData, mode: WorkflowExecuteMode, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>): Promise<string>;
|
|
31
31
|
private isDestinationNodeATrigger;
|
|
32
|
-
executeManually(payload: WorkflowRequest.ManualRunPayload, user: User, pushRef?: string): Promise<{
|
|
32
|
+
executeManually(workflowData: IWorkflowBase, payload: WorkflowRequest.ManualRunPayload, user: User, pushRef?: string): Promise<{
|
|
33
33
|
executionId: string;
|
|
34
34
|
} | {
|
|
35
35
|
waitingForWebhook: boolean;
|
|
@@ -102,23 +102,23 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
102
102
|
const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
|
|
103
103
|
return nodeType.description.group.includes('trigger');
|
|
104
104
|
}
|
|
105
|
-
async executeManually(payload, user, pushRef) {
|
|
106
|
-
const workflowIsActive = await this.workflowRepository.isActive(
|
|
107
|
-
|
|
108
|
-
|
|
105
|
+
async executeManually(workflowData, payload, user, pushRef) {
|
|
106
|
+
const workflowIsActive = await this.workflowRepository.isActive(workflowData.id);
|
|
107
|
+
workflowData.active = false;
|
|
108
|
+
workflowData.activeVersionId = null;
|
|
109
109
|
if ('triggerToStartFrom' in payload) {
|
|
110
110
|
Reflect.deleteProperty(payload, 'runData');
|
|
111
111
|
}
|
|
112
112
|
let data;
|
|
113
113
|
if (isPartialExecution(payload)) {
|
|
114
|
-
if (this.partialExecutionFulfilsPreconditions(payload)) {
|
|
114
|
+
if (this.partialExecutionFulfilsPreconditions(workflowData, payload)) {
|
|
115
115
|
data = {
|
|
116
116
|
destinationNode: payload.destinationNode,
|
|
117
117
|
executionMode: 'manual',
|
|
118
118
|
runData: payload.runData,
|
|
119
|
-
pinData:
|
|
119
|
+
pinData: workflowData.pinData,
|
|
120
120
|
pushRef,
|
|
121
|
-
workflowData
|
|
121
|
+
workflowData,
|
|
122
122
|
userId: user.id,
|
|
123
123
|
dirtyNodeNames: payload.dirtyNodeNames,
|
|
124
124
|
agentRequest: payload.agentRequest,
|
|
@@ -129,13 +129,13 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
if (isFullExecutionFromKnownTrigger(payload)) {
|
|
132
|
-
if (triggerHasNoPinnedData(payload) &&
|
|
132
|
+
if (triggerHasNoPinnedData(workflowData, payload) &&
|
|
133
133
|
(await this.testWebhooks.needsWebhook({
|
|
134
134
|
userId: user.id,
|
|
135
|
-
workflowEntity:
|
|
135
|
+
workflowEntity: workflowData,
|
|
136
136
|
additionalData: await WorkflowExecuteAdditionalData.getBase({
|
|
137
137
|
userId: user.id,
|
|
138
|
-
workflowId:
|
|
138
|
+
workflowId: workflowData.id,
|
|
139
139
|
}),
|
|
140
140
|
pushRef,
|
|
141
141
|
triggerToStartFrom: payload.triggerToStartFrom,
|
|
@@ -147,9 +147,9 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
147
147
|
}
|
|
148
148
|
data = {
|
|
149
149
|
executionMode: 'manual',
|
|
150
|
-
pinData:
|
|
150
|
+
pinData: workflowData.pinData,
|
|
151
151
|
pushRef,
|
|
152
|
-
workflowData
|
|
152
|
+
workflowData,
|
|
153
153
|
userId: user.id,
|
|
154
154
|
triggerToStartFrom: payload.triggerToStartFrom,
|
|
155
155
|
agentRequest: payload.agentRequest,
|
|
@@ -157,16 +157,14 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
157
157
|
};
|
|
158
158
|
}
|
|
159
159
|
if (isFullExecutionFromUnknownTrigger(payload)) {
|
|
160
|
-
const pinnedTrigger = payload.destinationNode
|
|
161
|
-
? this.selectPinnedTrigger(payload.workflowData, payload.destinationNode.nodeName, payload.workflowData.pinData ?? {})
|
|
162
|
-
: undefined;
|
|
160
|
+
const pinnedTrigger = this.selectPinnedTrigger(workflowData, payload.destinationNode.nodeName, workflowData.pinData ?? {});
|
|
163
161
|
if (pinnedTrigger === undefined &&
|
|
164
162
|
(await this.testWebhooks.needsWebhook({
|
|
165
163
|
userId: user.id,
|
|
166
|
-
workflowEntity:
|
|
164
|
+
workflowEntity: workflowData,
|
|
167
165
|
additionalData: await WorkflowExecuteAdditionalData.getBase({
|
|
168
166
|
userId: user.id,
|
|
169
|
-
workflowId:
|
|
167
|
+
workflowId: workflowData.id,
|
|
170
168
|
}),
|
|
171
169
|
pushRef,
|
|
172
170
|
destinationNode: payload.destinationNode,
|
|
@@ -176,9 +174,9 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
176
174
|
}
|
|
177
175
|
data = {
|
|
178
176
|
executionMode: 'manual',
|
|
179
|
-
pinData:
|
|
177
|
+
pinData: workflowData.pinData,
|
|
180
178
|
pushRef,
|
|
181
|
-
workflowData
|
|
179
|
+
workflowData,
|
|
182
180
|
userId: user.id,
|
|
183
181
|
agentRequest: payload.agentRequest,
|
|
184
182
|
destinationNode: payload.destinationNode,
|
|
@@ -369,11 +367,11 @@ let WorkflowExecutionService = class WorkflowExecutionService {
|
|
|
369
367
|
node.type !== 'n8n-nodes-base.respondToWebhook')
|
|
370
368
|
.sort((a) => (a.type.endsWith('webhook') ? -1 : 1));
|
|
371
369
|
}
|
|
372
|
-
partialExecutionFulfilsPreconditions(payload) {
|
|
373
|
-
if (this.isDestinationNodeATrigger(payload.destinationNode.nodeName,
|
|
370
|
+
partialExecutionFulfilsPreconditions(workflowData, payload) {
|
|
371
|
+
if (this.isDestinationNodeATrigger(payload.destinationNode.nodeName, workflowData)) {
|
|
374
372
|
return false;
|
|
375
373
|
}
|
|
376
|
-
return (0, n8n_core_1.anyReachableRootHasRunData)(n8n_core_1.DirectedGraph.fromNodesAndConnections(
|
|
374
|
+
return (0, n8n_core_1.anyReachableRootHasRunData)(n8n_core_1.DirectedGraph.fromNodesAndConnections(workflowData.nodes, workflowData.connections), payload.destinationNode.nodeName, payload.runData);
|
|
377
375
|
}
|
|
378
376
|
};
|
|
379
377
|
exports.WorkflowExecutionService = WorkflowExecutionService;
|
|
@@ -403,12 +401,11 @@ function isFullExecutionFromUnknownTrigger(payload) {
|
|
|
403
401
|
}
|
|
404
402
|
return !('runData' in payload);
|
|
405
403
|
}
|
|
406
|
-
function triggerHasNoPinnedData(payload) {
|
|
407
|
-
return
|
|
404
|
+
function triggerHasNoPinnedData(workflowData, payload) {
|
|
405
|
+
return workflowData.pinData?.[payload.triggerToStartFrom.name] === undefined;
|
|
408
406
|
}
|
|
409
407
|
function upgradeToFullManualExecutionFromUnknownTrigger(payload) {
|
|
410
408
|
return {
|
|
411
|
-
workflowData: payload.workflowData,
|
|
412
409
|
destinationNode: payload.destinationNode,
|
|
413
410
|
agentRequest: payload.agentRequest,
|
|
414
411
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-execution.service.js","sourceRoot":"","sources":["../../src/workflows/workflow-execution.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"workflow-execution.service.js","sourceRoot":"","sources":["../../src/workflows/workflow-execution.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { AuthenticatedRequest } from '@n8n/db';
|
|
2
|
-
import type { INode, IConnections, IWorkflowSettings, IRunData, ITaskData,
|
|
2
|
+
import type { INode, IConnections, IWorkflowSettings, IRunData, ITaskData, AiAgentRequest, IDestinationNode } from 'n8n-workflow';
|
|
3
3
|
import type { ListQuery } from '../requests';
|
|
4
4
|
export declare namespace WorkflowRequest {
|
|
5
5
|
type CreateUpdatePayload = Partial<{
|
|
@@ -21,7 +21,6 @@ export declare namespace WorkflowRequest {
|
|
|
21
21
|
autosaved?: boolean;
|
|
22
22
|
}>;
|
|
23
23
|
type FullManualExecutionFromKnownTriggerPayload = {
|
|
24
|
-
workflowData: IWorkflowBase;
|
|
25
24
|
agentRequest?: AiAgentRequest;
|
|
26
25
|
chatSessionId?: string;
|
|
27
26
|
destinationNode?: IDestinationNode;
|
|
@@ -31,12 +30,10 @@ export declare namespace WorkflowRequest {
|
|
|
31
30
|
};
|
|
32
31
|
};
|
|
33
32
|
type FullManualExecutionFromUnknownTriggerPayload = {
|
|
34
|
-
workflowData: IWorkflowBase;
|
|
35
33
|
agentRequest?: AiAgentRequest;
|
|
36
34
|
destinationNode: IDestinationNode;
|
|
37
35
|
};
|
|
38
36
|
type PartialManualExecutionToDestinationPayload = {
|
|
39
|
-
workflowData: IWorkflowBase;
|
|
40
37
|
agentRequest?: AiAgentRequest;
|
|
41
38
|
runData: IRunData;
|
|
42
39
|
destinationNode: IDestinationNode;
|
|
@@ -66,6 +66,7 @@ const not_found_error_1 = require("../errors/response-errors/not-found.error");
|
|
|
66
66
|
const workflow_validation_error_1 = require("../errors/response-errors/workflow-validation.error");
|
|
67
67
|
const workflow_history_version_not_found_error_1 = require("../errors/workflow-history-version-not-found.error");
|
|
68
68
|
const event_service_1 = require("../events/event.service");
|
|
69
|
+
const check_access_1 = require("../permissions.ee/check-access");
|
|
69
70
|
const external_hooks_1 = require("../external-hooks");
|
|
70
71
|
const generic_helpers_1 = require("../generic-helpers");
|
|
71
72
|
const node_types_1 = require("../node-types");
|
|
@@ -241,6 +242,15 @@ let WorkflowService = class WorkflowService {
|
|
|
241
242
|
}
|
|
242
243
|
await WorkflowHelpers.replaceInvalidCredentials(workflowUpdateData);
|
|
243
244
|
WorkflowHelpers.addNodeIds(workflowUpdateData);
|
|
245
|
+
if (workflowUpdateData.settings?.redactionPolicy !== undefined &&
|
|
246
|
+
workflowUpdateData.settings.redactionPolicy !== workflow.settings?.redactionPolicy) {
|
|
247
|
+
const canUpdate = await (0, check_access_1.userHasScopes)(user, ['workflow:updateRedactionSetting'], false, {
|
|
248
|
+
workflowId,
|
|
249
|
+
});
|
|
250
|
+
if (!canUpdate) {
|
|
251
|
+
delete workflowUpdateData.settings.redactionPolicy;
|
|
252
|
+
}
|
|
253
|
+
}
|
|
244
254
|
if (workflowUpdateData.settings && workflow.settings) {
|
|
245
255
|
workflowUpdateData.settings = {
|
|
246
256
|
...workflow.settings,
|
|
@@ -649,7 +659,7 @@ let WorkflowService = class WorkflowService {
|
|
|
649
659
|
async _detectConflicts(dbWorkflow, expectedChecksum) {
|
|
650
660
|
const currentChecksum = await (0, n8n_workflow_1.calculateWorkflowChecksum)(dbWorkflow);
|
|
651
661
|
if (expectedChecksum !== currentChecksum) {
|
|
652
|
-
throw new
|
|
662
|
+
throw new conflict_error_1.ConflictError('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.');
|
|
653
663
|
}
|
|
654
664
|
}
|
|
655
665
|
_validateNodes(workflowId, nodes, connections) {
|