From de02993f882384a716b608d47c2f709513dc127b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Fri, 20 Oct 2023 18:46:14 +0200 Subject: [PATCH] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Iván Ovejero --- packages/cli/src/InternalHooks.ts | 2 +- packages/cli/src/License.ts | 2 +- packages/cli/src/commands/start.ts | 6 +++--- packages/cli/src/posthog/index.ts | 2 +- packages/cli/src/telemetry/index.ts | 2 +- packages/core/src/Cipher.ts | 2 +- packages/core/src/NodeExecuteFunctions.ts | 4 ++-- packages/node-dev/commands/build.ts | 2 +- packages/workflow/test/Helpers.ts | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts index 0ccda3e156682..4f4c365b19ff5 100644 --- a/packages/cli/src/InternalHooks.ts +++ b/packages/cli/src/InternalHooks.ts @@ -57,7 +57,7 @@ export class InternalHooks implements IInternalHooksClass { private roleService: RoleService, private executionRepository: ExecutionRepository, eventsService: EventsService, - private instanceSettings: InstanceSettings, + private readonly instanceSettings: InstanceSettings, ) { eventsService.on('telemetry.onFirstProductionWorkflowSuccess', async (metrics) => this.onFirstProductionWorkflowSuccess(metrics), diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts index 18548f8371505..668df04d20b9a 100644 --- a/packages/cli/src/License.ts +++ b/packages/cli/src/License.ts @@ -31,7 +31,7 @@ export class License { private redisPublisher: RedisServicePubSubPublisher; - constructor(private instanceSettings: InstanceSettings) { + constructor(private readonly instanceSettings: InstanceSettings) { this.logger = getLogger(); } diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts index 25bb96fcf8b59..b2e4431c2e6c3 100644 --- a/packages/cli/src/commands/start.ts +++ b/packages/cli/src/commands/start.ts @@ -282,10 +282,10 @@ export class Start extends BaseCommand { if (flags.tunnel) { this.log('\nWaiting for tunnel ...'); - let tunnelSubdomain = process.env.N8N_TUNNEL_SUBDOMAIN ?? ''; - tunnelSubdomain = tunnelSubdomain || this.instanceSettings.tunnelSubdomain || ''; + let tunnelSubdomain = + process.env.N8N_TUNNEL_SUBDOMAIN ?? this.instanceSettings.tunnelSubdomain ?? ''; - if (!tunnelSubdomain) { + if (tunnelSubdomain === '') { // When no tunnel subdomain did exist yet create a new random one const availableCharacters = 'abcdefghijklmnopqrstuvwxyz0123456789'; tunnelSubdomain = Array.from({ length: 24 }) diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts index c74a5c1366f89..202a8cea97453 100644 --- a/packages/cli/src/posthog/index.ts +++ b/packages/cli/src/posthog/index.ts @@ -9,7 +9,7 @@ import type { PublicUser } from '@/Interfaces'; export class PostHogClient { private postHog?: PostHog; - constructor(private instanceSettings: InstanceSettings) {} + constructor(private readonly instanceSettings: InstanceSettings) {} async init() { const enabled = config.getEnv('diagnostics.enabled'); diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index 1b3c398ca3959..349f8a6019d01 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -40,7 +40,7 @@ export class Telemetry { constructor( private postHog: PostHogClient, private license: License, - private instanceSettings: InstanceSettings, + private readonly instanceSettings: InstanceSettings, ) {} async init() { diff --git a/packages/core/src/Cipher.ts b/packages/core/src/Cipher.ts index 43263f903a626..248d74a4eb9f5 100644 --- a/packages/core/src/Cipher.ts +++ b/packages/core/src/Cipher.ts @@ -4,7 +4,7 @@ import { InstanceSettings } from './InstanceSettings'; @Service() export class Cipher { - constructor(private instanceSettings: InstanceSettings) {} + constructor(private readonly instanceSettings: InstanceSettings) {} encrypt(data: string) { return AES.encrypt(data, this.instanceSettings.encryptionKey).toString(); diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts index e36774554453a..ae986132644c0 100644 --- a/packages/core/src/NodeExecuteFunctions.ts +++ b/packages/core/src/NodeExecuteFunctions.ts @@ -2510,7 +2510,7 @@ const getCommonWorkflowFunctions = ( getRestApiUrl: () => additionalData.restApiUrl, getInstanceBaseUrl: () => additionalData.instanceBaseUrl, - getInstanceId: async () => Container.get(InstanceSettings).instanceId, + getInstanceId: () => Container.get(InstanceSettings).instanceId, getTimezone: () => getTimezone(workflow, additionalData), prepareOutputData: async (outputData) => [outputData], @@ -2616,7 +2616,7 @@ function isFilePathBlocked(filePath: string): boolean { //restrict access to .n8n folder and other .env config related paths if (blockFileAccessToN8nFiles) { const { n8nFolder } = Container.get(InstanceSettings); - const restrictedPaths: string[] = [n8nFolder]; + const restrictedPaths = [n8nFolder]; if (process.env[CONFIG_FILES]) { restrictedPaths.push(...process.env[CONFIG_FILES].split(',')); diff --git a/packages/node-dev/commands/build.ts b/packages/node-dev/commands/build.ts index 9fd0df00af45b..b95abbab4db80 100644 --- a/packages/node-dev/commands/build.ts +++ b/packages/node-dev/commands/build.ts @@ -18,7 +18,7 @@ export class Build extends Command { help: flags.help({ char: 'h' }), destination: flags.string({ char: 'd', - description: `The path to copy the compiles files to [default: ${ + description: `The path to copy the compiled files to [default: ${ Container.get(InstanceSettings).customExtensionDir }]`, }), diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts index cb6af34465995..c01b8269e48b9 100644 --- a/packages/workflow/test/Helpers.ts +++ b/packages/workflow/test/Helpers.ts @@ -43,11 +43,11 @@ export interface INodeTypesObject { } export class Credentials extends ICredentials { - hasNodeAccess(): boolean { + hasNodeAccess() { return true; } - setData(data: ICredentialDataDecryptedObject): void { + setData(data: ICredentialDataDecryptedObject) { this.data = JSON.stringify(data); }