n8n 1.98.2 → 1.99.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/bin/n8n +4 -0
- package/dist/abstract-server.js +2 -2
- package/dist/abstract-server.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.d.ts +2 -0
- package/dist/commands/base-command.js +8 -16
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/start.js +4 -1
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +1 -1
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +1 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/concurrency/concurrency-control.service.d.ts +3 -1
- package/dist/concurrency/concurrency-control.service.js +10 -7
- package/dist/concurrency/concurrency-control.service.js.map +1 -1
- package/dist/config/index.d.ts +3 -15
- package/dist/config/schema.d.ts +7 -49
- package/dist/config/schema.js +7 -49
- package/dist/config/schema.js.map +1 -1
- package/dist/controller.registry.js +16 -6
- package/dist/controller.registry.js.map +1 -1
- package/dist/controllers/binary-data.controller.js +8 -3
- package/dist/controllers/binary-data.controller.js.map +1 -1
- package/dist/controllers/me.controller.js +13 -2
- package/dist/controllers/me.controller.js.map +1 -1
- package/dist/controllers/node-types.controller.d.ts +3 -1
- package/dist/controllers/node-types.controller.js +6 -4
- package/dist/controllers/node-types.controller.js.map +1 -1
- package/dist/controllers/password-reset.controller.js +5 -5
- package/dist/controllers/password-reset.controller.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +2 -0
- package/dist/controllers/project.controller.js +5 -4
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/controllers/translation.controller.d.ts +3 -1
- package/dist/controllers/translation.controller.js +6 -7
- package/dist/controllers/translation.controller.js.map +1 -1
- package/dist/databases/db-connection-options.d.ts +3 -1
- package/dist/databases/db-connection-options.js +6 -6
- package/dist/databases/db-connection-options.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.d.ts +2 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +54 -22
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/evaluation.ee/test-runner/utils.ee.d.ts +9 -1
- package/dist/evaluation.ee/test-runner/utils.ee.js +45 -0
- package/dist/evaluation.ee/test-runner/utils.ee.js.map +1 -1
- package/dist/eventbus/event-message-classes/event-message-node.d.ts +1 -0
- package/dist/eventbus/event-message-classes/event-message-node.js.map +1 -1
- package/dist/eventbus/event-message-classes/event-message-runner.d.ts +21 -0
- package/dist/eventbus/event-message-classes/event-message-runner.js +29 -0
- package/dist/eventbus/event-message-classes/event-message-runner.js.map +1 -0
- package/dist/eventbus/event-message-classes/index.d.ts +6 -3
- package/dist/eventbus/event-message-classes/index.js +6 -1
- package/dist/eventbus/event-message-classes/index.js.map +1 -1
- package/dist/eventbus/message-event-bus/message-event-bus.d.ts +2 -0
- package/dist/eventbus/message-event-bus/message-event-bus.js +4 -0
- package/dist/eventbus/message-event-bus/message-event-bus.js.map +1 -1
- package/dist/events/maps/relay.event-map.d.ts +16 -0
- package/dist/events/relays/log-streaming.event-relay.d.ts +2 -0
- package/dist/events/relays/log-streaming.event-relay.js +20 -4
- package/dist/events/relays/log-streaming.event-relay.js.map +1 -1
- package/dist/events/relays/telemetry.event-relay.js +3 -2
- package/dist/events/relays/telemetry.event-relay.js.map +1 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +16 -9
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/executions/execution.service.d.ts +1 -1
- package/dist/executions/executions.controller.d.ts +1 -1
- package/dist/ldap.ee/ldap.service.ee.js +7 -13
- package/dist/ldap.ee/ldap.service.ee.js.map +1 -1
- package/dist/manual-execution.service.js +5 -8
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/mfa/helpers.js +3 -7
- package/dist/mfa/helpers.js.map +1 -1
- package/dist/modules/external-secrets.ee/external-secrets.module.d.ts +4 -0
- package/dist/modules/external-secrets.ee/external-secrets.module.js +60 -0
- package/dist/modules/external-secrets.ee/external-secrets.module.js.map +1 -0
- package/dist/modules/insights/database/entities/insights-raw.d.ts +1 -1
- package/dist/modules/insights/database/entities/insights-shared.d.ts +2 -2
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +4 -4
- package/dist/modules/insights/insights-collection.service.js +1 -0
- package/dist/modules/insights/insights-collection.service.js.map +1 -1
- package/dist/modules/insights/insights-helpers.d.ts +4 -0
- package/dist/modules/insights/insights-helpers.js +26 -0
- package/dist/modules/insights/insights-helpers.js.map +1 -0
- package/dist/modules/insights/insights-pruning.service.js +2 -2
- package/dist/modules/insights/insights-pruning.service.js.map +1 -1
- package/dist/modules/insights/insights.module.d.ts +7 -6
- package/dist/modules/insights/insights.module.js +48 -10
- package/dist/modules/insights/insights.module.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +3 -4
- package/dist/modules/insights/insights.service.js +4 -31
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/modules/module-registry.d.ts +8 -2
- package/dist/modules/module-registry.js +23 -5
- package/dist/modules/module-registry.js.map +1 -1
- package/dist/modules/modules.config.d.ts +2 -2
- package/dist/modules/modules.config.js +2 -2
- package/dist/modules/modules.config.js.map +1 -1
- package/dist/permissions.ee/check-access.js +12 -6
- package/dist/permissions.ee/check-access.js.map +1 -1
- package/dist/public-api/v1/shared/middlewares/global.middleware.js +11 -2
- package/dist/public-api/v1/shared/middlewares/global.middleware.js.map +1 -1
- package/dist/requests.d.ts +1 -0
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js +1 -2
- package/dist/security-audit/risk-reporters/instance-risk-reporter.js.map +1 -1
- package/dist/server.js +10 -0
- package/dist/server.js.map +1 -1
- package/dist/services/frontend.service.d.ts +1 -3
- package/dist/services/frontend.service.js +22 -12
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +1 -1
- package/dist/services/project.service.ee.js +2 -2
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/user.service.js +2 -2
- package/dist/services/user.service.js.map +1 -1
- package/dist/sso.ee/oidc/constants.d.ts +3 -0
- package/dist/sso.ee/oidc/constants.js +7 -0
- package/dist/sso.ee/oidc/constants.js.map +1 -0
- package/dist/sso.ee/oidc/oidc.service.ee.d.ts +31 -0
- package/dist/sso.ee/oidc/oidc.service.ee.js +235 -0
- package/dist/sso.ee/oidc/oidc.service.ee.js.map +1 -0
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.d.ts +18 -0
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.js +88 -0
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.js.map +1 -0
- package/dist/sso.ee/saml/saml-helpers.js +6 -12
- package/dist/sso.ee/saml/saml-helpers.js.map +1 -1
- package/dist/sso.ee/sso-helpers.d.ts +1 -0
- package/dist/sso.ee/sso-helpers.js +4 -0
- package/dist/sso.ee/sso-helpers.js.map +1 -1
- package/dist/task-runners/default-task-runner-disconnect-analyzer.js +3 -6
- package/dist/task-runners/default-task-runner-disconnect-analyzer.js.map +1 -1
- package/dist/task-runners/task-broker/task-broker.service.d.ts +3 -2
- package/dist/task-runners/task-broker/task-broker.service.js +5 -7
- package/dist/task-runners/task-broker/task-broker.service.js.map +1 -1
- package/dist/task-runners/task-managers/local-task-requester.d.ts +2 -1
- package/dist/task-runners/task-managers/local-task-requester.js +4 -3
- package/dist/task-runners/task-managers/local-task-requester.js.map +1 -1
- package/dist/task-runners/task-managers/task-requester.d.ts +3 -1
- package/dist/task-runners/task-managers/task-requester.js +17 -2
- package/dist/task-runners/task-managers/task-requester.js.map +1 -1
- package/package.json +18 -17
- package/dist/mfa/constants.d.ts +0 -1
- package/dist/mfa/constants.js +0 -5
- package/dist/mfa/constants.js.map +0 -1
- package/dist/modules/external-secrets.ee/external-secrets.ee.module.d.ts +0 -10
- package/dist/modules/external-secrets.ee/external-secrets.ee.module.js +0 -34
- package/dist/modules/external-secrets.ee/external-secrets.ee.module.js.map +0 -1
- package/dist/modules/insights/insights.pre-init.d.ts +0 -2
- package/dist/modules/insights/insights.pre-init.js +0 -6
- package/dist/modules/insights/insights.pre-init.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.registry.js","sourceRoot":"","sources":["../src/controller.registry.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAmD;AACnD,wCAA2C;AAE3C,gDAA6D;AAE7D,gCAA6C;AAC7C,qCAAiC;AAEjC,2DAAmE;AACnE,+CAA+C;AAG/C,sDAAkD;AAClD,2CAAsD;AACtD,0FAAsF;AACtF,uCAAoC;AACpC,gEAA8D;AAE9D,uDAAyC;
|
|
1
|
+
{"version":3,"file":"controller.registry.js","sourceRoot":"","sources":["../src/controller.registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,13 +57,18 @@ let BinaryDataController = class BinaryDataController {
|
|
|
57
57
|
if (!binaryDataId) {
|
|
58
58
|
throw new bad_request_error_1.BadRequestError('Missing binary data ID');
|
|
59
59
|
}
|
|
60
|
-
|
|
61
|
-
|
|
60
|
+
const separatorIndex = binaryDataId.indexOf(':');
|
|
61
|
+
if (separatorIndex === -1) {
|
|
62
|
+
throw new bad_request_error_1.BadRequestError('Malformed binary data ID');
|
|
62
63
|
}
|
|
63
|
-
const
|
|
64
|
+
const mode = binaryDataId.substring(0, separatorIndex);
|
|
64
65
|
if (!(0, n8n_core_1.isValidNonDefaultMode)(mode)) {
|
|
65
66
|
throw new bad_request_error_1.BadRequestError('Invalid binary data mode');
|
|
66
67
|
}
|
|
68
|
+
const path = binaryDataId.substring(separatorIndex + 1);
|
|
69
|
+
if (path === '' || path === '/' || path === '//') {
|
|
70
|
+
throw new bad_request_error_1.BadRequestError('Malformed binary data ID');
|
|
71
|
+
}
|
|
67
72
|
}
|
|
68
73
|
async setContentHeaders(binaryDataId, action, res, fileName, mimeType) {
|
|
69
74
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"binary-data.controller.js","sourceRoot":"","sources":["../../src/controllers/binary-data.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAiG;AACjG,gDAA6D;AAE7D,+CAAiD;AACjD,uCAAuF;AAEvF,kFAA6E;AAGtE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAChC,YAA6B,iBAAoC;QAApC,sBAAiB,GAAjB,iBAAiB,CAAmB;IAAG,CAAC;IAG/D,AAAN,KAAK,CAAC,GAAG,CACR,CAAU,EACV,GAAa,EACN,EAAE,EAAE,EAAE,YAAY,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAsB;QAE3E,IAAI,CAAC;YACJ,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAC5E,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,4BAAiB;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACrE,IAAI,KAAK,YAAY,mCAAe;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;;gBAC3E,MAAM,KAAK,CAAC;QAClB,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,SAAS,CAAC,CAAU,EAAE,GAAa,EAAS,EAAE,KAAK,EAA4B;QACpF,IAAI,CAAC;YACJ,MAAM,YAAY,GAAG,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACvE,IAAI,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC;YACxC,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,UAAU,EAAE,GAAG,CAAC,CAAC;YAC5D,OAAO,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,4BAAiB;gBAAE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;YACrE,IAAI,KAAK,YAAY,mCAAe,IAAI,KAAK,YAAY,gCAAiB;gBACzE,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;;gBACtC,MAAM,KAAK,CAAC;QAClB,CAAC;IACF,CAAC;IAEO,oBAAoB,CAAC,YAAoB;QAChD,IAAI,CAAC,YAAY,EAAE,CAAC;YACnB,MAAM,IAAI,mCAAe,CAAC,wBAAwB,CAAC,CAAC;QACrD,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"binary-data.controller.js","sourceRoot":"","sources":["../../src/controllers/binary-data.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,7 @@ const mfa_service_1 = require("../mfa/mfa.service");
|
|
|
28
28
|
const password_utility_1 = require("../services/password.utility");
|
|
29
29
|
const user_service_1 = require("../services/user.service");
|
|
30
30
|
const saml_helpers_1 = require("../sso.ee/saml/saml-helpers");
|
|
31
|
+
const sso_helpers_1 = require("../sso.ee/sso-helpers");
|
|
31
32
|
const survey_answers_dto_1 = require("./survey-answers.dto");
|
|
32
33
|
let MeController = class MeController {
|
|
33
34
|
constructor(logger, externalHooks, authService, userService, passwordUtility, userRepository, eventService, mfaService) {
|
|
@@ -41,9 +42,19 @@ let MeController = class MeController {
|
|
|
41
42
|
this.mfaService = mfaService;
|
|
42
43
|
}
|
|
43
44
|
async updateCurrentUser(req, res, payload) {
|
|
44
|
-
const { id: userId, email: currentEmail, mfaEnabled } = req.user;
|
|
45
|
-
const { email } = payload;
|
|
45
|
+
const { id: userId, email: currentEmail, mfaEnabled, firstName: currentFirstName, lastName: currentLastName, } = req.user;
|
|
46
|
+
const { email, firstName, lastName } = payload;
|
|
46
47
|
const isEmailBeingChanged = email !== currentEmail;
|
|
48
|
+
const isFirstNameChanged = firstName !== currentFirstName;
|
|
49
|
+
const isLastNameChanged = lastName !== currentLastName;
|
|
50
|
+
if (((0, sso_helpers_1.isLdapCurrentAuthenticationMethod)() || (0, sso_helpers_1.isOidcCurrentAuthenticationMethod)()) &&
|
|
51
|
+
(isEmailBeingChanged || isFirstNameChanged || isLastNameChanged)) {
|
|
52
|
+
this.logger.debug(`Request to update user failed because ${(0, sso_helpers_1.getCurrentAuthenticationMethod)()} user may not change their profile information`, {
|
|
53
|
+
userId,
|
|
54
|
+
payload,
|
|
55
|
+
});
|
|
56
|
+
throw new bad_request_error_1.BadRequestError(` ${(0, sso_helpers_1.getCurrentAuthenticationMethod)()} user may not change their profile information`);
|
|
57
|
+
}
|
|
47
58
|
if ((0, saml_helpers_1.isSamlLicensedAndEnabled)() && isEmailBeingChanged) {
|
|
48
59
|
this.logger.debug('Request to update user failed because SAML user may not change their email', {
|
|
49
60
|
userId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAKwB;AACxB,wDAA6C;AAE7C,gCAAyC;AACzC,gDAAoE;AACpE,yDAAoD;AAGpD,sDAAkD;AAClD,kFAA6E;AAC7E,4FAAsF;AACtF,0DAAsD;AACtD,qDAAiD;AACjD,uDAAmD;AACnD,mDAA+C;AAE/C,kEAA8D;AAC9D,0DAAsD;AACtD,6DAAsE;
|
|
1
|
+
{"version":3,"file":"me.controller.js","sourceRoot":"","sources":["../../src/controllers/me.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import { Request } from 'express';
|
|
2
3
|
import type { INodeTypeDescription } from 'n8n-workflow';
|
|
3
4
|
import { NodeTypes } from '../node-types';
|
|
4
5
|
export declare class NodeTypesController {
|
|
5
6
|
private readonly nodeTypes;
|
|
6
|
-
|
|
7
|
+
private readonly globalConfig;
|
|
8
|
+
constructor(nodeTypes: NodeTypes, globalConfig: GlobalConfig);
|
|
7
9
|
getNodeInfo(req: Request): Promise<INodeTypeDescription[]>;
|
|
8
10
|
}
|
|
@@ -13,18 +13,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.NodeTypesController = void 0;
|
|
16
|
+
const config_1 = require("@n8n/config");
|
|
16
17
|
const decorators_1 = require("@n8n/decorators");
|
|
17
18
|
const promises_1 = require("fs/promises");
|
|
18
19
|
const get_1 = __importDefault(require("lodash/get"));
|
|
19
|
-
const config_1 = __importDefault(require("../config"));
|
|
20
20
|
const node_types_1 = require("../node-types");
|
|
21
21
|
let NodeTypesController = class NodeTypesController {
|
|
22
|
-
constructor(nodeTypes) {
|
|
22
|
+
constructor(nodeTypes, globalConfig) {
|
|
23
23
|
this.nodeTypes = nodeTypes;
|
|
24
|
+
this.globalConfig = globalConfig;
|
|
24
25
|
}
|
|
25
26
|
async getNodeInfo(req) {
|
|
26
27
|
const nodeInfos = (0, get_1.default)(req, 'body.nodeInfos', []);
|
|
27
|
-
const defaultLocale =
|
|
28
|
+
const defaultLocale = this.globalConfig.defaultLocale;
|
|
28
29
|
if (defaultLocale === 'en') {
|
|
29
30
|
return nodeInfos.reduce((acc, { name, version }) => {
|
|
30
31
|
const { description } = this.nodeTypes.getByNameAndVersion(name, version);
|
|
@@ -62,6 +63,7 @@ __decorate([
|
|
|
62
63
|
], NodeTypesController.prototype, "getNodeInfo", null);
|
|
63
64
|
exports.NodeTypesController = NodeTypesController = __decorate([
|
|
64
65
|
(0, decorators_1.RestController)('/node-types'),
|
|
65
|
-
__metadata("design:paramtypes", [node_types_1.NodeTypes
|
|
66
|
+
__metadata("design:paramtypes", [node_types_1.NodeTypes,
|
|
67
|
+
config_1.GlobalConfig])
|
|
66
68
|
], NodeTypesController);
|
|
67
69
|
//# sourceMappingURL=node-types.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-types.controller.js","sourceRoot":"","sources":["../../src/controllers/node-types.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAuD;AAEvD,0CAAuC;AACvC,qDAA6B;AAG7B,
|
|
1
|
+
{"version":3,"file":"node-types.controller.js","sourceRoot":"","sources":["../../src/controllers/node-types.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gDAAuD;AAEvD,0CAAuC;AACvC,qDAA6B;AAG7B,6CAAyC;AAGlC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC/B,YACkB,SAAoB,EACpB,YAA0B;QAD1B,cAAS,GAAT,SAAS,CAAW;QACpB,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGE,AAAN,KAAK,CAAC,WAAW,CAAC,GAAY;QAC7B,MAAM,SAAS,GAAG,IAAA,aAAG,EAAC,GAAG,EAAE,gBAAgB,EAAE,EAAE,CAA2B,CAAC;QAE3E,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC;QAEtD,IAAI,aAAa,KAAK,IAAI,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAC,MAAM,CAAyB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;gBAC1E,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBAC1E,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBACtB,OAAO,GAAG,CAAC;YACZ,CAAC,EAAE,EAAE,CAAC,CAAC;QACR,CAAC;QAED,MAAM,mBAAmB,GAAG,KAAK,EAChC,IAAY,EACZ,OAAe,EACf,SAAiC,EAChC,EAAE;YACH,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YACpF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,sBAAsB,CAAC;gBACnE,cAAc,EAAE,UAAU;gBAC1B,YAAY,EAAE,WAAW,CAAC,IAAI;gBAC9B,MAAM,EAAE,aAAa;aACrB,CAAC,CAAC;YAEH,IAAI,CAAC;gBACJ,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAQ,EAAC,eAAe,EAAE,MAAM,CAAC,CAAC;gBAE5D,WAAW,CAAC,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACnD,CAAC;YAAC,MAAM,CAAC;YAET,CAAC;YAED,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAC7B,CAAC,CAAC;QAEF,MAAM,SAAS,GAA2B,EAAE,CAAC;QAE7C,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAC7B,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,MAAM,mBAAmB,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,CAChF,CAAC;QAEF,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE5B,OAAO,SAAS,CAAC;IAClB,CAAC;CACD,CAAA;AArDY,kDAAmB;AAOzB;IADL,IAAA,iBAAI,EAAC,GAAG,CAAC;;;;sDA8CT;8BApDW,mBAAmB;IAD/B,IAAA,2BAAc,EAAC,aAAa,CAAC;qCAGA,sBAAS;QACN,qBAAY;GAHhC,mBAAmB,CAqD/B"}
|
|
@@ -61,11 +61,11 @@ let PasswordResetController = class PasswordResetController {
|
|
|
61
61
|
this.logger.debug('Request to send password reset email failed because the user limit was reached');
|
|
62
62
|
throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
|
|
63
63
|
}
|
|
64
|
-
if ((0, sso_helpers_1.isSamlCurrentAuthenticationMethod)() &&
|
|
65
|
-
!(user
|
|
66
|
-
|
|
67
|
-
this.logger.debug(
|
|
68
|
-
throw new forbidden_error_1.ForbiddenError(
|
|
64
|
+
if (((0, sso_helpers_1.isSamlCurrentAuthenticationMethod)() || (0, sso_helpers_1.isOidcCurrentAuthenticationMethod)()) &&
|
|
65
|
+
!((0, permissions_1.hasGlobalScope)(user, 'user:resetPassword') || user.settings?.allowSSOManualLogin === true)) {
|
|
66
|
+
const currentAuthenticationMethod = (0, sso_helpers_1.isSamlCurrentAuthenticationMethod)() ? 'SAML' : 'OIDC';
|
|
67
|
+
this.logger.debug(`Request to send password reset email failed because login is handled by ${currentAuthenticationMethod}`);
|
|
68
|
+
throw new forbidden_error_1.ForbiddenError(`Login is handled by ${currentAuthenticationMethod}. Please contact your Identity Provider to reset your password.`);
|
|
69
69
|
}
|
|
70
70
|
const ldapIdentity = user.authIdentities?.find((i) => i.providerType === 'ldap');
|
|
71
71
|
if (!user.password || (ldapIdentity && user.disabled)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../src/controllers/password-reset.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAIwB;AACxB,wDAA6C;AAC7C,gCAAyC;AACzC,gDAAyE;AACzE,kDAAkD;AAGlD,sDAAkD;AAClD,2CAAsD;AACtD,kFAA6E;AAC7E,8EAA0E;AAC1E,0FAAqF;AACrF,8EAAyE;AACzE,sFAAyF;AACzF,0DAAsD;AACtD,qDAAiD;AACjD,uCAAoC;AACpC,mDAA+C;AAE/C,kEAA8D;AAC9D,0DAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"password-reset.controller.js","sourceRoot":"","sources":["../../src/controllers/password-reset.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export declare class ProjectController {
|
|
|
23
23
|
type: "emoji" | "icon";
|
|
24
24
|
value: string;
|
|
25
25
|
} | null;
|
|
26
|
+
description: string | null;
|
|
26
27
|
projectRelations: import("@n8n/db").ProjectRelation[];
|
|
27
28
|
sharedCredentials: import("@n8n/db").SharedCredentials[];
|
|
28
29
|
sharedWorkflows: import("@n8n/db").SharedWorkflow[];
|
|
@@ -41,6 +42,7 @@ export declare class ProjectController {
|
|
|
41
42
|
type: "emoji" | "icon";
|
|
42
43
|
value: string;
|
|
43
44
|
} | null;
|
|
45
|
+
description: string | null;
|
|
44
46
|
projectRelations: import("@n8n/db").ProjectRelation[];
|
|
45
47
|
sharedCredentials: import("@n8n/db").SharedCredentials[];
|
|
46
48
|
sharedWorkflows: import("@n8n/db").SharedWorkflow[];
|
|
@@ -112,7 +112,7 @@ let ProjectController = class ProjectController {
|
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
async getProject(req, _res, projectId) {
|
|
115
|
-
const [{ id, name, icon, type }, relations] = await Promise.all([
|
|
115
|
+
const [{ id, name, icon, type, description }, relations] = await Promise.all([
|
|
116
116
|
this.projectsService.getProject(projectId),
|
|
117
117
|
this.projectsService.getProjectRelations(projectId),
|
|
118
118
|
]);
|
|
@@ -122,6 +122,7 @@ let ProjectController = class ProjectController {
|
|
|
122
122
|
name,
|
|
123
123
|
icon,
|
|
124
124
|
type,
|
|
125
|
+
description,
|
|
125
126
|
relations: relations.map((r) => ({
|
|
126
127
|
id: r.user.id,
|
|
127
128
|
email: r.user.email,
|
|
@@ -138,9 +139,9 @@ let ProjectController = class ProjectController {
|
|
|
138
139
|
};
|
|
139
140
|
}
|
|
140
141
|
async updateProject(req, _res, payload, projectId) {
|
|
141
|
-
const { name, icon, relations } = payload;
|
|
142
|
-
if (name
|
|
143
|
-
await this.projectsService.updateProject(projectId, { name, icon });
|
|
142
|
+
const { name, icon, relations, description } = payload;
|
|
143
|
+
if ([name, icon, description].some((data) => typeof data === 'string')) {
|
|
144
|
+
await this.projectsService.updateProject(projectId, { name, icon, description });
|
|
144
145
|
}
|
|
145
146
|
if (relations) {
|
|
146
147
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"project.controller.js","sourceRoot":"","sources":["../../src/controllers/project.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import type { Request } from 'express';
|
|
2
3
|
import { CredentialTypes } from '../credential-types';
|
|
3
4
|
export declare const CREDENTIAL_TRANSLATIONS_DIR = "n8n-nodes-base/dist/credentials/translations";
|
|
@@ -9,7 +10,8 @@ export declare namespace TranslationRequest {
|
|
|
9
10
|
}
|
|
10
11
|
export declare class TranslationController {
|
|
11
12
|
private readonly credentialTypes;
|
|
12
|
-
|
|
13
|
+
private readonly globalConfig;
|
|
14
|
+
constructor(credentialTypes: CredentialTypes, globalConfig: GlobalConfig);
|
|
13
15
|
getCredentialTranslation(req: TranslationRequest.Credential): Promise<any>;
|
|
14
16
|
getNodeTranslationHeaders(): Promise<any>;
|
|
15
17
|
}
|
|
@@ -8,15 +8,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
-
};
|
|
14
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
12
|
exports.TranslationController = exports.NODE_HEADERS_PATH = exports.CREDENTIAL_TRANSLATIONS_DIR = void 0;
|
|
13
|
+
const config_1 = require("@n8n/config");
|
|
16
14
|
const decorators_1 = require("@n8n/decorators");
|
|
17
15
|
const promises_1 = require("fs/promises");
|
|
18
16
|
const path_1 = require("path");
|
|
19
|
-
const config_1 = __importDefault(require("../config"));
|
|
20
17
|
const constants_1 = require("../constants");
|
|
21
18
|
const credential_types_1 = require("../credential-types");
|
|
22
19
|
const bad_request_error_1 = require("../errors/response-errors/bad-request.error");
|
|
@@ -24,14 +21,15 @@ const internal_server_error_1 = require("../errors/response-errors/internal-serv
|
|
|
24
21
|
exports.CREDENTIAL_TRANSLATIONS_DIR = 'n8n-nodes-base/dist/credentials/translations';
|
|
25
22
|
exports.NODE_HEADERS_PATH = (0, path_1.join)(constants_1.NODES_BASE_DIR, 'dist/nodes/headers');
|
|
26
23
|
let TranslationController = class TranslationController {
|
|
27
|
-
constructor(credentialTypes) {
|
|
24
|
+
constructor(credentialTypes, globalConfig) {
|
|
28
25
|
this.credentialTypes = credentialTypes;
|
|
26
|
+
this.globalConfig = globalConfig;
|
|
29
27
|
}
|
|
30
28
|
async getCredentialTranslation(req) {
|
|
31
29
|
const { credentialType } = req.query;
|
|
32
30
|
if (!this.credentialTypes.recognizes(credentialType))
|
|
33
31
|
throw new bad_request_error_1.BadRequestError(`Invalid Credential type: "${credentialType}"`);
|
|
34
|
-
const defaultLocale =
|
|
32
|
+
const { defaultLocale } = this.globalConfig;
|
|
35
33
|
const translationPath = (0, path_1.join)(exports.CREDENTIAL_TRANSLATIONS_DIR, defaultLocale, `${credentialType}.json`);
|
|
36
34
|
try {
|
|
37
35
|
return require(translationPath);
|
|
@@ -70,6 +68,7 @@ __decorate([
|
|
|
70
68
|
], TranslationController.prototype, "getNodeTranslationHeaders", null);
|
|
71
69
|
exports.TranslationController = TranslationController = __decorate([
|
|
72
70
|
(0, decorators_1.RestController)('/'),
|
|
73
|
-
__metadata("design:paramtypes", [credential_types_1.CredentialTypes
|
|
71
|
+
__metadata("design:paramtypes", [credential_types_1.CredentialTypes,
|
|
72
|
+
config_1.GlobalConfig])
|
|
74
73
|
], TranslationController);
|
|
75
74
|
//# sourceMappingURL=translation.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translation.controller.js","sourceRoot":"","sources":["../../src/controllers/translation.controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"translation.controller.js","sourceRoot":"","sources":["../../src/controllers/translation.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wCAA2C;AAC3C,gDAAsD;AAEtD,0CAAqC;AACrC,+BAA4B;AAE5B,2CAA6C;AAC7C,yDAAqD;AACrD,kFAA6E;AAC7E,0FAAqF;AAExE,QAAA,2BAA2B,GAAG,8CAA8C,CAAC;AAC7E,QAAA,iBAAiB,GAAG,IAAA,WAAI,EAAC,0BAAc,EAAE,oBAAoB,CAAC,CAAC;AAOrE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IACjC,YACkB,eAAgC,EAChC,YAA0B;QAD1B,oBAAe,GAAf,eAAe,CAAiB;QAChC,iBAAY,GAAZ,YAAY,CAAc;IACzC,CAAC;IAGE,AAAN,KAAK,CAAC,wBAAwB,CAAC,GAAkC;QAChE,MAAM,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC,KAAK,CAAC;QAErC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,cAAc,CAAC;YACnD,MAAM,IAAI,mCAAe,CAAC,6BAA6B,cAAc,GAAG,CAAC,CAAC;QAE3E,MAAM,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAC5C,MAAM,eAAe,GAAG,IAAA,WAAI,EAC3B,mCAA2B,EAC3B,aAAa,EACb,GAAG,cAAc,OAAO,CACxB,CAAC;QAEF,IAAI,CAAC;YAEJ,OAAO,OAAO,CAAC,eAAe,CAAC,CAAC;QACjC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACb,CAAC;IACF,CAAC;IAGK,AAAN,KAAK,CAAC,yBAAyB;QAC9B,IAAI,CAAC;YACJ,MAAM,IAAA,iBAAM,EAAC,GAAG,yBAAiB,KAAK,CAAC,CAAC;QACzC,CAAC;QAAC,MAAM,CAAC;YACR,OAAO;QACR,CAAC;QAED,IAAI,CAAC;YAEJ,OAAO,OAAO,CAAC,yBAAiB,CAAC,CAAC;QACnC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,2CAAmB,CAAC,6BAA6B,EAAE,KAAK,CAAC,CAAC;QACrE,CAAC;IACF,CAAC;CACD,CAAA;AA3CY,sDAAqB;AAO3B;IADL,IAAA,gBAAG,EAAC,yBAAyB,CAAC;;;;qEAoB9B;AAGK;IADL,IAAA,gBAAG,EAAC,2BAA2B,CAAC;;;;sEAchC;gCA1CW,qBAAqB;IADjC,IAAA,2BAAc,EAAC,GAAG,CAAC;qCAGgB,kCAAe;QAClB,qBAAY;GAHhC,qBAAqB,CA2CjC"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import { DatabaseConfig, InstanceSettingsConfig } from '@n8n/config';
|
|
2
2
|
import type { DataSourceOptions } from '@n8n/typeorm';
|
|
3
|
+
import { ModuleRegistry } from '../modules/module-registry';
|
|
3
4
|
export declare class DbConnectionOptions {
|
|
4
5
|
private readonly config;
|
|
5
6
|
private readonly instanceSettingsConfig;
|
|
6
|
-
|
|
7
|
+
private readonly moduleRegistry;
|
|
8
|
+
constructor(config: DatabaseConfig, instanceSettingsConfig: InstanceSettingsConfig, moduleRegistry: ModuleRegistry);
|
|
7
9
|
getOverrides(dbType: 'postgresdb' | 'mysqldb'): {
|
|
8
10
|
database: string;
|
|
9
11
|
host: string;
|
|
@@ -18,13 +18,12 @@ const db_1 = require("@n8n/db");
|
|
|
18
18
|
const di_1 = require("@n8n/di");
|
|
19
19
|
const n8n_workflow_1 = require("n8n-workflow");
|
|
20
20
|
const path_1 = __importDefault(require("path"));
|
|
21
|
-
const
|
|
22
|
-
const insights_metadata_1 = require("../modules/insights/database/entities/insights-metadata");
|
|
23
|
-
const insights_raw_1 = require("../modules/insights/database/entities/insights-raw");
|
|
21
|
+
const module_registry_1 = require("../modules/module-registry");
|
|
24
22
|
let DbConnectionOptions = class DbConnectionOptions {
|
|
25
|
-
constructor(config, instanceSettingsConfig) {
|
|
23
|
+
constructor(config, instanceSettingsConfig, moduleRegistry) {
|
|
26
24
|
this.config = config;
|
|
27
25
|
this.instanceSettingsConfig = instanceSettingsConfig;
|
|
26
|
+
this.moduleRegistry = moduleRegistry;
|
|
28
27
|
}
|
|
29
28
|
getOverrides(dbType) {
|
|
30
29
|
const dbConfig = this.config[dbType];
|
|
@@ -64,7 +63,7 @@ let DbConnectionOptions = class DbConnectionOptions {
|
|
|
64
63
|
}
|
|
65
64
|
return {
|
|
66
65
|
entityPrefix,
|
|
67
|
-
entities: [...Object.values(db_1.entities),
|
|
66
|
+
entities: [...Object.values(db_1.entities), ...this.moduleRegistry.entities],
|
|
68
67
|
subscribers: Object.values(db_1.subscribers),
|
|
69
68
|
migrationsTableName: `${entityPrefix}migrations`,
|
|
70
69
|
migrationsRun: false,
|
|
@@ -139,6 +138,7 @@ exports.DbConnectionOptions = DbConnectionOptions;
|
|
|
139
138
|
exports.DbConnectionOptions = DbConnectionOptions = __decorate([
|
|
140
139
|
(0, di_1.Service)(),
|
|
141
140
|
__metadata("design:paramtypes", [config_1.DatabaseConfig,
|
|
142
|
-
config_1.InstanceSettingsConfig
|
|
141
|
+
config_1.InstanceSettingsConfig,
|
|
142
|
+
module_registry_1.ModuleRegistry])
|
|
143
143
|
], DbConnectionOptions);
|
|
144
144
|
//# sourceMappingURL=db-connection-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-connection-options.js","sourceRoot":"","sources":["../../src/databases/db-connection-options.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAAqE;AACrE,gCAMiB;AACjB,gCAAkC;AAMlC,+CAAyC;AACzC,gDAAwB;AAGxB
|
|
1
|
+
{"version":3,"file":"db-connection-options.js","sourceRoot":"","sources":["../../src/databases/db-connection-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,8 @@ export declare class TestRunnerService {
|
|
|
35
35
|
static getEvaluationMetricsNodes(workflow: IWorkflowBase): import("n8n-workflow").INode[];
|
|
36
36
|
static getEvaluationSetOutputsNodes(workflow: IWorkflowBase): import("n8n-workflow").INode[];
|
|
37
37
|
private extractDatasetTriggerOutput;
|
|
38
|
-
private
|
|
38
|
+
private extractUserDefinedMetrics;
|
|
39
|
+
private extractPredefinedMetrics;
|
|
39
40
|
runTest(user: User, workflowId: string): Promise<void>;
|
|
40
41
|
canBeCancelled(testRun: TestRun): boolean;
|
|
41
42
|
cancelTestRun(testRunId: string): Promise<void>;
|
|
@@ -103,7 +103,16 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
103
103
|
const data = {
|
|
104
104
|
executionMode: 'evaluation',
|
|
105
105
|
pinData,
|
|
106
|
-
workflowData:
|
|
106
|
+
workflowData: {
|
|
107
|
+
...workflow,
|
|
108
|
+
settings: {
|
|
109
|
+
...workflow.settings,
|
|
110
|
+
saveManualExecutions: true,
|
|
111
|
+
saveDataErrorExecution: 'all',
|
|
112
|
+
saveDataSuccessExecution: 'all',
|
|
113
|
+
saveExecutionProgress: false,
|
|
114
|
+
},
|
|
115
|
+
},
|
|
107
116
|
userId: metadata.userId,
|
|
108
117
|
partialExecutionVersion: 2,
|
|
109
118
|
triggerToStartFrom: {
|
|
@@ -112,8 +121,8 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
112
121
|
};
|
|
113
122
|
if (config_1.default.getEnv('executions.mode') === 'queue') {
|
|
114
123
|
data.executionData = {
|
|
115
|
-
startData: {},
|
|
116
124
|
resultData: {
|
|
125
|
+
pinData,
|
|
117
126
|
runData: {},
|
|
118
127
|
},
|
|
119
128
|
manualData: {
|
|
@@ -139,14 +148,10 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
139
148
|
if (!triggerNode) {
|
|
140
149
|
throw new errors_ee_1.TestRunError('EVALUATION_TRIGGER_NOT_FOUND');
|
|
141
150
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
main: [[{ json: { requestDataset: true } }]],
|
|
147
|
-
},
|
|
148
|
-
source: null,
|
|
149
|
-
});
|
|
151
|
+
triggerNode.forceCustomOperation = {
|
|
152
|
+
resource: 'dataset',
|
|
153
|
+
operation: 'getRows',
|
|
154
|
+
};
|
|
150
155
|
const data = {
|
|
151
156
|
destinationNode: triggerNode.name,
|
|
152
157
|
executionMode: 'manual',
|
|
@@ -170,13 +175,6 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
170
175
|
resultData: {
|
|
171
176
|
runData: {},
|
|
172
177
|
},
|
|
173
|
-
executionData: {
|
|
174
|
-
contextData: {},
|
|
175
|
-
metadata: {},
|
|
176
|
-
nodeExecutionStack,
|
|
177
|
-
waitingExecution: {},
|
|
178
|
-
waitingExecutionSource: {},
|
|
179
|
-
},
|
|
180
178
|
manualData: {
|
|
181
179
|
userId: metadata.userId,
|
|
182
180
|
partialExecutionVersion: 2,
|
|
@@ -189,6 +187,25 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
189
187
|
name: triggerNode.name,
|
|
190
188
|
},
|
|
191
189
|
};
|
|
190
|
+
if (!(config_1.default.get('executions.mode') === 'queue' &&
|
|
191
|
+
process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS === 'true') &&
|
|
192
|
+
data.executionData) {
|
|
193
|
+
const nodeExecutionStack = [];
|
|
194
|
+
nodeExecutionStack.push({
|
|
195
|
+
node: triggerNode,
|
|
196
|
+
data: {
|
|
197
|
+
main: [[{ json: {} }]],
|
|
198
|
+
},
|
|
199
|
+
source: null,
|
|
200
|
+
});
|
|
201
|
+
data.executionData.executionData = {
|
|
202
|
+
contextData: {},
|
|
203
|
+
metadata: {},
|
|
204
|
+
nodeExecutionStack,
|
|
205
|
+
waitingExecution: {},
|
|
206
|
+
waitingExecutionSource: {},
|
|
207
|
+
};
|
|
208
|
+
}
|
|
192
209
|
const executionId = await this.workflowRunner.run(data);
|
|
193
210
|
(0, node_assert_1.default)(executionId);
|
|
194
211
|
const executePromise = this.activeExecutions.getPostExecutePromise(executionId);
|
|
@@ -216,7 +233,7 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
216
233
|
}
|
|
217
234
|
return triggerOutput;
|
|
218
235
|
}
|
|
219
|
-
|
|
236
|
+
extractUserDefinedMetrics(execution, workflow) {
|
|
220
237
|
const metricsNodes = TestRunnerService_1.getEvaluationMetricsNodes(workflow);
|
|
221
238
|
const metricsRunData = metricsNodes
|
|
222
239
|
.flatMap((node) => execution.data.resultData.runData[node.name])
|
|
@@ -227,6 +244,15 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
227
244
|
const metricsResult = metricsData.reduce((acc, curr) => ({ ...acc, ...curr }), {});
|
|
228
245
|
return metricsResult;
|
|
229
246
|
}
|
|
247
|
+
extractPredefinedMetrics(execution) {
|
|
248
|
+
const metricValues = {};
|
|
249
|
+
const tokenUsageMetrics = (0, utils_ee_1.extractTokenUsage)(execution.data.resultData.runData);
|
|
250
|
+
Object.assign(metricValues, tokenUsageMetrics.total);
|
|
251
|
+
if (execution.startedAt && execution.stoppedAt) {
|
|
252
|
+
metricValues.executionTime = execution.stoppedAt.getTime() - execution.startedAt.getTime();
|
|
253
|
+
}
|
|
254
|
+
return metricValues;
|
|
255
|
+
}
|
|
230
256
|
async runTest(user, workflowId) {
|
|
231
257
|
this.logger.debug('Starting new test run', { workflowId });
|
|
232
258
|
const workflow = await this.workflowRepository.findById(workflowId);
|
|
@@ -302,8 +328,10 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
302
328
|
continue;
|
|
303
329
|
}
|
|
304
330
|
const completedAt = new Date();
|
|
305
|
-
const { addedMetrics } = metrics.addResults(this.
|
|
306
|
-
|
|
331
|
+
const { addedMetrics: addedPredefinedMetrics } = metrics.addResults(this.extractPredefinedMetrics(testCaseExecution));
|
|
332
|
+
this.logger.debug('Test case common metrics extracted', addedPredefinedMetrics);
|
|
333
|
+
const { addedMetrics: addedUserDefinedMetrics } = metrics.addResults(this.extractUserDefinedMetrics(testCaseExecution, workflow));
|
|
334
|
+
if (Object.keys(addedUserDefinedMetrics).length === 0) {
|
|
307
335
|
await this.testCaseExecutionRepository.createTestCaseExecution({
|
|
308
336
|
executionId: testCaseExecutionId,
|
|
309
337
|
testRun: {
|
|
@@ -317,7 +345,11 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
317
345
|
telemetryMeta.errored_test_case_count++;
|
|
318
346
|
}
|
|
319
347
|
else {
|
|
320
|
-
|
|
348
|
+
const combinedMetrics = {
|
|
349
|
+
...addedUserDefinedMetrics,
|
|
350
|
+
...addedPredefinedMetrics,
|
|
351
|
+
};
|
|
352
|
+
this.logger.debug('Test case metrics extracted (user-defined)', addedUserDefinedMetrics);
|
|
321
353
|
await this.testCaseExecutionRepository.createTestCaseExecution({
|
|
322
354
|
executionId: testCaseExecutionId,
|
|
323
355
|
testRun: {
|
|
@@ -326,7 +358,7 @@ let TestRunnerService = TestRunnerService_1 = class TestRunnerService {
|
|
|
326
358
|
runAt,
|
|
327
359
|
completedAt,
|
|
328
360
|
status: 'success',
|
|
329
|
-
metrics:
|
|
361
|
+
metrics: combinedMetrics,
|
|
330
362
|
});
|
|
331
363
|
}
|
|
332
364
|
}
|