n8n 1.112.5 → 1.113.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/active-executions.d.ts +3 -1
- package/dist/active-executions.js +6 -2
- package/dist/active-executions.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/chat/chat-execution-manager.js +7 -1
- package/dist/chat/chat-execution-manager.js.map +1 -1
- package/dist/commands/export/entities.d.ts +14 -0
- package/dist/commands/export/entities.js +46 -0
- package/dist/commands/export/entities.js.map +1 -0
- package/dist/commands/import/entities.d.ts +14 -0
- package/dist/commands/import/entities.js +47 -0
- package/dist/commands/import/entities.js.map +1 -0
- package/dist/controllers/me.controller.d.ts +1 -0
- package/dist/controllers/me.controller.js +50 -21
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/role.controller.d.ts +3 -3
- package/dist/controllers/role.controller.js +9 -6
- package/dist/controllers/role.controller.js.map +1 -1
- package/dist/credentials/credentials-finder.service.d.ts +3 -1
- package/dist/credentials/credentials-finder.service.js +23 -10
- package/dist/credentials/credentials-finder.service.js.map +1 -1
- package/dist/credentials/credentials.service.ee.d.ts +3 -1
- package/dist/credentials/credentials.service.ee.js +7 -3
- package/dist/credentials/credentials.service.ee.js.map +1 -1
- package/dist/credentials/credentials.service.js +2 -2
- package/dist/credentials/credentials.service.js.map +1 -1
- package/dist/deprecation/deprecation.service.js +5 -0
- package/dist/deprecation/deprecation.service.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +13 -4
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +3 -0
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +7 -3
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/executions/execution.service.d.ts +5 -2
- package/dist/executions/execution.service.js +46 -24
- package/dist/executions/execution.service.js.map +1 -1
- package/dist/executions/executions.controller.d.ts +5 -0
- package/dist/executions/executions.controller.js +16 -4
- package/dist/executions/executions.controller.js.map +1 -1
- package/dist/modules/data-table/data-store-aggregate.controller.d.ts +1 -4
- package/dist/modules/data-table/data-store-aggregate.controller.js +3 -3
- package/dist/modules/data-table/data-store-aggregate.controller.js.map +1 -1
- package/dist/modules/data-table/data-store-proxy.service.d.ts +4 -0
- package/dist/modules/data-table/data-store-proxy.service.js +11 -1
- package/dist/modules/data-table/data-store-proxy.service.js.map +1 -1
- package/dist/modules/data-table/data-store-rows.repository.js +12 -2
- package/dist/modules/data-table/data-store-rows.repository.js.map +1 -1
- package/dist/modules/data-table/data-store-size-validator.service.d.ts +5 -5
- package/dist/modules/data-table/data-store-size-validator.service.js +16 -15
- package/dist/modules/data-table/data-store-size-validator.service.js.map +1 -1
- package/dist/modules/data-table/data-store.controller.js +1 -1
- package/dist/modules/data-table/data-store.controller.js.map +1 -1
- package/dist/modules/data-table/data-store.repository.d.ts +6 -2
- package/dist/modules/data-table/data-store.repository.js +114 -31
- package/dist/modules/data-table/data-store.repository.js.map +1 -1
- package/dist/modules/data-table/data-store.service.d.ts +8 -6
- package/dist/modules/data-table/data-store.service.js +51 -20
- package/dist/modules/data-table/data-store.service.js.map +1 -1
- package/dist/modules/data-table/utils/sql-utils.d.ts +2 -0
- package/dist/modules/data-table/utils/sql-utils.js +7 -2
- package/dist/modules/data-table/utils/sql-utils.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.d.ts +1 -1
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js +22 -9
- package/dist/modules/external-secrets.ee/external-secrets-manager.ee.js.map +1 -1
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +6 -3
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js +21 -8
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js.map +1 -1
- package/dist/modules/insights/insights.controller.d.ts +1 -1
- package/dist/modules/insights/insights.controller.js +6 -2
- package/dist/modules/insights/insights.controller.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +6 -3
- package/dist/modules/insights/insights.service.js +6 -3
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/permissions.ee/check-access.js +6 -3
- package/dist/permissions.ee/check-access.js.map +1 -1
- package/dist/public-api/v1/openapi.yml +1 -1
- package/dist/scaling/constants.d.ts +2 -2
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +1 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -1
- package/dist/services/export.service.d.ts +9 -0
- package/dist/services/export.service.js +107 -0
- package/dist/services/export.service.js.map +1 -0
- package/dist/services/frontend.service.js +1 -0
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +4 -2
- package/dist/services/project.service.ee.js +19 -4
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/role-cache.service.d.ts +14 -0
- package/dist/services/role-cache.service.js +79 -0
- package/dist/services/role-cache.service.js.map +1 -0
- package/dist/services/role.service.d.ts +16 -4
- package/dist/services/role.service.js +30 -7
- package/dist/services/role.service.js.map +1 -1
- package/dist/sso.ee/saml/saml.service.ee.d.ts +8 -3
- package/dist/sso.ee/saml/saml.service.ee.js +49 -5
- package/dist/sso.ee/saml/saml.service.ee.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.d.ts +5 -0
- package/dist/task-runners/task-managers/task-requester.js +42 -0
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/dist/task-runners/task-runner-module.d.ts +3 -1
- package/dist/task-runners/task-runner-module.js +8 -2
- package/dist/task-runners/task-runner-module.js.map +1 -1
- package/dist/utils/get-item-count-by-connection-type.d.ts +2 -0
- package/dist/utils/get-item-count-by-connection-type.js +20 -0
- package/dist/utils/get-item-count-by-connection-type.js.map +1 -0
- package/dist/webhooks/webhook-request-handler.js +4 -26
- package/dist/webhooks/webhook-request-handler.js.map +1 -1
- package/dist/workflows/workflow-finder.service.d.ts +3 -1
- package/dist/workflows/workflow-finder.service.js +13 -6
- package/dist/workflows/workflow-finder.service.js.map +1 -1
- package/dist/workflows/workflow-sharing.service.js +6 -2
- package/dist/workflows/workflow-sharing.service.js.map +1 -1
- package/dist/workflows/workflows.controller.js +1 -1
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +26 -26
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,wDAAmD;AACnD,gCAaiB;AACjB,gCAAkC;
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../src/services/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { Logger } from '@n8n/backend-common';
|
|
|
3
3
|
import type { User } from '@n8n/db';
|
|
4
4
|
import { SettingsRepository, UserRepository } from '@n8n/db';
|
|
5
5
|
import type express from 'express';
|
|
6
|
+
import { InstanceSettings } from 'n8n-core';
|
|
6
7
|
import { type IdentityProviderInstance, type ServiceProviderInstance } from 'samlify';
|
|
7
8
|
import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
|
|
8
9
|
import { UrlService } from '../../services/url.service';
|
|
@@ -14,11 +15,12 @@ export declare class SamlService {
|
|
|
14
15
|
private readonly validator;
|
|
15
16
|
private readonly userRepository;
|
|
16
17
|
private readonly settingsRepository;
|
|
18
|
+
private readonly instanceSettings;
|
|
17
19
|
private identityProviderInstance;
|
|
18
20
|
private samlify;
|
|
19
21
|
private _samlPreferences;
|
|
20
22
|
get samlPreferences(): SamlPreferences;
|
|
21
|
-
constructor(logger: Logger, urlService: UrlService, validator: SamlValidator, userRepository: UserRepository, settingsRepository: SettingsRepository);
|
|
23
|
+
constructor(logger: Logger, urlService: UrlService, validator: SamlValidator, userRepository: UserRepository, settingsRepository: SettingsRepository, instanceSettings: InstanceSettings);
|
|
22
24
|
init(): Promise<void>;
|
|
23
25
|
loadSamlify(): Promise<void>;
|
|
24
26
|
getIdentityProviderInstance(forceRecreate?: boolean): IdentityProviderInstance;
|
|
@@ -34,9 +36,12 @@ export declare class SamlService {
|
|
|
34
36
|
attributes: SamlUserAttributes;
|
|
35
37
|
onboardingRequired: boolean;
|
|
36
38
|
}>;
|
|
37
|
-
|
|
39
|
+
private broadcastReloadSAMLConfigurationCommand;
|
|
40
|
+
private isReloading;
|
|
41
|
+
reload(): Promise<void>;
|
|
42
|
+
setSamlPreferences(prefs: Partial<SamlPreferences>, tryFallback?: boolean, broadcastReload?: boolean): Promise<SamlPreferences | undefined>;
|
|
38
43
|
loadPreferencesWithoutValidation(prefs: Partial<SamlPreferences>): Promise<void>;
|
|
39
|
-
loadFromDbAndApplySamlPreferences(apply?: boolean): Promise<SamlPreferences | undefined>;
|
|
44
|
+
loadFromDbAndApplySamlPreferences(apply?: boolean, broadcastReload?: boolean): Promise<SamlPreferences | undefined>;
|
|
40
45
|
saveSamlPreferencesToDb(): Promise<SamlPreferences | undefined>;
|
|
41
46
|
fetchMetadataFromUrl(): Promise<string | undefined>;
|
|
42
47
|
getAttributesFromLoginResponse(req: express.Request, binding: SamlLoginBinding): Promise<SamlUserAttributes>;
|
|
@@ -47,10 +47,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
47
47
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
48
48
|
exports.SamlService = void 0;
|
|
49
49
|
const backend_common_1 = require("@n8n/backend-common");
|
|
50
|
+
const config_1 = require("@n8n/config");
|
|
50
51
|
const db_1 = require("@n8n/db");
|
|
52
|
+
const decorators_1 = require("@n8n/decorators");
|
|
51
53
|
const di_1 = require("@n8n/di");
|
|
52
54
|
const axios_1 = __importDefault(require("axios"));
|
|
53
55
|
const https_1 = __importDefault(require("https"));
|
|
56
|
+
const n8n_core_1 = require("n8n-core");
|
|
54
57
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
55
58
|
const auth_error_1 = require("../../errors/response-errors/auth.error");
|
|
56
59
|
const bad_request_error_1 = require("../../errors/response-errors/bad-request.error");
|
|
@@ -70,12 +73,13 @@ let SamlService = class SamlService {
|
|
|
70
73
|
loginLabel: (0, saml_helpers_1.getSamlLoginLabel)(),
|
|
71
74
|
};
|
|
72
75
|
}
|
|
73
|
-
constructor(logger, urlService, validator, userRepository, settingsRepository) {
|
|
76
|
+
constructor(logger, urlService, validator, userRepository, settingsRepository, instanceSettings) {
|
|
74
77
|
this.logger = logger;
|
|
75
78
|
this.urlService = urlService;
|
|
76
79
|
this.validator = validator;
|
|
77
80
|
this.userRepository = userRepository;
|
|
78
81
|
this.settingsRepository = settingsRepository;
|
|
82
|
+
this.instanceSettings = instanceSettings;
|
|
79
83
|
this._samlPreferences = {
|
|
80
84
|
mapping: {
|
|
81
85
|
email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
|
|
@@ -102,6 +106,7 @@ let SamlService = class SamlService {
|
|
|
102
106
|
},
|
|
103
107
|
},
|
|
104
108
|
};
|
|
109
|
+
this.isReloading = false;
|
|
105
110
|
}
|
|
106
111
|
async init() {
|
|
107
112
|
try {
|
|
@@ -231,7 +236,36 @@ let SamlService = class SamlService {
|
|
|
231
236
|
onboardingRequired: false,
|
|
232
237
|
};
|
|
233
238
|
}
|
|
234
|
-
async
|
|
239
|
+
async broadcastReloadSAMLConfigurationCommand() {
|
|
240
|
+
if (this.instanceSettings.isMultiMain) {
|
|
241
|
+
const { Publisher } = await Promise.resolve().then(() => __importStar(require('../../scaling/pubsub/publisher.service')));
|
|
242
|
+
await di_1.Container.get(Publisher).publishCommand({ command: 'reload-saml-config' });
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
async reload() {
|
|
246
|
+
if (this.isReloading) {
|
|
247
|
+
this.logger.warn('SAML configuration reload already in progress');
|
|
248
|
+
return;
|
|
249
|
+
}
|
|
250
|
+
this.isReloading = true;
|
|
251
|
+
try {
|
|
252
|
+
this.logger.debug('SAML configuration changed, starting to load it from the database');
|
|
253
|
+
await this.loadFromDbAndApplySamlPreferences(true, false);
|
|
254
|
+
await (0, sso_helpers_1.reloadAuthenticationMethod)();
|
|
255
|
+
const samlLoginEnabled = (0, saml_helpers_1.isSamlLoginEnabled)();
|
|
256
|
+
this.logger.debug(`SAML login is now ${samlLoginEnabled ? 'enabled' : 'disabled'}.`);
|
|
257
|
+
di_1.Container.get(config_1.GlobalConfig).sso.saml.loginEnabled = samlLoginEnabled;
|
|
258
|
+
}
|
|
259
|
+
catch (error) {
|
|
260
|
+
this.logger.error('SAML configuration changed, failed to reload SAML configuration', {
|
|
261
|
+
error,
|
|
262
|
+
});
|
|
263
|
+
}
|
|
264
|
+
finally {
|
|
265
|
+
this.isReloading = false;
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
async setSamlPreferences(prefs, tryFallback = false, broadcastReload = true) {
|
|
235
269
|
await this.loadSamlify();
|
|
236
270
|
const previousMetadataUrl = this._samlPreferences.metadataUrl;
|
|
237
271
|
await this.loadPreferencesWithoutValidation(prefs);
|
|
@@ -272,6 +306,9 @@ let SamlService = class SamlService {
|
|
|
272
306
|
}
|
|
273
307
|
this.getIdentityProviderInstance(true);
|
|
274
308
|
const result = await this.saveSamlPreferencesToDb();
|
|
309
|
+
if (broadcastReload) {
|
|
310
|
+
await this.broadcastReloadSAMLConfigurationCommand();
|
|
311
|
+
}
|
|
275
312
|
return result;
|
|
276
313
|
}
|
|
277
314
|
async loadPreferencesWithoutValidation(prefs) {
|
|
@@ -298,7 +335,7 @@ let SamlService = class SamlService {
|
|
|
298
335
|
await (0, saml_helpers_1.setSamlLoginEnabled)(prefs.loginEnabled ?? (0, saml_helpers_1.isSamlLoginEnabled)());
|
|
299
336
|
(0, saml_helpers_1.setSamlLoginLabel)(prefs.loginLabel ?? (0, saml_helpers_1.getSamlLoginLabel)());
|
|
300
337
|
}
|
|
301
|
-
async loadFromDbAndApplySamlPreferences(apply = true) {
|
|
338
|
+
async loadFromDbAndApplySamlPreferences(apply = true, broadcastReload = true) {
|
|
302
339
|
const samlPreferences = await this.settingsRepository.findOne({
|
|
303
340
|
where: { key: constants_1.SAML_PREFERENCES_DB_KEY },
|
|
304
341
|
});
|
|
@@ -306,7 +343,7 @@ let SamlService = class SamlService {
|
|
|
306
343
|
const prefs = (0, n8n_workflow_1.jsonParse)(samlPreferences.value);
|
|
307
344
|
if (prefs) {
|
|
308
345
|
if (apply) {
|
|
309
|
-
await this.setSamlPreferences(prefs, true);
|
|
346
|
+
await this.setSamlPreferences(prefs, true, broadcastReload);
|
|
310
347
|
}
|
|
311
348
|
else {
|
|
312
349
|
await this.loadPreferencesWithoutValidation(prefs);
|
|
@@ -388,12 +425,19 @@ let SamlService = class SamlService {
|
|
|
388
425
|
}
|
|
389
426
|
};
|
|
390
427
|
exports.SamlService = SamlService;
|
|
428
|
+
__decorate([
|
|
429
|
+
(0, decorators_1.OnPubSubEvent)('reload-saml-config'),
|
|
430
|
+
__metadata("design:type", Function),
|
|
431
|
+
__metadata("design:paramtypes", []),
|
|
432
|
+
__metadata("design:returntype", Promise)
|
|
433
|
+
], SamlService.prototype, "reload", null);
|
|
391
434
|
exports.SamlService = SamlService = __decorate([
|
|
392
435
|
(0, di_1.Service)(),
|
|
393
436
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
394
437
|
url_service_1.UrlService,
|
|
395
438
|
saml_validator_1.SamlValidator,
|
|
396
439
|
db_1.UserRepository,
|
|
397
|
-
db_1.SettingsRepository
|
|
440
|
+
db_1.SettingsRepository,
|
|
441
|
+
n8n_core_1.InstanceSettings])
|
|
398
442
|
], SamlService);
|
|
399
443
|
//# sourceMappingURL=saml.service.ee.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saml.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/saml/saml.service.ee.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAA6C;AAE7C,gCAA2E;AAC3E,gCAAkC;AAClC,kDAA0B;AAE1B,kDAA0B;AAC1B,+CAA0D;AAI1D,oEAAgE;AAChE,kFAA6E;AAC7E,wDAAoD;AAEpD,2CAAsD;AACtD,8FAAuF;AACvF,sFAAgF;AAChF,iDASwB;AACxB,qDAAiD;AACjD,+DAAmE;AAEnE,gDAAoE;AAG7D,IAAM,WAAW,GAAjB,MAAM,WAAW;IAiCvB,IAAI,eAAe;QAClB,OAAO;YACN,GAAG,IAAI,CAAC,gBAAgB;YACxB,YAAY,EAAE,IAAA,iCAAkB,GAAE;YAClC,UAAU,EAAE,IAAA,gCAAiB,GAAE;SAC/B,CAAC;IACH,CAAC;IAED,YACkB,MAAc,EACd,UAAsB,EACtB,SAAwB,EACxB,cAA8B,EAC9B,kBAAsC;QAJtC,WAAM,GAAN,MAAM,CAAQ;QACd,eAAU,GAAV,UAAU,CAAY;QACtB,cAAS,GAAT,SAAS,CAAe;QACxB,mBAAc,GAAd,cAAc,CAAgB;QAC9B,uBAAkB,GAAlB,kBAAkB,CAAoB;QAxChD,qBAAgB,GAAoB;YAC3C,OAAO,EAAE;gBACR,KAAK,EAAE,oEAAoE;gBAC3E,SAAS,EAAE,iEAAiE;gBAC5E,QAAQ,EAAE,gEAAgE;gBAC1E,iBAAiB,EAAE,2DAA2D;aAC9E;YACD,QAAQ,EAAE,EAAE;YACZ,WAAW,EAAE,EAAE;YACf,SAAS,EAAE,KAAK;YAChB,YAAY,EAAE,UAAU;YACxB,UAAU,EAAE,MAAM;YAClB,mBAAmB,EAAE,KAAK;YAC1B,YAAY,EAAE,KAAK;YACnB,UAAU,EAAE,MAAM;YAClB,oBAAoB,EAAE,IAAI;YAC1B,iBAAiB,EAAE,IAAI;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE;YAChD,eAAe,EAAE;gBAChB,MAAM,EAAE,IAAI;gBACZ,QAAQ,EAAE;oBACT,SAAS,EAAE,6BAA6B;oBACxC,MAAM,EAAE,OAAO;iBACf;aACD;SACD,CAAC;IAgBC,CAAC;IAEJ,KAAK,CAAC,IAAI;QACT,IAAI,CAAC;YAEJ,MAAM,IAAI,CAAC,iCAAiC,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;YAC5B,IAAI,IAAA,uCAAwB,GAAE,EAAE,CAAC;gBAChC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;gBACzB,MAAM,IAAI,CAAC,iCAAiC,CAAC,IAAI,CAAC,CAAC;YACpD,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAGhB,IACC,KAAK,YAAY,6DAA2B;gBAC5C,KAAK,YAAY,sDAAwB;gBACzC,KAAK,YAAY,WAAW,EAC3B,CAAC;gBACF,IAAI,CAAC,MAAM,CAAC,IAAI,CACf,uEAAuE,KAAK,CAAC,OAAO,oIAAoI,CACxN,CAAC;gBACF,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACP,MAAM,KAAK,CAAC;YACb,CAAC;QACF,CAAC;IACF,CAAC;IAED,KAAK,CAAC,WAAW;QAChB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACzD,IAAI,CAAC,OAAO,GAAG,wDAAa,SAAS,GAAC,CAAC;QACxC,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC;YAC/B,QAAQ,EAAE,KAAK,EAAE,QAAgB,EAAE,EAAE;gBACpC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBAC9D,IAAI,CAAC,KAAK,EAAE,CAAC;oBACZ,MAAM,IAAI,sDAAwB,EAAE,CAAC;gBACtC,CAAC;YACF,CAAC;SACD,CAAC,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,aAAa,GAAG,KAAK;QAChD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,8BAAe,CAAC,4BAA4B,CAAC,CAAC;QACzD,CAAC;QACD,IAAI,IAAI,CAAC,wBAAwB,KAAK,SAAS,IAAI,aAAa,EAAE,CAAC;YAClE,IAAI,CAAC,wBAAwB,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC;gBAC7D,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,QAAQ;aACxC,CAAC,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,uBAAuB,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QAEtE,OAAO,IAAI,CAAC,wBAAwB,CAAC;IACtC,CAAC;IAED,0BAA0B;QACzB,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,IAAI,8BAAe,CAAC,4BAA4B,CAAC,CAAC;QACzD,CAAC;QACD,OAAO,IAAA,gDAA0B,EAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,kBAAkB,CACvB,UAAmB,EACnB,OAA0B;QAK1B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,IAAI,OAAO,KAAK,SAAS;YAAE,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,YAAY,IAAI,UAAU,CAAC;QACtF,IAAI,OAAO,KAAK,MAAM,EAAE,CAAC;YACxB,OAAO;gBACN,OAAO;gBACP,OAAO,EAAE,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;aAChD,CAAC;QACH,CAAC;aAAM,CAAC;YACP,OAAO;gBACN,OAAO;gBACP,OAAO,EAAE,IAAI,CAAC,0BAA0B,CAAC,UAAU,CAAC;aACpD,CAAC;QACH,CAAC;IACF,CAAC;IAEO,0BAA0B,CAAC,UAAmB;QACrD,MAAM,EAAE,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC7C,EAAE,CAAC,aAAa,CAAC,UAAU,GAAG,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACjF,MAAM,YAAY,GAAG,EAAE,CAAC,kBAAkB,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,UAAU,CAAC,CAAC;QAC3F,OAAO,YAAY,CAAC;IACrB,CAAC;IAEO,sBAAsB,CAAC,UAAmB;QACjD,MAAM,EAAE,GAAG,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC7C,EAAE,CAAC,aAAa,CAAC,UAAU,GAAG,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;QACjF,MAAM,YAAY,GAAG,EAAE,CAAC,kBAAkB,CACzC,IAAI,CAAC,2BAA2B,EAAE,EAClC,MAAM,CACgB,CAAC;QACxB,OAAO,YAAY,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,eAAe,CACpB,GAAoB,EACpB,OAAyB;QAMzB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAC3E,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;YACtB,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;YAEvD,IAAI,CAAC,IAAA,iBAAY,EAAC,eAAe,CAAC,EAAE,CAAC;gBACpC,MAAM,IAAI,mCAAe,CAAC,sBAAsB,CAAC,CAAC;YACnD,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;gBAC9C,KAAK,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE;gBACjC,SAAS,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC;aACrC,CAAC,CAAC;YACH,IAAI,IAAI,EAAE,CAAC;gBAEV,IACC,IAAI,CAAC,cAAc,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,MAAM,IAAI,CAAC,CAAC,UAAU,KAAK,UAAU,CAAC,iBAAiB,CACjF,EACA,CAAC;oBACF,OAAO;wBACN,iBAAiB,EAAE,IAAI;wBACvB,UAAU;wBACV,kBAAkB,EAAE,KAAK;qBACzB,CAAC;gBACH,CAAC;qBAAM,CAAC;oBAEP,MAAM,WAAW,GAAG,MAAM,IAAA,2CAA4B,EAAC,IAAI,EAAE,UAAU,CAAC,CAAC;oBACzE,MAAM,kBAAkB,GAAG,CAAC,WAAW,CAAC,SAAS,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;oBAC3E,OAAO;wBACN,iBAAiB,EAAE,WAAW;wBAC9B,UAAU;wBACV,kBAAkB;qBAClB,CAAC;gBACH,CAAC;YACF,CAAC;iBAAM,CAAC;gBAEP,IAAI,IAAA,gDAAkC,GAAE,EAAE,CAAC;oBAC1C,MAAM,OAAO,GAAG,MAAM,IAAA,2CAA4B,EAAC,UAAU,CAAC,CAAC;oBAC/D,OAAO;wBACN,iBAAiB,EAAE,OAAO;wBAC1B,UAAU;wBACV,kBAAkB,EAAE,IAAI;qBACxB,CAAC;gBACH,CAAC;YACF,CAAC;QACF,CAAC;QACD,OAAO;YACN,iBAAiB,EAAE,SAAS;YAC5B,UAAU;YACV,kBAAkB,EAAE,KAAK;SACzB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,kBAAkB,CACvB,KAA+B,EAC/B,cAAuB,KAAK;QAE5B,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,MAAM,mBAAmB,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC;QAC9D,MAAM,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC;gBACJ,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC1D,IAAI,eAAe,EAAE,CAAC;oBACrB,IAAI,CAAC,gBAAgB,CAAC,QAAQ,GAAG,eAAe,CAAC;gBAClD,CAAC;qBAAM,CAAC;oBAGP,MAAM,IAAI,6DAA2B,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBAC1D,CAAC;YACF,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,IAAI,CAAC,gBAAgB,CAAC,WAAW,GAAG,mBAAmB,CAAC;gBACxD,IAAI,CAAC,WAAW,EAAE,CAAC;oBAClB,MAAM,KAAK,CAAC;gBACb,CAAC;gBAID,IAAI,CAAC,MAAM,CAAC,KAAK,CAChB,gIAAgI,EAEhI,EAAE,KAAK,EAAE,CACT,CAAC;YACH,CAAC;QACF,CAAC;aAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC/E,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACvB,MAAM,IAAI,sDAAwB,EAAE,CAAC;YACtC,CAAC;QACF,CAAC;QAMD,IAAI,IAAA,iCAAkB,GAAE,EAAE,CAAC;YAC1B,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,CAAC;gBACpC,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAC7D,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAC9B,CAAC;gBACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACvB,MAAM,IAAI,sDAAwB,EAAE,CAAC;gBACtC,CAAC;YACF,CAAC;iBAAM,CAAC;gBAEP,MAAM,IAAI,sDAAwB,EAAE,CAAC;YACtC,CAAC;QACF,CAAC;QACD,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACpD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,KAAK,CAAC,gCAAgC,CAAC,KAA+B;QACrE,IAAI,CAAC,gBAAgB,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;QAC9F,IAAI,CAAC,gBAAgB,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC;QAClF,IAAI,CAAC,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;QAC/E,IAAI,CAAC,gBAAgB,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC;QACrF,IAAI,CAAC,gBAAgB,CAAC,UAAU,GAAG,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC;QACxF,IAAI,CAAC,gBAAgB,CAAC,eAAe;YACpC,KAAK,CAAC,eAAe,IAAI,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;QAChE,IAAI,CAAC,gBAAgB,CAAC,mBAAmB;YACxC,KAAK,CAAC,mBAAmB,IAAI,IAAI,CAAC,gBAAgB,CAAC,mBAAmB,CAAC;QACxE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB;YACzC,KAAK,CAAC,oBAAoB,IAAI,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC;QAC1E,IAAI,CAAC,gBAAgB,CAAC,iBAAiB;YACtC,KAAK,CAAC,iBAAiB,IAAI,IAAI,CAAC,gBAAgB,CAAC,iBAAiB,CAAC;QACpE,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;YACvB,IAAI,CAAC,gBAAgB,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACvD,CAAC;aAAM,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YAE3B,IAAI,CAAC,gBAAgB,CAAC,WAAW,GAAG,SAAS,CAAC;YAC9C,IAAI,CAAC,gBAAgB,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QACjD,CAAC;QACD,MAAM,IAAA,kCAAmB,EAAC,KAAK,CAAC,YAAY,IAAI,IAAA,iCAAkB,GAAE,CAAC,CAAC;QACtE,IAAA,gCAAiB,EAAC,KAAK,CAAC,UAAU,IAAI,IAAA,gCAAiB,GAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,iCAAiC,CAAC,KAAK,GAAG,IAAI;QACnD,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,EAAE,GAAG,EAAE,mCAAuB,EAAE;SACvC,CAAC,CAAC;QACH,IAAI,eAAe,EAAE,CAAC;YACrB,MAAM,KAAK,GAAG,IAAA,wBAAS,EAAkB,eAAe,CAAC,KAAK,CAAC,CAAC;YAChE,IAAI,KAAK,EAAE,CAAC;gBACX,IAAI,KAAK,EAAE,CAAC;oBACX,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAC5C,CAAC;qBAAM,CAAC;oBACP,MAAM,IAAI,CAAC,gCAAgC,CAAC,KAAK,CAAC,CAAC;gBACpD,CAAC;gBACD,OAAO,KAAK,CAAC;YACd,CAAC;QACF,CAAC;QACD,OAAO;IACR,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC5B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC;YAC7D,KAAK,EAAE,EAAE,GAAG,EAAE,mCAAuB,EAAE;SACvC,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC3D,IAAI,MAAgB,CAAC;QACrB,IAAI,eAAe,EAAE,CAAC;YACrB,eAAe,CAAC,KAAK,GAAG,aAAa,CAAC;YACtC,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,eAAe,EAAE;gBAC5D,WAAW,EAAE,KAAK;aAClB,CAAC,CAAC;QACJ,CAAC;aAAM,CAAC;YACP,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAC1C;gBACC,GAAG,EAAE,mCAAuB;gBAC5B,KAAK,EAAE,aAAa;gBACpB,aAAa,EAAE,IAAI;aACnB,EACD,EAAE,WAAW,EAAE,KAAK,EAAE,CACtB,CAAC;QACH,CAAC;QACD,IAAI,MAAM;YAAE,OAAO,IAAA,wBAAS,EAAkB,MAAM,CAAC,KAAK,CAAC,CAAC;QAC5D,OAAO;IACR,CAAC;IAED,KAAK,CAAC,oBAAoB;QACzB,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW;YACrC,MAAM,IAAI,mCAAe,CAAC,mDAAmD,CAAC,CAAC;QAChF,IAAI,CAAC;YAEJ,MAAM,KAAK,GAAG,IAAI,eAAK,CAAC,KAAK,CAAC;gBAC7B,kBAAkB,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,SAAS;aACpD,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC9C,MAAM,GAAG,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,CAAW,CAAC;gBAC5C,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;gBACpE,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACvB,MAAM,IAAI,mCAAe,CACxB,sBAAsB,IAAI,CAAC,gBAAgB,CAAC,WAAW,8BAA8B,CACrF,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,CAAC;YACZ,CAAC;QACF,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,mCAAe,CACxB,qCAAqC,IAAI,CAAC,gBAAgB,CAAC,WAAW,KAAK,KAAK,EAAE,CAClF,CAAC;QACH,CAAC;QACD,OAAO;IACR,CAAC;IAED,KAAK,CAAC,8BAA8B,CACnC,GAAoB,EACpB,OAAyB;QAEzB,IAAI,kBAAkB,CAAC;QACvB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO;YACjC,MAAM,IAAI,mCAAe,CAAC,0DAA0D,CAAC,CAAC;QACvF,IAAI,CAAC;YACJ,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YACzB,kBAAkB,GAAG,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC,kBAAkB,CAC9E,IAAI,CAAC,2BAA2B,EAAE,EAClC,OAAO,EACP,GAAG,CACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAEhB,MAAM,IAAI,sBAAS,CAElB,8DAA8D,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAC9G,CAAC;QACH,CAAC;QACD,MAAM,EAAE,UAAU,EAAE,iBAAiB,EAAE,GAAG,IAAA,oDAAqC,EAC9E,kBAAkB,EAClB,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAC7B,CAAC;QACF,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,sBAAS,CAAC,oDAAoD,CAAC,CAAC;QAC3E,CAAC;QACD,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,sBAAS,CAClB,0EAA0E,iBAAiB,CAAC,IAAI,CAC/F,IAAI,CACJ,IAAI,CACL,CAAC;QACH,CAAC;QACD,OAAO,UAAU,CAAC;IACnB,CAAC;IAMD,KAAK,CAAC,KAAK;QACV,MAAM,IAAA,kCAAmB,EAAC,KAAK,CAAC,CAAC;QACjC,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,mCAAuB,EAAE,CAAC,CAAC;IACxE,CAAC;CACD,CAAA;AAhaY,kCAAW;sBAAX,WAAW;IADvB,IAAA,YAAO,GAAE;qCA2CiB,uBAAM;QACF,wBAAU;QACX,8BAAa;QACR,mBAAc;QACV,uBAAkB;GA9C5C,WAAW,CAgavB"}
|
|
1
|
+
{"version":3,"file":"saml.service.ee.js","sourceRoot":"","sources":["../../../src/sso.ee/saml/saml.service.ee.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,8 +30,13 @@ export declare abstract class TaskRequester {
|
|
|
30
30
|
}>;
|
|
31
31
|
tasks: Map<string, Task>;
|
|
32
32
|
private readonly dataResponseBuilder;
|
|
33
|
+
private readonly executionIdsToTaskIds;
|
|
33
34
|
constructor(nodeTypes: NodeTypes, eventService: EventService);
|
|
34
35
|
startTask<TData, TError>(additionalData: IWorkflowExecuteAdditionalData, taskType: string, settings: unknown, executeFunctions: IExecuteFunctions, inputData: ITaskDataConnections, node: INode, workflow: Workflow, runExecutionData: IRunExecutionData, runIndex: number, itemIndex: number, activeNodeName: string, connectionInputData: INodeExecutionData[], siblingParameters: INodeParameters, mode: WorkflowExecuteMode, envProviderState: EnvProviderState, executeData?: IExecuteData, defaultReturnRunIndex?: number, selfData?: IDataObject, contextNodeName?: string): Promise<Result<TData, TError>>;
|
|
36
|
+
cancelTasks(executionId: string): void;
|
|
37
|
+
private getTaskIds;
|
|
38
|
+
private cancelTask;
|
|
39
|
+
private clearExecutionsMap;
|
|
35
40
|
sendMessage(_message: RequesterMessage.ToBroker.All): void;
|
|
36
41
|
onMessage(message: BrokerMessage.ToRequester.All): void;
|
|
37
42
|
taskReady(requestId: string, taskId: string): void;
|
|
@@ -27,6 +27,7 @@ let TaskRequester = class TaskRequester {
|
|
|
27
27
|
this.taskAcceptRejects = new Map();
|
|
28
28
|
this.tasks = new Map();
|
|
29
29
|
this.dataResponseBuilder = new data_request_response_builder_1.DataRequestResponseBuilder();
|
|
30
|
+
this.executionIdsToTaskIds = new Map();
|
|
30
31
|
}
|
|
31
32
|
async startTask(additionalData, taskType, settings, executeFunctions, inputData, node, workflow, runExecutionData, runIndex, itemIndex, activeNodeName, connectionInputData, siblingParameters, mode, envProviderState, executeData, defaultReturnRunIndex = -1, selfData = {}, contextNodeName = activeNodeName) {
|
|
32
33
|
const data = {
|
|
@@ -72,6 +73,11 @@ let TaskRequester = class TaskRequester {
|
|
|
72
73
|
settings,
|
|
73
74
|
};
|
|
74
75
|
this.tasks.set(task.taskId, task);
|
|
76
|
+
if (additionalData.executionId) {
|
|
77
|
+
const taskIds = this.executionIdsToTaskIds.get(additionalData.executionId) ?? new Set();
|
|
78
|
+
taskIds.add(taskId);
|
|
79
|
+
this.executionIdsToTaskIds.set(additionalData.executionId, taskIds);
|
|
80
|
+
}
|
|
75
81
|
this.eventService.emit('runner-task-requested', {
|
|
76
82
|
taskId: task.taskId,
|
|
77
83
|
nodeId: task.data.node.id,
|
|
@@ -115,6 +121,42 @@ let TaskRequester = class TaskRequester {
|
|
|
115
121
|
}
|
|
116
122
|
finally {
|
|
117
123
|
this.tasks.delete(taskId);
|
|
124
|
+
this.clearExecutionsMap(taskId);
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
cancelTasks(executionId) {
|
|
128
|
+
for (const taskId of this.getTaskIds(executionId)) {
|
|
129
|
+
this.cancelTask(taskId);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
getTaskIds(executionId) {
|
|
133
|
+
return this.executionIdsToTaskIds.get(executionId) ?? new Set();
|
|
134
|
+
}
|
|
135
|
+
cancelTask(taskId, reason = 'Task cancelled by user') {
|
|
136
|
+
const task = this.tasks.get(taskId);
|
|
137
|
+
if (!task)
|
|
138
|
+
return;
|
|
139
|
+
this.tasks.delete(taskId);
|
|
140
|
+
this.sendMessage({
|
|
141
|
+
type: 'requester:taskcancel',
|
|
142
|
+
taskId,
|
|
143
|
+
reason,
|
|
144
|
+
});
|
|
145
|
+
const acceptReject = this.taskAcceptRejects.get(taskId);
|
|
146
|
+
if (acceptReject) {
|
|
147
|
+
acceptReject.reject(new Error(`Task cancelled: ${reason}`));
|
|
148
|
+
this.taskAcceptRejects.delete(taskId);
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
clearExecutionsMap(taskId) {
|
|
152
|
+
for (const [executionId, taskIds] of this.executionIdsToTaskIds.entries()) {
|
|
153
|
+
if (taskIds.has(taskId)) {
|
|
154
|
+
taskIds.delete(taskId);
|
|
155
|
+
if (taskIds.size === 0) {
|
|
156
|
+
this.executionIdsToTaskIds.delete(executionId);
|
|
157
|
+
}
|
|
158
|
+
break;
|
|
159
|
+
}
|
|
118
160
|
}
|
|
119
161
|
}
|
|
120
162
|
sendMessage(_message) { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-requester.js","sourceRoot":"","sources":["../../../src/task-runners/task-managers/task-requester.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAAkC;AAElC,kDAAyD;AACzD,uCAAwD;AACxD,+CAAiE;AAgBjE,mCAAgC;AAEhC,0DAAsD;AACtD,6CAAyC;AAEzC,mFAA6E;AAC7E,qFAA+E;AA0BxE,IAAe,aAAa,GAA5B,MAAe,aAAa;
|
|
1
|
+
{"version":3,"file":"task-requester.js","sourceRoot":"","sources":["../../../src/task-runners/task-managers/task-requester.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Logger } from '@n8n/backend-common';
|
|
2
2
|
import { TaskRunnersConfig } from '@n8n/config';
|
|
3
3
|
import { ErrorReporter } from 'n8n-core';
|
|
4
|
+
import { EventService } from '../events/event.service';
|
|
4
5
|
export declare class TaskRunnerModule {
|
|
5
6
|
private readonly logger;
|
|
6
7
|
private readonly errorReporter;
|
|
7
8
|
private readonly runnerConfig;
|
|
9
|
+
private readonly eventService;
|
|
8
10
|
private taskBrokerHttpServer;
|
|
9
11
|
private taskBrokerWsServer;
|
|
10
12
|
private taskRequester;
|
|
@@ -12,7 +14,7 @@ export declare class TaskRunnerModule {
|
|
|
12
14
|
private pyRunnerProcess;
|
|
13
15
|
private jsRunnerProcessRestartLoopDetector;
|
|
14
16
|
private pyRunnerProcessRestartLoopDetector;
|
|
15
|
-
constructor(logger: Logger, errorReporter: ErrorReporter, runnerConfig: TaskRunnersConfig);
|
|
17
|
+
constructor(logger: Logger, errorReporter: ErrorReporter, runnerConfig: TaskRunnersConfig, eventService: EventService);
|
|
16
18
|
start(): Promise<void>;
|
|
17
19
|
stop(): Promise<void>;
|
|
18
20
|
private loadTaskRequester;
|
|
@@ -50,14 +50,16 @@ const di_1 = require("@n8n/di");
|
|
|
50
50
|
const n8n_core_1 = require("n8n-core");
|
|
51
51
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
52
52
|
const a = __importStar(require("node:assert/strict"));
|
|
53
|
+
const event_service_1 = require("../events/event.service");
|
|
53
54
|
const task_broker_ws_server_1 = require("../task-runners/task-broker/task-broker-ws-server");
|
|
54
55
|
const task_runner_process_restart_loop_detector_1 = require("../task-runners/task-runner-process-restart-loop-detector");
|
|
55
56
|
const missing_auth_token_error_1 = require("./errors/missing-auth-token.error");
|
|
56
57
|
let TaskRunnerModule = class TaskRunnerModule {
|
|
57
|
-
constructor(logger, errorReporter, runnerConfig) {
|
|
58
|
+
constructor(logger, errorReporter, runnerConfig, eventService) {
|
|
58
59
|
this.logger = logger;
|
|
59
60
|
this.errorReporter = errorReporter;
|
|
60
61
|
this.runnerConfig = runnerConfig;
|
|
62
|
+
this.eventService = eventService;
|
|
61
63
|
this.onRunnerRestartLoopDetected = async (error) => {
|
|
62
64
|
this.logger.error(error.message);
|
|
63
65
|
this.errorReporter.error(error);
|
|
@@ -73,6 +75,9 @@ let TaskRunnerModule = class TaskRunnerModule {
|
|
|
73
75
|
throw new missing_auth_token_error_1.MissingAuthTokenError();
|
|
74
76
|
await this.loadTaskRequester();
|
|
75
77
|
await this.loadTaskBroker();
|
|
78
|
+
this.eventService.on('execution-cancelled', ({ executionId }) => {
|
|
79
|
+
this.taskRequester?.cancelTasks(executionId);
|
|
80
|
+
});
|
|
76
81
|
if (mode === 'internal')
|
|
77
82
|
await this.startInternalTaskRunners();
|
|
78
83
|
}
|
|
@@ -138,6 +143,7 @@ exports.TaskRunnerModule = TaskRunnerModule = __decorate([
|
|
|
138
143
|
(0, di_1.Service)(),
|
|
139
144
|
__metadata("design:paramtypes", [backend_common_1.Logger,
|
|
140
145
|
n8n_core_1.ErrorReporter,
|
|
141
|
-
config_1.TaskRunnersConfig
|
|
146
|
+
config_1.TaskRunnersConfig,
|
|
147
|
+
event_service_1.EventService])
|
|
142
148
|
], TaskRunnerModule);
|
|
143
149
|
//# sourceMappingURL=task-runner-module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAAgD;AAChD,gDAA6C;AAC7C,gCAA6C;AAC7C,uCAAyC;AACzC,+CAAqC;AACrC,sDAAwC;
|
|
1
|
+
{"version":3,"file":"task-runner-module.js","sourceRoot":"","sources":["../../src/task-runners/task-runner-module.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getItemCountByConnectionType = getItemCountByConnectionType;
|
|
4
|
+
const n8n_workflow_1 = require("n8n-workflow");
|
|
5
|
+
function getItemCountByConnectionType(data) {
|
|
6
|
+
const itemCountByConnectionType = {};
|
|
7
|
+
for (const [connectionType, connectionData] of Object.entries(data ?? {})) {
|
|
8
|
+
if (!(0, n8n_workflow_1.isNodeConnectionType)(connectionType)) {
|
|
9
|
+
continue;
|
|
10
|
+
}
|
|
11
|
+
if (Array.isArray(connectionData)) {
|
|
12
|
+
itemCountByConnectionType[connectionType] = connectionData.map((d) => (d ? d.length : 0));
|
|
13
|
+
}
|
|
14
|
+
else {
|
|
15
|
+
itemCountByConnectionType[connectionType] = [0];
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return itemCountByConnectionType;
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=get-item-count-by-connection-type.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"get-item-count-by-connection-type.js","sourceRoot":"","sources":["../../src/utils/get-item-count-by-connection-type.ts"],"names":[],"mappings":";;AAGA,oEAkBC;AApBD,+CAAoD;AAEpD,SAAgB,4BAA4B,CAC3C,IAAuB;IAEvB,MAAM,yBAAyB,GAAkD,EAAE,CAAC;IAEpF,KAAK,MAAM,CAAC,cAAc,EAAE,cAAc,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;QAC3E,IAAI,CAAC,IAAA,mCAAoB,EAAC,cAAc,CAAC,EAAE,CAAC;YAC3C,SAAS;QACV,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,yBAAyB,CAAC,cAAc,CAAC,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3F,CAAC;aAAM,CAAC;YACP,yBAAyB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;IAED,OAAO,yBAAyB,CAAC;AAClC,CAAC"}
|
|
@@ -38,7 +38,6 @@ const backend_common_1 = require("@n8n/backend-common");
|
|
|
38
38
|
const di_1 = require("@n8n/di");
|
|
39
39
|
const n8n_core_1 = require("n8n-core");
|
|
40
40
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
41
|
-
const stream_1 = require("stream");
|
|
42
41
|
const promises_1 = require("stream/promises");
|
|
43
42
|
const webhook_not_found_error_1 = require("../errors/response-errors/webhook-not-found.error");
|
|
44
43
|
const ResponseHelper = __importStar(require("../response-helper"));
|
|
@@ -68,8 +67,10 @@ class WebhookRequestHandler {
|
|
|
68
67
|
if ((0, webhook_response_1.isWebhookResponse)(response)) {
|
|
69
68
|
await this.sendWebhookResponse(res, response);
|
|
70
69
|
}
|
|
71
|
-
else
|
|
72
|
-
|
|
70
|
+
else {
|
|
71
|
+
if (response.noWebhookResponse !== true) {
|
|
72
|
+
ResponseHelper.sendSuccessResponse(res, response.data, true, response.responseCode, response.headers);
|
|
73
|
+
}
|
|
73
74
|
}
|
|
74
75
|
}
|
|
75
76
|
catch (e) {
|
|
@@ -136,29 +137,6 @@ class WebhookRequestHandler {
|
|
|
136
137
|
res.setHeader('Content-Security-Policy', (0, n8n_core_1.getWebhookSandboxCSP)());
|
|
137
138
|
}
|
|
138
139
|
}
|
|
139
|
-
sendLegacyResponse(res, data, raw, responseCode, responseHeader) {
|
|
140
|
-
this.setResponseStatus(res, responseCode);
|
|
141
|
-
if (responseHeader) {
|
|
142
|
-
this.setResponseHeaders(res, new Map(Object.entries(responseHeader)));
|
|
143
|
-
}
|
|
144
|
-
if (data instanceof stream_1.Readable) {
|
|
145
|
-
data.pipe(res);
|
|
146
|
-
return;
|
|
147
|
-
}
|
|
148
|
-
if (raw === true) {
|
|
149
|
-
if (typeof data === 'string') {
|
|
150
|
-
res.send(data);
|
|
151
|
-
}
|
|
152
|
-
else {
|
|
153
|
-
res.json(data);
|
|
154
|
-
}
|
|
155
|
-
}
|
|
156
|
-
else {
|
|
157
|
-
res.json({
|
|
158
|
-
data,
|
|
159
|
-
});
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
140
|
async setupCorsHeaders(req, res) {
|
|
163
141
|
const method = req.method;
|
|
164
142
|
const { path } = req.params;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhook-request-handler.js","sourceRoot":"","sources":["../../src/webhooks/webhook-request-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"webhook-request-handler.js","sourceRoot":"","sources":["../../src/webhooks/webhook-request-handler.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,12 @@ import type { SharedWorkflow, User } from '@n8n/db';
|
|
|
2
2
|
import { SharedWorkflowRepository, FolderRepository } from '@n8n/db';
|
|
3
3
|
import { type Scope } from '@n8n/permissions';
|
|
4
4
|
import type { EntityManager } from '@n8n/typeorm';
|
|
5
|
+
import { RoleService } from '../services/role.service';
|
|
5
6
|
export declare class WorkflowFinderService {
|
|
6
7
|
private readonly sharedWorkflowRepository;
|
|
7
8
|
private readonly folderRepository;
|
|
8
|
-
|
|
9
|
+
private readonly roleService;
|
|
10
|
+
constructor(sharedWorkflowRepository: SharedWorkflowRepository, folderRepository: FolderRepository, roleService: RoleService);
|
|
9
11
|
findWorkflowForUser(workflowId: string, user: User, scopes: Scope[], options?: {
|
|
10
12
|
includeTags?: boolean;
|
|
11
13
|
includeParentFolder?: boolean;
|
|
@@ -14,16 +14,20 @@ const db_1 = require("@n8n/db");
|
|
|
14
14
|
const di_1 = require("@n8n/di");
|
|
15
15
|
const permissions_1 = require("@n8n/permissions");
|
|
16
16
|
const typeorm_1 = require("@n8n/typeorm");
|
|
17
|
+
const role_service_1 = require("../services/role.service");
|
|
17
18
|
let WorkflowFinderService = class WorkflowFinderService {
|
|
18
|
-
constructor(sharedWorkflowRepository, folderRepository) {
|
|
19
|
+
constructor(sharedWorkflowRepository, folderRepository, roleService) {
|
|
19
20
|
this.sharedWorkflowRepository = sharedWorkflowRepository;
|
|
20
21
|
this.folderRepository = folderRepository;
|
|
22
|
+
this.roleService = roleService;
|
|
21
23
|
}
|
|
22
24
|
async findWorkflowForUser(workflowId, user, scopes, options = {}) {
|
|
23
25
|
let where = {};
|
|
24
26
|
if (!(0, permissions_1.hasGlobalScope)(user, scopes, { mode: 'allOf' })) {
|
|
25
|
-
const projectRoles =
|
|
26
|
-
|
|
27
|
+
const [projectRoles, workflowRoles] = await Promise.all([
|
|
28
|
+
this.roleService.rolesWithScope('project', scopes),
|
|
29
|
+
this.roleService.rolesWithScope('workflow', scopes),
|
|
30
|
+
]);
|
|
27
31
|
where = {
|
|
28
32
|
role: (0, typeorm_1.In)(workflowRoles),
|
|
29
33
|
project: {
|
|
@@ -57,8 +61,10 @@ let WorkflowFinderService = class WorkflowFinderService {
|
|
|
57
61
|
};
|
|
58
62
|
}
|
|
59
63
|
if (!(0, permissions_1.hasGlobalScope)(user, scopes, { mode: 'allOf' })) {
|
|
60
|
-
const projectRoles =
|
|
61
|
-
|
|
64
|
+
const [projectRoles, workflowRoles] = await Promise.all([
|
|
65
|
+
this.roleService.rolesWithScope('project', scopes),
|
|
66
|
+
this.roleService.rolesWithScope('workflow', scopes),
|
|
67
|
+
]);
|
|
62
68
|
where = {
|
|
63
69
|
...where,
|
|
64
70
|
role: (0, typeorm_1.In)(workflowRoles),
|
|
@@ -86,6 +92,7 @@ exports.WorkflowFinderService = WorkflowFinderService;
|
|
|
86
92
|
exports.WorkflowFinderService = WorkflowFinderService = __decorate([
|
|
87
93
|
(0, di_1.Service)(),
|
|
88
94
|
__metadata("design:paramtypes", [db_1.SharedWorkflowRepository,
|
|
89
|
-
db_1.FolderRepository
|
|
95
|
+
db_1.FolderRepository,
|
|
96
|
+
role_service_1.RoleService])
|
|
90
97
|
], WorkflowFinderService);
|
|
91
98
|
//# sourceMappingURL=workflow-finder.service.js.map
|