n8n 1.113.2 → 1.114.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/abstract-server.js +9 -3
- package/dist/abstract-server.js.map +1 -1
- package/dist/auth/auth.service.d.ts +6 -1
- package/dist/auth/auth.service.js +5 -1
- package/dist/auth/auth.service.js.map +1 -1
- package/dist/build.tsbuildinfo +1 -1
- package/dist/chat/utils.js +9 -2
- package/dist/chat/utils.js.map +1 -1
- package/dist/commands/base-command.js +0 -2
- package/dist/commands/base-command.js.map +1 -1
- package/dist/commands/import/entities.d.ts +3 -0
- package/dist/commands/import/entities.js +14 -7
- package/dist/commands/import/entities.js.map +1 -1
- package/dist/commands/start.js +5 -0
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/webhook.js +2 -0
- package/dist/commands/webhook.js.map +1 -1
- package/dist/commands/worker.js +5 -0
- package/dist/commands/worker.js.map +1 -1
- package/dist/controller.registry.js +9 -5
- package/dist/controller.registry.js.map +1 -1
- package/dist/controllers/ai.controller.d.ts +2 -5
- package/dist/controllers/ai.controller.js +20 -1
- package/dist/controllers/ai.controller.js.map +1 -1
- package/dist/controllers/auth.controller.js +1 -1
- package/dist/controllers/auth.controller.js.map +1 -1
- package/dist/controllers/e2e.controller.js +1 -0
- package/dist/controllers/e2e.controller.js.map +1 -1
- package/dist/controllers/project.controller.d.ts +5 -2
- package/dist/controllers/project.controller.js +81 -15
- package/dist/controllers/project.controller.js.map +1 -1
- package/dist/credentials-overwrites.d.ts +17 -2
- package/dist/credentials-overwrites.js +134 -7
- package/dist/credentials-overwrites.js.map +1 -1
- package/dist/deprecation/deprecation.service.js +2 -9
- package/dist/deprecation/deprecation.service.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-git.service.ee.d.ts +2 -2
- package/dist/environments.ee/source-control/source-control-git.service.ee.js +37 -21
- package/dist/environments.ee/source-control/source-control-git.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.d.ts +7 -0
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.js +46 -2
- package/dist/environments.ee/source-control/source-control-preferences.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/source-control.service.ee.js +7 -1
- package/dist/environments.ee/source-control/source-control.service.ee.js.map +1 -1
- package/dist/environments.ee/source-control/types/source-control-preferences.d.ts +3 -0
- package/dist/environments.ee/source-control/types/source-control-preferences.js +19 -0
- package/dist/environments.ee/source-control/types/source-control-preferences.js.map +1 -1
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js +0 -4
- package/dist/evaluation.ee/test-runner/test-runner.service.ee.js.map +1 -1
- package/dist/manual-execution.service.js +3 -9
- package/dist/manual-execution.service.js.map +1 -1
- package/dist/modules/data-table/data-table.module.js +0 -7
- package/dist/modules/data-table/data-table.module.js.map +1 -1
- package/dist/modules/insights/database/entities/insights-raw.d.ts +1 -1
- package/dist/modules/insights/database/repositories/insights-by-period.repository.d.ts +10 -6
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js +52 -14
- package/dist/modules/insights/database/repositories/insights-by-period.repository.js.map +1 -1
- package/dist/modules/insights/insights.controller.d.ts +8 -10
- package/dist/modules/insights/insights.controller.js +91 -39
- package/dist/modules/insights/insights.controller.js.map +1 -1
- package/dist/modules/insights/insights.service.d.ts +16 -12
- package/dist/modules/insights/insights.service.js +36 -13
- package/dist/modules/insights/insights.service.js.map +1 -1
- package/dist/public-api/v1/handlers/projects/projects.handler.js +1 -1
- package/dist/public-api/v1/handlers/projects/projects.handler.js.map +1 -1
- package/dist/push/index.js +1 -1
- package/dist/push/index.js.map +1 -1
- package/dist/scaling/constants.d.ts +2 -2
- package/dist/scaling/job-processor.d.ts +3 -1
- package/dist/scaling/job-processor.js +11 -4
- package/dist/scaling/job-processor.js.map +1 -1
- package/dist/scaling/pubsub/pubsub.event-map.d.ts +1 -0
- package/dist/scaling/pubsub/pubsub.types.d.ts +2 -1
- package/dist/scaling/worker-server.js +24 -12
- package/dist/scaling/worker-server.js.map +1 -1
- package/dist/server.js +8 -4
- package/dist/server.js.map +1 -1
- package/dist/services/ai-workflow-builder.service.d.ts +5 -6
- package/dist/services/ai-workflow-builder.service.js +19 -3
- package/dist/services/ai-workflow-builder.service.js.map +1 -1
- package/dist/services/export.service.d.ts +2 -1
- package/dist/services/export.service.js +38 -5
- package/dist/services/export.service.js.map +1 -1
- package/dist/services/frontend.service.js +2 -1
- package/dist/services/frontend.service.js.map +1 -1
- package/dist/services/hooks.service.js +1 -1
- package/dist/services/hooks.service.js.map +1 -1
- package/dist/services/import.service.d.ts +17 -1
- package/dist/services/import.service.js +249 -2
- package/dist/services/import.service.js.map +1 -1
- package/dist/services/last-active-at.service.d.ts +1 -1
- package/dist/services/last-active-at.service.js +2 -5
- package/dist/services/last-active-at.service.js.map +1 -1
- package/dist/services/project.service.ee.d.ts +17 -2
- package/dist/services/project.service.ee.js +33 -0
- package/dist/services/project.service.ee.js.map +1 -1
- package/dist/services/role.service.js +4 -0
- package/dist/services/role.service.js.map +1 -1
- package/dist/sso.ee/oidc/oidc.service.ee.d.ts +2 -2
- package/dist/sso.ee/oidc/oidc.service.ee.js +5 -2
- package/dist/sso.ee/oidc/oidc.service.ee.js.map +1 -1
- package/dist/sso.ee/oidc/routes/oidc.controller.ee.d.ts +1 -1
- package/dist/user-management/email/templates/credentials-shared.handlebars +57 -70
- package/dist/user-management/email/templates/password-reset-requested.handlebars +67 -104
- package/dist/user-management/email/templates/project-shared.handlebars +52 -65
- package/dist/user-management/email/templates/user-invited.handlebars +57 -70
- package/dist/user-management/email/templates/workflow-shared.handlebars +57 -70
- package/dist/user-management/email/user-management-mailer.js +3 -2
- package/dist/user-management/email/user-management-mailer.js.map +1 -1
- package/dist/utils/validate-database-type.d.ts +2 -0
- package/dist/utils/validate-database-type.js +11 -0
- package/dist/utils/validate-database-type.js.map +1 -0
- package/dist/webhooks/webhook-helpers.d.ts +1 -0
- package/dist/webhooks/webhook-helpers.js +11 -4
- package/dist/webhooks/webhook-helpers.js.map +1 -1
- package/dist/webhooks/webhook-last-node-response-extractor.js +32 -5
- package/dist/webhooks/webhook-last-node-response-extractor.js.map +1 -1
- package/dist/workflows/workflow-execution.service.d.ts +1 -1
- package/dist/workflows/workflow-execution.service.js +1 -3
- package/dist/workflows/workflow-execution.service.js.map +1 -1
- package/dist/workflows/workflows.controller.d.ts +2 -2
- package/dist/workflows/workflows.controller.js +3 -4
- package/dist/workflows/workflows.controller.js.map +1 -1
- package/package.json +18 -18
package/dist/abstract-server.js
CHANGED
|
@@ -153,13 +153,19 @@ let AbstractServer = class AbstractServer {
|
|
|
153
153
|
const { port, listen_address: address } = di_1.Container.get(config_1.GlobalConfig);
|
|
154
154
|
this.server.on('error', (error) => {
|
|
155
155
|
if (error.code === 'EADDRINUSE') {
|
|
156
|
-
this.logger.
|
|
156
|
+
this.logger.error(`n8n's port ${port} is already in use. Do you have another instance of n8n running already?`);
|
|
157
157
|
}
|
|
158
158
|
else if (error.code === 'EACCES') {
|
|
159
|
-
this.logger.
|
|
159
|
+
this.logger.error(`n8n does not have permission to use port ${port}. Please run n8n with a different port.`);
|
|
160
|
+
}
|
|
161
|
+
else if (error.code === 'EAFNOSUPPORT') {
|
|
162
|
+
this.logger.error(`n8n's address '${address}' is not available. Please run n8n with a different address, provide correct address in the environment variables N8N_LISTEN_ADDRESS and/or N8N_WORKER_SERVER_ADDRESS.`);
|
|
160
163
|
}
|
|
161
164
|
else {
|
|
162
|
-
this.logger.error('n8n webserver failed, exiting', {
|
|
165
|
+
this.logger.error('n8n webserver failed, exiting', {
|
|
166
|
+
message: error.message,
|
|
167
|
+
code: error.code,
|
|
168
|
+
});
|
|
163
169
|
}
|
|
164
170
|
process.exit(1);
|
|
165
171
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abstract-server.js","sourceRoot":"","sources":["../src/abstract-server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"abstract-server.js","sourceRoot":"","sources":["../src/abstract-server.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,10 @@ import { License } from '../license';
|
|
|
8
8
|
import { MfaService } from '../mfa/mfa.service';
|
|
9
9
|
import { JwtService } from '../services/jwt.service';
|
|
10
10
|
import { UrlService } from '../services/url.service';
|
|
11
|
+
interface CreateAuthMiddlewareOptions {
|
|
12
|
+
allowSkipMFA: boolean;
|
|
13
|
+
allowSkipPreviewAuth?: boolean;
|
|
14
|
+
}
|
|
11
15
|
export declare class AuthService {
|
|
12
16
|
private readonly globalConfig;
|
|
13
17
|
private readonly logger;
|
|
@@ -19,7 +23,7 @@ export declare class AuthService {
|
|
|
19
23
|
private readonly mfaService;
|
|
20
24
|
private skipBrowserIdCheckEndpoints;
|
|
21
25
|
constructor(globalConfig: GlobalConfig, logger: Logger, license: License, jwtService: JwtService, urlService: UrlService, userRepository: UserRepository, invalidAuthTokenRepository: InvalidAuthTokenRepository, mfaService: MfaService);
|
|
22
|
-
createAuthMiddleware(allowSkipMFA:
|
|
26
|
+
createAuthMiddleware({ allowSkipMFA, allowSkipPreviewAuth }: CreateAuthMiddlewareOptions): (req: AuthenticatedRequest, res: Response, next: NextFunction) => Promise<void>;
|
|
23
27
|
clearCookie(res: Response): void;
|
|
24
28
|
invalidateToken(req: AuthenticatedRequest): Promise<void>;
|
|
25
29
|
issueCookie(res: Response, user: User, usedMfa: boolean, browserId?: string): void;
|
|
@@ -35,3 +39,4 @@ export declare class AuthService {
|
|
|
35
39
|
get jwtRefreshTimeout(): number;
|
|
36
40
|
get jwtExpiration(): number;
|
|
37
41
|
}
|
|
42
|
+
export {};
|
|
@@ -48,7 +48,7 @@ let AuthService = class AuthService {
|
|
|
48
48
|
'/types/credentials.json',
|
|
49
49
|
];
|
|
50
50
|
}
|
|
51
|
-
createAuthMiddleware(allowSkipMFA) {
|
|
51
|
+
createAuthMiddleware({ allowSkipMFA, allowSkipPreviewAuth }) {
|
|
52
52
|
return async (req, res, next) => {
|
|
53
53
|
const token = req.cookies[constants_2.AUTH_COOKIE_NAME];
|
|
54
54
|
if (token) {
|
|
@@ -81,8 +81,12 @@ let AuthService = class AuthService {
|
|
|
81
81
|
}
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
+
const isPreviewMode = process.env.N8N_PREVIEW_MODE === 'true';
|
|
85
|
+
const shouldSkipAuth = allowSkipPreviewAuth && isPreviewMode;
|
|
84
86
|
if (req.user)
|
|
85
87
|
next();
|
|
88
|
+
else if (shouldSkipAuth)
|
|
89
|
+
next();
|
|
86
90
|
else
|
|
87
91
|
res.status(401).json({ status: 'error', message: 'Unauthorized' });
|
|
88
92
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA6C;AAC7C,wCAA2C;AAC3C,8CAAsC;AAEtC,gCAAwF;AACxF,gCAAkC;AAClC,mCAAoC;AAEpC,+CAAoE;AAGpE,sDAA8B;AAC9B,2CAAwE;AACxE,oEAAgE;AAChE,8EAA0E;AAC1E,uCAAoC;AACpC,mDAA+C;AAC/C,wDAAoD;AACpD,wDAAoD;
|
|
1
|
+
{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/auth/auth.service.ts"],"names":[],"mappings":"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"}
|