Merge branch 'master' into eng-70-handle-circular-references-in

# Conflicts: # packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts # packages/cli/src/sso/saml/routes/saml.controller.ee.ts
n8n-io · Mar 21, 2023 · d42123c · d42123c
2 parents 6c4a154 + 34d7fcc
commit d42123c
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 24 deletions.
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
@@ -158,9 +158,8 @@ export class MessageEventBusLogWriter {
 			sentMessages: [],
 			unfinishedExecutions: {},
 		};
-		const logCount = logHistory
-			? Math.min(config.get('eventBus.logWriter.keepLogCount'), logHistory)
-			: config.get('eventBus.logWriter.keepLogCount');
+		const configLogCount = config.get('eventBus.logWriter.keepLogCount');
+		const logCount = logHistory ? Math.min(configLogCount, logHistory) : configLogCount;
 		for (let i = logCount; i >= 0; i--) {
 			const logFileName = this.getLogFileName(i);
 			if (logFileName) {
@@ -255,9 +254,8 @@ export class MessageEventBusLogWriter {
 		logHistory?: number,
 	): Promise<EventMessageTypes[]> {
 		const result: EventMessageTypes[] = [];
-		const logCount = logHistory
-			? Math.min(config.get('eventBus.logWriter.keepLogCount'), logHistory)
-			: config.get('eventBus.logWriter.keepLogCount');
+		const configLogCount = config.get('eventBus.logWriter.keepLogCount');
+		const logCount = logHistory ? Math.min(configLogCount, logHistory) : configLogCount;
 		for (let i = 0; i < logCount; i++) {
 			const logFileName = this.getLogFileName(i);
 			if (logFileName) {

diff --git a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
@@ -1,5 +1,5 @@
 import type { RequestHandler } from 'express';
-import type { AuthenticatedRequest } from '../../../requests';
+import type { AuthenticatedRequest } from '@/requests';
 import { isSamlLicensed, isSamlLicensedAndEnabled } from '../samlHelpers';
 
 export const samlLicensedOwnerMiddleware: RequestHandler = (

diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import { Get, Post, RestController } from '../../../decorators';
+import { Get, Post, RestController } from '@/decorators';
 import { SamlUrls } from '../constants';
 import {
 	samlLicensedAndEnabledMiddleware,
@@ -8,14 +8,14 @@ import {
 } from '../middleware/samlEnabledMiddleware';
 import { SamlService } from '../saml.service.ee';
 import { SamlConfiguration } from '../types/requests';
-import { AuthError, BadRequestError } from '../../../ResponseHelper';
+import { AuthError, BadRequestError } from '@/ResponseHelper';
 import { getInitSSOFormView } from '../views/initSsoPost';
-import { issueCookie } from '../../../auth/jwt';
+import { issueCookie } from '@/auth/jwt';
 import { validate } from 'class-validator';
 import type { PostBindingContext } from 'samlify/types/src/entity';
 import { isSamlLicensedAndEnabled } from '../samlHelpers';
 import type { SamlLoginBinding } from '../types';
-import { AuthenticatedRequest } from '../../../requests';
+import { AuthenticatedRequest } from '@/requests';
 
 @RestController('/sso/saml')
 export class SamlController {

diff --git a/packages/cli/src/sso/saml/types/requests.ts b/packages/cli/src/sso/saml/types/requests.ts
@@ -1,4 +1,4 @@
-import type { AuthenticatedRequest } from '../../../requests';
+import type { AuthenticatedRequest } from '@/requests';
 import type { SamlPreferences } from './samlPreferences';
 
 export declare namespace SamlConfiguration {

diff --git a/packages/cli/src/sso/saml/views/initSsoRedirect.ts b/packages/cli/src/sso/saml/views/initSsoRedirect.ts