n8n 1.84.1 → 1.85.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/auth/auth.service.d.ts +4 -1
- package/dist/auth/auth.service.js +15 -12
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/commands/base-command.d.ts +3 -0
- package/dist/commands/base-command.js +8 -0
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/community-node.d.ts +38 -0
- package/dist/commands/community-node.js +129 -0
- package/dist/commands/community-node.js.map +1 -0
- package/dist/commands/import/workflow.js +6 -10
- package/dist/commands/import/workflow.js.map +1 -1
- package/dist/commands/license/clear.js +1 -1
- package/dist/commands/start.js +1 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +1 -0
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +1 -0
- package/dist/commands/worker.js.map +1 -1
- package/dist/config/index.d.ts +0 -4
- package/dist/config/schema.d.ts +0 -14
- package/dist/config/schema.js +0 -14
- package/dist/config/schema.js.map +1 -1
- package/dist/constants.d.ts +1 -0
- package/dist/constants.js +1 -0
- package/dist/constants.js.map +1 -1
- package/dist/controllers/users.controller.js +7 -8
- package/dist/controllers/users.controller.js.map +1 -1
- package/dist/databases/dsl/column.js +1 -1
- package/dist/databases/dsl/column.js.map +1 -1
- package/dist/databases/entities/index.d.ts +6 -0
- package/dist/databases/entities/index.js +6 -0
- package/dist/databases/entities/index.js.map +1 -1
- package/dist/databases/migrations/common/1739549398681-CreateAnalyticsTables.js +1 -1
- package/dist/databases/migrations/common/1739549398681-CreateAnalyticsTables.js.map +1 -1
- package/dist/databases/migrations/common/1741167584277-RenameAnalyticsToInsights.d.ts +4 -0
- package/dist/databases/migrations/common/1741167584277-RenameAnalyticsToInsights.js +82 -0
- package/dist/databases/migrations/common/1741167584277-RenameAnalyticsToInsights.js.map +1 -0
- package/dist/databases/migrations/mysqldb/index.js +2 -0
- package/dist/databases/migrations/mysqldb/index.js.map +1 -1
- package/dist/databases/migrations/postgresdb/index.js +2 -0
- package/dist/databases/migrations/postgresdb/index.js.map +1 -1
- package/dist/databases/migrations/sqlite/index.js +2 -0
- package/dist/databases/migrations/sqlite/index.js.map +1 -1
- package/dist/databases/repositories/workflow.repository.js +5 -3
- package/dist/databases/repositories/workflow.repository.js.map +1 -1
- package/dist/decorators/module.d.ts +12 -0
- package/dist/decorators/module.js +31 -0
- package/dist/decorators/module.js.map +1 -0
- package/dist/environments.ee/source-control/constants.d.ts +1 -0
- package/dist/environments.ee/source-control/constants.js +2 -1
- package/dist/environments.ee/source-control/constants.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.d.ts +4 -1
- package/dist/environments.ee/source-control/source-control-export.service.ee.js +61 -2
- package/dist/environments.ee/source-control/source-control-export.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-helper.ee.d.ts +1 -0
- package/dist/environments.ee/source-control/source-control-helper.ee.js +4 -0
- package/dist/environments.ee/source-control/source-control-helper.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.d.ts +14 -1
- package/dist/environments.ee/source-control/source-control-import.service.ee.js +105 -3
- package/dist/environments.ee/source-control/source-control-import.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.controller.ee.d.ts +6 -3
- package/dist/environments.ee/source-control/source-control.service.ee.d.ts +12 -3
- package/dist/environments.ee/source-control/source-control.service.ee.js +97 -5
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/types/exportable-folders.d.ts +8 -0
- package/dist/environments.ee/source-control/types/exportable-folders.js +3 -0
- package/dist/environments.ee/source-control/types/exportable-folders.js.map +1 -0
- package/dist/environments.ee/source-control/types/exportable-workflow.d.ts +1 -0
- package/dist/environments.ee/source-control/types/source-control-workflow-version-id.d.ts +1 -0
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js +4 -0
- package/dist/execution-lifecycle/execution-lifecycle-hooks.js.map +1 -1
- package/dist/interfaces.d.ts +7 -3
- package/dist/interfaces.js.map +1 -1
- package/dist/license.d.ts +1 -0
- package/dist/license.js +3 -0
- package/dist/license.js.map +1 -1
- package/dist/load-nodes-and-credentials.js +9 -4
- package/dist/load-nodes-and-credentials.js.map +1 -1
- package/dist/modules/insights/entities/insights-by-period.d.ts +15 -0
- package/dist/modules/insights/entities/insights-by-period.js +65 -0
- package/dist/modules/insights/entities/insights-by-period.js.map +1 -0
- package/dist/modules/insights/entities/insights-metadata.d.ts +8 -0
- package/dist/modules/insights/entities/insights-metadata.js +40 -0
- package/dist/modules/insights/entities/insights-metadata.js.map +1 -0
- package/dist/modules/insights/entities/insights-raw.d.ts +13 -0
- package/dist/modules/insights/entities/insights-raw.js +63 -0
- package/dist/modules/insights/entities/insights-raw.js.map +1 -0
- package/dist/modules/insights/entities/insights-shared.d.ts +19 -0
- package/dist/modules/insights/entities/insights-shared.js +34 -0
- package/dist/modules/insights/entities/insights-shared.js.map +1 -0
- package/dist/modules/insights/insights.config.d.ts +4 -0
- package/dist/modules/insights/insights.config.js +32 -0
- package/dist/modules/insights/insights.config.js.map +1 -0
- package/dist/modules/insights/insights.controller.d.ts +7 -0
- package/dist/modules/insights/insights.controller.js +35 -0
- package/dist/modules/insights/insights.controller.js.map +1 -0
- package/dist/modules/insights/insights.module.d.ts +12 -0
- package/dist/modules/insights/insights.module.js +40 -0
- package/dist/modules/insights/insights.module.js.map +1 -0
- package/dist/modules/insights/insights.service.d.ts +20 -0
- package/dist/modules/insights/insights.service.js +210 -0
- package/dist/modules/insights/insights.service.js.map +1 -0
- package/dist/modules/insights/repositories/insights-by-period.repository.d.ts +21 -0
- package/dist/modules/insights/repositories/insights-by-period.repository.js +179 -0
- package/dist/modules/insights/repositories/insights-by-period.repository.js.map +1 -0
- package/dist/modules/insights/repositories/insights-metadata.repository.d.ts +5 -0
- package/dist/modules/insights/repositories/insights-metadata.repository.js +26 -0
- package/dist/modules/insights/repositories/insights-metadata.repository.js.map +1 -0
- package/dist/modules/insights/repositories/insights-raw.repository.d.ts +6 -0
- package/dist/modules/insights/repositories/insights-raw.repository.js +34 -0
- package/dist/modules/insights/repositories/insights-raw.repository.js.map +1 -0
- package/dist/modules/modules.config.d.ts +10 -0
- package/dist/modules/modules.config.js +39 -0
- package/dist/modules/modules.config.js.map +1 -0
- package/dist/node-types.d.ts +1 -3
- package/dist/node-types.js +3 -10
- package/dist/node-types.js.map +1 -1
- package/dist/permissions.ee/global-roles.js +1 -0
- package/dist/permissions.ee/global-roles.js.map +1 -1
- package/dist/server.js +16 -3
- package/dist/server.js.map +1 -1
- package/dist/services/folder.service.js +3 -1
- package/dist/services/folder.service.js.map +1 -1
- package/dist/services/frontend.service.js +2 -2
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/timezones.json +1 -1
- package/dist/utils/sql.d.ts +1 -0
- package/dist/utils/sql.js +13 -0
- package/dist/utils/sql.js.map +1 -0
- package/dist/workflows/workflow.service.d.ts +4 -2
- package/dist/workflows/workflow.service.js +16 -5
- package/dist/workflows/workflow.service.js.map +1 -1
- package/dist/workflows/workflows.controller.js +2 -2
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +10 -10
- package/templates/form-trigger-completion.handlebars +25 -0
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { GlobalConfig } from '@n8n/config';
|
|
1
2
|
import type { NextFunction, Response } from 'express';
|
|
2
3
|
import { Logger } from 'n8n-core';
|
|
3
4
|
import type { User } from '../databases/entities/user';
|
|
@@ -8,13 +9,15 @@ import type { AuthenticatedRequest } from '../requests';
|
|
|
8
9
|
import { JwtService } from '../services/jwt.service';
|
|
9
10
|
import { UrlService } from '../services/url.service';
|
|
10
11
|
export declare class AuthService {
|
|
12
|
+
private readonly globalConfig;
|
|
11
13
|
private readonly logger;
|
|
12
14
|
private readonly license;
|
|
13
15
|
private readonly jwtService;
|
|
14
16
|
private readonly urlService;
|
|
15
17
|
private readonly userRepository;
|
|
16
18
|
private readonly invalidAuthTokenRepository;
|
|
17
|
-
|
|
19
|
+
private skipBrowserIdCheckEndpoints;
|
|
20
|
+
constructor(globalConfig: GlobalConfig, logger: Logger, license: License, jwtService: JwtService, urlService: UrlService, userRepository: UserRepository, invalidAuthTokenRepository: InvalidAuthTokenRepository);
|
|
18
21
|
authMiddleware(req: AuthenticatedRequest, res: Response, next: NextFunction): Promise<void>;
|
|
19
22
|
clearCookie(res: Response): void;
|
|
20
23
|
invalidateToken(req: AuthenticatedRequest): Promise<void>;
|
|
@@ -27,15 +27,9 @@ const forbidden_error_1 = require("../errors/response-errors/forbidden.error");
|
|
|
27
27
|
const license_1 = require("../license");
|
|
28
28
|
const jwt_service_1 = require("../services/jwt.service");
|
|
29
29
|
const url_service_1 = require("../services/url.service");
|
|
30
|
-
const restEndpoint = di_1.Container.get(config_1.GlobalConfig).endpoints.rest;
|
|
31
|
-
const skipBrowserIdCheckEndpoints = [
|
|
32
|
-
`/${restEndpoint}/push`,
|
|
33
|
-
`/${restEndpoint}/binary-data/`,
|
|
34
|
-
`/${restEndpoint}/oauth1-credential/callback`,
|
|
35
|
-
`/${restEndpoint}/oauth2-credential/callback`,
|
|
36
|
-
];
|
|
37
30
|
let AuthService = class AuthService {
|
|
38
|
-
constructor(logger, license, jwtService, urlService, userRepository, invalidAuthTokenRepository) {
|
|
31
|
+
constructor(globalConfig, logger, license, jwtService, urlService, userRepository, invalidAuthTokenRepository) {
|
|
32
|
+
this.globalConfig = globalConfig;
|
|
39
33
|
this.logger = logger;
|
|
40
34
|
this.license = license;
|
|
41
35
|
this.jwtService = jwtService;
|
|
@@ -43,6 +37,13 @@ let AuthService = class AuthService {
|
|
|
43
37
|
this.userRepository = userRepository;
|
|
44
38
|
this.invalidAuthTokenRepository = invalidAuthTokenRepository;
|
|
45
39
|
this.authMiddleware = this.authMiddleware.bind(this);
|
|
40
|
+
const restEndpoint = globalConfig.endpoints.rest;
|
|
41
|
+
this.skipBrowserIdCheckEndpoints = [
|
|
42
|
+
`/${restEndpoint}/push`,
|
|
43
|
+
`/${restEndpoint}/binary-data/`,
|
|
44
|
+
`/${restEndpoint}/oauth1-credential/callback`,
|
|
45
|
+
`/${restEndpoint}/oauth2-credential/callback`,
|
|
46
|
+
];
|
|
46
47
|
}
|
|
47
48
|
async authMiddleware(req, res, next) {
|
|
48
49
|
const token = req.cookies[constants_1.AUTH_COOKIE_NAME];
|
|
@@ -95,11 +96,12 @@ let AuthService = class AuthService {
|
|
|
95
96
|
throw new forbidden_error_1.ForbiddenError(constants_1.RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
|
|
96
97
|
}
|
|
97
98
|
const token = this.issueJWT(user, browserId);
|
|
99
|
+
const { samesite, secure } = this.globalConfig.auth.cookie;
|
|
98
100
|
res.cookie(constants_1.AUTH_COOKIE_NAME, token, {
|
|
99
101
|
maxAge: this.jwtExpiration * constants_1.Time.seconds.toMilliseconds,
|
|
100
102
|
httpOnly: true,
|
|
101
|
-
sameSite:
|
|
102
|
-
secure
|
|
103
|
+
sameSite: samesite,
|
|
104
|
+
secure,
|
|
103
105
|
});
|
|
104
106
|
}
|
|
105
107
|
issueJWT(user, browserId) {
|
|
@@ -125,7 +127,7 @@ let AuthService = class AuthService {
|
|
|
125
127
|
throw new auth_error_1.AuthError('Unauthorized');
|
|
126
128
|
}
|
|
127
129
|
const endpoint = req.route ? `${req.baseUrl}${req.route.path}` : req.baseUrl;
|
|
128
|
-
if (req.method === 'GET' && skipBrowserIdCheckEndpoints.includes(endpoint)) {
|
|
130
|
+
if (req.method === 'GET' && this.skipBrowserIdCheckEndpoints.includes(endpoint)) {
|
|
129
131
|
this.logger.debug(`Skipped browserId check on ${endpoint}`);
|
|
130
132
|
}
|
|
131
133
|
else if (jwtPayload.browserId &&
|
|
@@ -200,7 +202,8 @@ let AuthService = class AuthService {
|
|
|
200
202
|
exports.AuthService = AuthService;
|
|
201
203
|
exports.AuthService = AuthService = __decorate([
|
|
202
204
|
(0, di_1.Service)(),
|
|
203
|
-
__metadata("design:paramtypes", [
|
|
205
|
+
__metadata("design:paramtypes", [config_1.GlobalConfig,
|
|
206
|
+
n8n_core_1.Logger,
|
|
204
207
|
license_1.License,
|
|
205
208
|
jwt_service_1.JwtService,
|
|
206
209
|
url_service_1.UrlService,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|