From 6485ca0a4b5048515f4d2481233d8ae1adbd4b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 28 Aug 2024 17:57:46 +0200 Subject: [PATCH] refactor(core): Enforce filename casing in `cli` package (no-changelog) (#10594) --- packages/cli/.eslintrc.js | 8 ++++ .../src/__tests__/active-executions.test.ts | 2 +- .../{License.test.ts => license.test.ts} | 0 .../cli/src/__tests__/wait-tracker.test.ts | 2 +- .../src/__tests__/workflow-helpers.test.ts | 2 +- .../cli/src/__tests__/workflow-runner.test.ts | 2 +- packages/cli/src/abstract-server.ts | 4 +- packages/cli/src/active-executions.ts | 2 +- packages/cli/src/active-workflow-manager.ts | 2 +- .../src/auth/__tests__/auth.service.test.ts | 2 +- packages/cli/src/auth/auth.service.ts | 2 +- packages/cli/src/auth/jwt.ts | 2 +- packages/cli/src/auth/methods/email.ts | 2 +- packages/cli/src/auth/methods/ldap.ts | 2 +- packages/cli/src/commands/base-command.ts | 6 +-- .../{executeBatch.ts => execute-batch.ts} | 6 ++- packages/cli/src/commands/execute.ts | 2 +- .../cli/src/commands/export/credentials.ts | 2 +- .../cli/src/commands/import/credentials.ts | 4 +- packages/cli/src/commands/import/workflow.ts | 2 +- packages/cli/src/commands/start.ts | 2 +- .../cli/src/commands/user-management/reset.ts | 2 +- packages/cli/src/commands/worker.ts | 4 +- .../concurrency-control.service.test.ts | 2 +- .../concurrency-control.service.ts | 2 +- .../cli/src/concurrency/concurrency-queue.ts | 2 +- .../__tests__/me.controller.test.ts | 4 +- .../__tests__/owner.controller.test.ts | 2 +- .../__tests__/users.controller.test.ts | 2 +- .../cli/src/controllers/auth.controller.ts | 4 +- .../community-packages.controller.ts | 4 +- .../cli/src/controllers/e2e.controller.ts | 2 +- .../src/controllers/invitation.controller.ts | 2 +- packages/cli/src/controllers/me.controller.ts | 4 +- ...s => oauth1-credential.controller.test.ts} | 2 +- ...s => oauth2-credential.controller.test.ts} | 2 +- .../oauth/abstract-oauth.controller.ts | 2 +- .../cli/src/controllers/users.controller.ts | 4 +- .../workflow-statistics.controller.ts | 2 +- packages/cli/src/credentials-helper.ts | 2 +- packages/cli/src/credentials-overwrites.ts | 2 +- .../src/credentials/credentials.controller.ts | 2 +- .../src/credentials/credentials.service.ee.ts | 2 +- .../src/credentials/credentials.service.ts | 6 +-- .../databases/dsl/{Column.ts => column.ts} | 0 packages/cli/src/databases/dsl/index.ts | 6 +-- .../databases/dsl/{Indices.ts => indices.ts} | 0 .../src/databases/dsl/{Table.ts => table.ts} | 2 +- .../entities/__tests__/user.entity.test.ts | 2 +- .../src/databases/entities/auth-identity.ts | 2 +- .../cli/src/databases/entities/auth-user.ts | 2 +- .../databases/entities/credentials-entity.ts | 2 +- packages/cli/src/databases/entities/index.ts | 4 +- .../databases/entities/project-relation.ts | 2 +- .../databases/entities/{User.ts => user.ts} | 2 +- .../entities/{Variables.ts => variables.ts} | 0 .../src/databases/entities/workflow-entity.ts | 2 +- .../common/1714133768519-CreateProject.ts | 2 +- .../1681134145996-AddUserActivatedProperty.ts | 2 +- .../1681134145996-AddUserActivatedProperty.ts | 2 +- .../1681134145996-AddUserActivatedProperty.ts | 2 +- ... => shared-credentials.repository.test.ts} | 2 +- ...cs.test.ts => workflow-statistics.test.ts} | 0 .../repositories/credentials.repository.ts | 2 +- .../repositories/execution.repository.ts | 2 +- .../shared-credentials.repository.ts | 2 +- .../shared-workflow.repository.ts | 2 +- .../databases/repositories/user.repository.ts | 2 +- .../repositories/variables.repository.ts | 2 +- .../workflow-statistics.repository.ts | 2 +- .../databases/subscribers/user-subscriber.ts | 2 +- .../cli/src/databases/utils/generators.ts | 2 +- packages/cli/src/{Db.ts => db.ts} | 0 .../cli/src/decorators/controller.registry.ts | 2 +- packages/cli/src/decorators/licensed.ts | 2 +- packages/cli/src/decorators/types.ts | 2 +- .../source-control-git.service.test.ts | 35 +++++++++++++++++ .../sourceControlGit.service.test.ts | 39 ------------------- .../source-control-git.service.ee.ts | 2 +- .../source-control-import.service.ee.ts | 4 +- .../source-control.service.ee.ts | 4 +- .../variables/variables.service.ee.ts | 2 +- .../src/errors/workflow-missing-id.error.ts | 2 +- ....controller.ts => event-bus.controller.ts} | 0 .../event-message-workflow.ts | 2 +- .../log-streaming-event-relay.test.ts | 2 +- .../__tests__/telemetry-event-relay.test.ts | 2 +- packages/cli/src/events/event.service.ts | 2 +- packages/cli/src/events/relay-event-map.ts | 4 +- .../cli/src/events/telemetry-event-relay.ts | 2 +- .../__tests__/save-execution-progress.test.ts | 2 +- .../shared/shared-hook-functions.ts | 2 +- .../__tests__/execution.service.test.ts | 2 +- .../executions/execution-recovery.service.ts | 2 +- .../src/executions/execution.service.ee.ts | 2 +- .../cli/src/executions/execution.service.ts | 4 +- .../src/executions/executions.controller.ts | 2 +- packages/cli/src/external-hooks.ts | 2 +- .../external-secrets-manager.ee.test.ts | 2 +- .../external-secrets-manager.ee.ts | 2 +- .../external-secrets-providers.ee.ts | 2 +- .../external-secrets.service.ee.ts | 2 +- .../aws-secrets/aws-secrets-manager.ts | 2 +- .../providers/aws-secrets/types.ts | 2 +- .../azure-key-vault/azure-key-vault.ts | 2 +- .../providers/azure-key-vault/types.ts | 2 +- .../gcp-secrets-manager.ts | 2 +- .../providers/gcp-secrets-manager/types.ts | 2 +- .../external-secrets/providers/infisical.ts | 2 +- .../src/external-secrets/providers/vault.ts | 4 +- packages/cli/src/generic-helpers.ts | 2 +- .../cli/src/{Interfaces.ts => interfaces.ts} | 2 +- .../cli/src/ldap/__tests__/helpers.test.ts | 2 +- packages/cli/src/ldap/helpers.ee.ts | 4 +- packages/cli/src/ldap/ldap.service.ee.ts | 2 +- packages/cli/src/license.ts | 2 +- packages/cli/src/license/license.service.ts | 2 +- .../{listQuery.test.ts => list-query.test.ts} | 0 packages/cli/src/permissions/check-access.ts | 2 +- .../{PostHog.test.ts => posthog.test.ts} | 0 packages/cli/src/posthog/index.ts | 2 +- .../credentials/credentials.service.ts | 6 +-- .../v1/handlers/users/users.service.ee.ts | 2 +- .../handlers/workflows/workflows.service.ts | 4 +- .../shared/middlewares/global.middleware.ts | 2 +- packages/cli/src/push/__tests__/index.test.ts | 2 +- .../src/push/__tests__/websocket.push.test.ts | 2 +- packages/cli/src/push/abstract.push.ts | 2 +- packages/cli/src/push/index.ts | 4 +- packages/cli/src/requests.ts | 8 ++-- .../risk-reporters/nodes-risk-reporter.ts | 2 +- packages/cli/src/server.ts | 4 +- .../active-workflows.service.test.ts | 2 +- .../community-packages.service.test.ts | 4 +- .../services/__tests__/hooks.service.test.ts | 2 +- .../__tests__/ownership.service.test.ts | 2 +- .../services/__tests__/user.service.test.ts | 2 +- .../workflow-statistics.service.test.ts | 2 +- .../src/services/active-workflows.service.ts | 2 +- .../cli/src/services/cache/cache.service.ts | 2 +- ...rvice.ts => community-packages.service.ts} | 2 +- .../services/credentials-tester.service.ts | 2 +- packages/cli/src/services/cta.service.ts | 2 +- packages/cli/src/services/frontend.service.ts | 4 +- packages/cli/src/services/hooks.service.ts | 4 +- packages/cli/src/services/import.service.ts | 4 +- .../main/handle-command-message-main.ts | 2 +- .../orchestration/main/multi-main-setup.ee.ts | 2 +- .../pubsub/pubsub-message-map.ts | 2 +- .../webhook/handle-command-message-webhook.ts | 2 +- .../worker/handle-command-message-worker.ts | 2 +- .../cli/src/services/ownership.service.ts | 2 +- packages/cli/src/services/project.service.ts | 2 +- .../services/redis/redis-service-commands.ts | 2 +- packages/cli/src/services/role.service.ts | 2 +- packages/cli/src/services/tag.service.ts | 2 +- .../src/services/user-onboarding.service.ts | 2 +- packages/cli/src/services/user.service.ts | 4 +- .../services/workflow-statistics.service.ts | 2 +- ...rvice.test.ts => shutdown.service.test.ts} | 0 ...mlHelpers.test.ts => saml-helpers.test.ts} | 2 +- packages/cli/src/sso/saml/saml-helpers.ts | 2 +- packages/cli/src/sso/saml/saml.service.ee.ts | 2 +- packages/cli/src/telemetry/index.ts | 2 +- .../src/{TypedEmitter.ts => typed-emitter.ts} | 0 .../__tests__/user-management-mailer.test.ts | 2 +- .../email/{Interfaces.ts => interfaces.ts} | 0 .../src/user-management/email/node-mailer.ts | 2 +- .../email/user-management-mailer.ts | 4 +- packages/cli/src/wait-tracker.ts | 2 +- packages/cli/src/waiting-forms.ts | 2 +- .../webhooks/__tests__/test-webhooks.test.ts | 2 +- .../__tests__/waiting-webhooks.test.ts | 2 +- .../test-webhook-registrations.service.ts | 2 +- packages/cli/src/webhooks/test-webhooks.ts | 2 +- packages/cli/src/webhooks/waiting-webhooks.ts | 2 +- packages/cli/src/webhooks/webhook-helpers.ts | 2 +- .../src/workflow-execute-additional-data.ts | 2 +- packages/cli/src/workflow-helpers.ts | 2 +- packages/cli/src/workflow-runner.ts | 2 +- .../workflow-execution.service.test.ts | 2 +- .../workflows/workflow-execution.service.ts | 4 +- .../workflow-history.service.ee.test.ts | 2 +- .../workflow-history.service.ee.ts | 2 +- .../src/workflows/workflow-sharing.service.ts | 2 +- .../cli/src/workflows/workflow.request.ts | 2 +- .../cli/src/workflows/workflow.service.ee.ts | 2 +- .../cli/src/workflows/workflow.service.ts | 2 +- .../cli/src/workflows/workflows.controller.ts | 4 +- .../cli/test/integration/auth.api.test.ts | 2 +- .../community-packages.api.test.ts | 2 +- .../controllers/invitation/assertions.ts | 2 +- .../invitation.controller.integration.test.ts | 2 +- .../controllers/oauth/oauth2.api.test.ts | 2 +- .../integration/credentials-helper.test.ts | 2 +- .../credentials/credentials.api.ee.test.ts | 2 +- .../credentials/credentials.api.test.ts | 2 +- .../credentials/credentials.service.test.ts | 2 +- .../cli/test/integration/cta.service.test.ts | 2 +- .../environments/source-control.test.ts | 2 +- .../cli/test/integration/eventbus.ee.test.ts | 2 +- .../cli/test/integration/eventbus.test.ts | 2 +- .../integration/executions.controller.test.ts | 2 +- .../external-secrets.api.test.ts | 2 +- .../test/integration/import.service.test.ts | 2 +- .../test/integration/ldap/ldap.api.test.ts | 2 +- .../cli/test/integration/license.api.test.ts | 4 +- packages/cli/test/integration/me.api.test.ts | 2 +- .../cli/test/integration/mfa/mfa.api.test.ts | 2 +- .../cli/test/integration/owner.api.test.ts | 2 +- .../integration/password-reset.api.test.ts | 2 +- .../integration/permission-checker.test.ts | 2 +- .../cli/test/integration/project.api.test.ts | 2 +- .../public-api/credentials.test.ts | 2 +- .../integration/public-api/executions.test.ts | 2 +- .../test/integration/public-api/tags.test.ts | 2 +- .../integration/public-api/users.ee.test.ts | 2 +- .../integration/public-api/workflows.test.ts | 2 +- .../cli/test/integration/role.api.test.ts | 2 +- .../test/integration/saml/saml.api.test.ts | 2 +- .../nodes-risk-reporter.test.ts | 2 +- .../test/integration/shared/db/credentials.ts | 4 +- .../test/integration/shared/db/projects.ts | 2 +- .../cli/test/integration/shared/db/users.ts | 2 +- .../test/integration/shared/db/workflows.ts | 2 +- .../cli/test/integration/shared/license.ts | 2 +- .../cli/test/integration/shared/test-db.ts | 2 +- packages/cli/test/integration/shared/types.ts | 4 +- .../integration/shared/utils/test-server.ts | 4 +- .../test/integration/shared/utils/users.ts | 4 +- .../cli/test/integration/users.api.test.ts | 2 +- .../cli/test/integration/variables.test.ts | 2 +- .../integration/workflow-history.api.test.ts | 2 +- .../workflow-sharing.service.test.ts | 2 +- ...er-with-active-workflow-manager.ee.test.ts | 2 +- .../workflows/workflows.controller.ee.test.ts | 2 +- .../workflows/workflows.controller.test.ts | 2 +- .../cli/test/shared/external-secrets/utils.ts | 4 +- packages/cli/test/shared/mock-objects.ts | 2 +- 239 files changed, 313 insertions(+), 307 deletions(-) rename packages/cli/src/__tests__/{License.test.ts => license.test.ts} (100%) rename packages/cli/src/commands/{executeBatch.ts => execute-batch.ts} (99%) rename packages/cli/src/controllers/oauth/__tests__/{oAuth1Credential.controller.test.ts => oauth1-credential.controller.test.ts} (99%) rename packages/cli/src/controllers/oauth/__tests__/{oAuth2Credential.controller.test.ts => oauth2-credential.controller.test.ts} (99%) rename packages/cli/src/databases/dsl/{Column.ts => column.ts} (100%) rename packages/cli/src/databases/dsl/{Indices.ts => indices.ts} (100%) rename packages/cli/src/databases/dsl/{Table.ts => table.ts} (99%) rename packages/cli/src/databases/entities/{User.ts => user.ts} (98%) rename packages/cli/src/databases/entities/{Variables.ts => variables.ts} (100%) rename packages/cli/src/databases/repositories/__tests__/{sharedCredentials.repository.test.ts => shared-credentials.repository.test.ts} (98%) rename packages/cli/src/databases/repositories/__tests__/{workflowStatistics.test.ts => workflow-statistics.test.ts} (100%) rename packages/cli/src/{Db.ts => db.ts} (100%) delete mode 100644 packages/cli/src/environments/source-control/__tests__/sourceControlGit.service.test.ts rename packages/cli/src/eventbus/{eventBus.controller.ts => event-bus.controller.ts} (100%) rename packages/cli/src/{Interfaces.ts => interfaces.ts} (99%) rename packages/cli/src/middlewares/list-query/__tests__/{listQuery.test.ts => list-query.test.ts} (100%) rename packages/cli/src/posthog/__tests__/{PostHog.test.ts => posthog.test.ts} (100%) rename packages/cli/src/services/{communityPackages.service.ts => community-packages.service.ts} (99%) rename packages/cli/src/shutdown/__tests__/{Shutdown.service.test.ts => shutdown.service.test.ts} (100%) rename packages/cli/src/sso/saml/__tests__/{samlHelpers.test.ts => saml-helpers.test.ts} (97%) rename packages/cli/src/{TypedEmitter.ts => typed-emitter.ts} (100%) rename packages/cli/src/user-management/email/{Interfaces.ts => interfaces.ts} (100%) diff --git a/packages/cli/.eslintrc.js b/packages/cli/.eslintrc.js index 17ecfee499..fd654771a5 100644 --- a/packages/cli/.eslintrc.js +++ b/packages/cli/.eslintrc.js @@ -19,6 +19,8 @@ module.exports = { ], rules: { + 'unicorn/filename-case': ['error', { case: 'kebabCase' }], + 'n8n-local-rules/no-dynamic-import-template': 'error', 'n8n-local-rules/misplaced-n8n-typeorm-import': 'error', 'n8n-local-rules/no-type-unsafe-event-emitter': 'error', @@ -39,6 +41,12 @@ module.exports = { }, overrides: [ + { + files: ['./src/databases/migrations/**/*.ts'], + rules: { + 'unicorn/filename-case': 'off', + }, + }, { files: ['./src/databases/**/*.ts', './test/**/*.ts', './src/**/__tests__/**/*.ts'], rules: { diff --git a/packages/cli/src/__tests__/active-executions.test.ts b/packages/cli/src/__tests__/active-executions.test.ts index 4b9ceaeaa4..4aaeeea3fa 100644 --- a/packages/cli/src/__tests__/active-executions.test.ts +++ b/packages/cli/src/__tests__/active-executions.test.ts @@ -3,7 +3,7 @@ import PCancelable from 'p-cancelable'; import { v4 as uuid } from 'uuid'; import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow'; import { createDeferredPromise } from 'n8n-workflow'; -import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowExecutionDataProcess } from '@/interfaces'; import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { mock } from 'jest-mock-extended'; import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service'; diff --git a/packages/cli/src/__tests__/License.test.ts b/packages/cli/src/__tests__/license.test.ts similarity index 100% rename from packages/cli/src/__tests__/License.test.ts rename to packages/cli/src/__tests__/license.test.ts diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts index 204055b1d9..19ce0e024f 100644 --- a/packages/cli/src/__tests__/wait-tracker.test.ts +++ b/packages/cli/src/__tests__/wait-tracker.test.ts @@ -1,7 +1,7 @@ import { WaitTracker } from '@/wait-tracker'; import { mock } from 'jest-mock-extended'; import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; -import type { IExecutionResponse } from '@/Interfaces'; +import type { IExecutionResponse } from '@/interfaces'; import { OrchestrationService } from '@/services/orchestration.service'; import type { MultiMainSetup } from '@/services/orchestration/main/multi-main-setup.ee'; diff --git a/packages/cli/src/__tests__/workflow-helpers.test.ts b/packages/cli/src/__tests__/workflow-helpers.test.ts index 32f4933349..24199c6df0 100644 --- a/packages/cli/src/__tests__/workflow-helpers.test.ts +++ b/packages/cli/src/__tests__/workflow-helpers.test.ts @@ -1,6 +1,6 @@ import { type Workflow } from 'n8n-workflow'; import { getExecutionStartNode } from '@/workflow-helpers'; -import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowExecutionDataProcess } from '@/interfaces'; describe('WorkflowHelpers', () => { describe('getExecutionStartNode', () => { diff --git a/packages/cli/src/__tests__/workflow-runner.test.ts b/packages/cli/src/__tests__/workflow-runner.test.ts index 09e3bfb7b0..a5eb9887a5 100644 --- a/packages/cli/src/__tests__/workflow-runner.test.ts +++ b/packages/cli/src/__tests__/workflow-runner.test.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowRunner } from '@/workflow-runner'; import config from '@/config'; diff --git a/packages/cli/src/abstract-server.ts b/packages/cli/src/abstract-server.ts index f9080080d0..9bac826ace 100644 --- a/packages/cli/src/abstract-server.ts +++ b/packages/cli/src/abstract-server.ts @@ -8,8 +8,8 @@ import isbot from 'isbot'; import config from '@/config'; import { N8N_VERSION, TEMPLATES_DIR, inDevelopment, inTest } from '@/constants'; -import * as Db from '@/Db'; -import { N8nInstanceType } from '@/Interfaces'; +import * as Db from '@/db'; +import { N8nInstanceType } from '@/interfaces'; import { ExternalHooks } from '@/external-hooks'; import { send, sendErrorResponse } from '@/response-helper'; import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares'; diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts index 0aeb768f07..12c76196d3 100644 --- a/packages/cli/src/active-executions.ts +++ b/packages/cli/src/active-executions.ts @@ -20,7 +20,7 @@ import type { IExecutionDb, IExecutionsCurrentSummary, IWorkflowExecutionDataProcess, -} from '@/Interfaces'; +} from '@/interfaces'; import { isWorkflowIdValid } from '@/utils'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts index c15e9e6bde..e4541f293a 100644 --- a/packages/cli/src/active-workflow-manager.ts +++ b/packages/cli/src/active-workflow-manager.ts @@ -26,7 +26,7 @@ import { ApplicationError, } from 'n8n-workflow'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import * as WebhookHelpers from '@/webhooks/webhook-helpers'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; diff --git a/packages/cli/src/auth/__tests__/auth.service.test.ts b/packages/cli/src/auth/__tests__/auth.service.test.ts index c34d9eac5a..fe9b51f292 100644 --- a/packages/cli/src/auth/__tests__/auth.service.test.ts +++ b/packages/cli/src/auth/__tests__/auth.service.test.ts @@ -5,7 +5,7 @@ import type { NextFunction, Response } from 'express'; import { AuthService } from '@/auth/auth.service'; import config from '@/config'; import { AUTH_COOKIE_NAME, Time } from '@/constants'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository'; import type { UserRepository } from '@/databases/repositories/user.repository'; import { JwtService } from '@/services/jwt.service'; diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts index 1dc32f1b81..b4f7efb3ad 100644 --- a/packages/cli/src/auth/auth.service.ts +++ b/packages/cli/src/auth/auth.service.ts @@ -5,7 +5,7 @@ import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken'; import config from '@/config'; import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthError } from '@/errors/response-errors/auth.error'; diff --git a/packages/cli/src/auth/jwt.ts b/packages/cli/src/auth/jwt.ts index a51c6c966f..38d37ed332 100644 --- a/packages/cli/src/auth/jwt.ts +++ b/packages/cli/src/auth/jwt.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import type { Response } from 'express'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { AuthService } from './auth.service'; // This method is still used by cloud hooks. diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts index 501cf5fd56..58919e03f8 100644 --- a/packages/cli/src/auth/methods/email.ts +++ b/packages/cli/src/auth/methods/email.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { PasswordUtility } from '@/services/password.utility'; import { Container } from 'typedi'; import { isLdapLoginEnabled } from '@/ldap/helpers.ee'; diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts index 84769d1008..75627a543d 100644 --- a/packages/cli/src/auth/methods/ldap.ts +++ b/packages/cli/src/auth/methods/ldap.ts @@ -10,7 +10,7 @@ import { createLdapAuthIdentity, updateLdapUserOnLocalDb, } from '@/ldap/helpers.ee'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { EventService } from '@/events/event.service'; export const handleLdapLogin = async ( diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts index e20b39bd69..eb7e8b03f4 100644 --- a/packages/cli/src/commands/base-command.ts +++ b/packages/cli/src/commands/base-command.ts @@ -7,14 +7,14 @@ import { BinaryDataService, InstanceSettings, ObjectStoreService } from 'n8n-cor import type { AbstractServer } from '@/abstract-server'; import { Logger } from '@/logger'; import config from '@/config'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import * as CrashJournal from '@/crash-journal'; import { LICENSE_FEATURES, inDevelopment, inTest } from '@/constants'; import { initErrorHandling } from '@/error-reporting'; import { ExternalHooks } from '@/external-hooks'; import { NodeTypes } from '@/node-types'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; -import type { N8nInstanceType } from '@/Interfaces'; +import type { N8nInstanceType } from '@/interfaces'; import { PostHogClient } from '@/posthog'; import { License } from '@/license'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; @@ -116,7 +116,7 @@ export abstract class BaseCommand extends Command { const { communityPackages } = this.globalConfig.nodes; if (communityPackages.enabled && this.needsCommunityPackages) { - const { CommunityPackagesService } = await import('@/services/communityPackages.service'); + const { CommunityPackagesService } = await import('@/services/community-packages.service'); await Container.get(CommunityPackagesService).checkForMissingPackages(); } diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/execute-batch.ts similarity index 99% rename from packages/cli/src/commands/executeBatch.ts rename to packages/cli/src/commands/execute-batch.ts index b9e2695751..c07dd6aed3 100644 --- a/packages/cli/src/commands/executeBatch.ts +++ b/packages/cli/src/commands/execute-batch.ts @@ -11,8 +11,8 @@ import pick from 'lodash/pick'; import { ActiveExecutions } from '@/active-executions'; import { WorkflowRunner } from '@/workflow-runner'; -import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces'; -import type { User } from '@/databases/entities/User'; +import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/interfaces'; +import type { User } from '@/databases/entities/user'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OwnershipService } from '@/services/ownership.service'; import { findCliWorkflowStart } from '@/utils'; @@ -108,6 +108,8 @@ export class ExecuteBatch extends BaseCommand { }), }; + static aliases = ['executeBatch']; + override needsCommunityPackages = true; /** diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts index 646f1af0fe..14d39db417 100644 --- a/packages/cli/src/commands/execute.ts +++ b/packages/cli/src/commands/execute.ts @@ -5,7 +5,7 @@ import { ApplicationError, ExecutionBaseError } from 'n8n-workflow'; import { ActiveExecutions } from '@/active-executions'; import { WorkflowRunner } from '@/workflow-runner'; -import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowExecutionDataProcess } from '@/interfaces'; import { findCliWorkflowStart, isWorkflowIdValid } from '@/utils'; import { BaseCommand } from './base-command'; diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts index cec59f014f..fc1d62ab66 100644 --- a/packages/cli/src/commands/export/credentials.ts +++ b/packages/cli/src/commands/export/credentials.ts @@ -2,7 +2,7 @@ import { Flags } from '@oclif/core'; import fs from 'fs'; import path from 'path'; import { Credentials } from 'n8n-core'; -import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/Interfaces'; +import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/interfaces'; import { BaseCommand } from '../base-command'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import Container from 'typedi'; diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts index 577a47aaba..9226f629c7 100644 --- a/packages/cli/src/commands/import/credentials.ts +++ b/packages/cli/src/commands/import/credentials.ts @@ -6,7 +6,7 @@ import glob from 'fast-glob'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { EntityManager } from '@n8n/typeorm'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import { SharedCredentials } from '@/databases/entities/shared-credentials'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { BaseCommand } from '../base-command'; @@ -15,7 +15,7 @@ import { ApplicationError, jsonParse } from 'n8n-workflow'; import { UM_FIX_INSTRUCTION } from '@/constants'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { Project } from '@/databases/entities/project'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; export class ImportCredentialsCommand extends BaseCommand { static description = 'Import credentials'; diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts index bc6d646d6a..0e5581479e 100644 --- a/packages/cli/src/commands/import/workflow.ts +++ b/packages/cli/src/commands/import/workflow.ts @@ -9,7 +9,7 @@ import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { generateNanoId } from '@/databases/utils/generators'; import { UserRepository } from '@/databases/repositories/user.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; -import type { IWorkflowToImport } from '@/Interfaces'; +import type { IWorkflowToImport } from '@/interfaces'; import { ImportService } from '@/services/import.service'; import { BaseCommand } from '../base-command'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts index 76de7585dd..8fbc5a0826 100644 --- a/packages/cli/src/commands/start.ts +++ b/packages/cli/src/commands/start.ts @@ -26,7 +26,7 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; import { WaitTracker } from '@/wait-tracker'; import { BaseCommand } from './base-command'; -import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowExecutionDataProcess } from '@/interfaces'; import { ExecutionService } from '@/executions/execution.service'; import { OwnershipService } from '@/services/ownership.service'; import { WorkflowRunner } from '@/workflow-runner'; diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts index dcb11e5bef..5082a00fc9 100644 --- a/packages/cli/src/commands/user-management/reset.ts +++ b/packages/cli/src/commands/user-management/reset.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts index fdbe448c11..7db79b8508 100644 --- a/packages/cli/src/commands/worker.ts +++ b/packages/cli/src/commands/worker.ts @@ -4,12 +4,12 @@ import express from 'express'; import http from 'http'; import { ApplicationError } from 'n8n-workflow'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import * as ResponseHelper from '@/response-helper'; import config from '@/config'; import type { ScalingService } from '@/scaling/scaling.service'; import { N8N_VERSION, inTest } from '@/constants'; -import type { ICredentialsOverwrite } from '@/Interfaces'; +import type { ICredentialsOverwrite } from '@/interfaces'; import { CredentialsOverwrites } from '@/credentials-overwrites'; import { rawBodyReader, bodyParser } from '@/middlewares'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; diff --git a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts index 418ac96709..585c1bb172 100644 --- a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts +++ b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts @@ -10,7 +10,7 @@ import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit import { ConcurrencyQueue } from '../concurrency-queue'; import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow'; import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; -import type { IExecutingWorkflowData } from '@/Interfaces'; +import type { IExecutingWorkflowData } from '@/interfaces'; import type { Telemetry } from '@/telemetry'; import type { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts index b2b94a5d6e..718de25b72 100644 --- a/packages/cli/src/concurrency/concurrency-control.service.ts +++ b/packages/cli/src/concurrency/concurrency-control.service.ts @@ -6,7 +6,7 @@ import { UnknownExecutionModeError } from '@/errors/unknown-execution-mode.error import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit.error'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow'; -import type { IExecutingWorkflowData } from '@/Interfaces'; +import type { IExecutingWorkflowData } from '@/interfaces'; import { Telemetry } from '@/telemetry'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/concurrency/concurrency-queue.ts b/packages/cli/src/concurrency/concurrency-queue.ts index 1b578b5a8e..51a689e638 100644 --- a/packages/cli/src/concurrency/concurrency-queue.ts +++ b/packages/cli/src/concurrency/concurrency-queue.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { TypedEmitter } from '@/TypedEmitter'; +import { TypedEmitter } from '@/typed-emitter'; type ConcurrencyEvents = { 'execution-throttled': { executionId: string }; diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts index b711a65ed6..391c50599c 100644 --- a/packages/cli/src/controllers/__tests__/me.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts @@ -3,8 +3,8 @@ import { Container } from 'typedi'; import jwt from 'jsonwebtoken'; import { mock, anyObject } from 'jest-mock-extended'; -import type { PublicUser } from '@/Interfaces'; -import type { User } from '@/databases/entities/User'; +import type { PublicUser } from '@/interfaces'; +import type { User } from '@/databases/entities/user'; import { API_KEY_PREFIX, MeController } from '@/controllers/me.controller'; import { AUTH_COOKIE_NAME } from '@/constants'; import type { AuthenticatedRequest, MeRequest } from '@/requests'; diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts index 042c21c09e..f8f313a58c 100644 --- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts @@ -6,7 +6,7 @@ import jwt from 'jsonwebtoken'; import type { AuthService } from '@/auth/auth.service'; import config from '@/config'; import { OwnerController } from '@/controllers/owner.controller'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { UserRepository } from '@/databases/repositories/user.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/controllers/__tests__/users.controller.test.ts b/packages/cli/src/controllers/__tests__/users.controller.test.ts index 38a4399cab..a7c83b4925 100644 --- a/packages/cli/src/controllers/__tests__/users.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/users.controller.test.ts @@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended'; import { UsersController } from '../users.controller'; import type { UserRequest } from '@/requests'; import type { EventService } from '@/events/event.service'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { UserRepository } from '@/databases/repositories/user.repository'; import type { ProjectService } from '@/services/project.service'; diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts index 4ebc2afc9a..0b9fb8c4c2 100644 --- a/packages/cli/src/controllers/auth.controller.ts +++ b/packages/cli/src/controllers/auth.controller.ts @@ -4,9 +4,9 @@ import { Response } from 'express'; import { AuthService } from '@/auth/auth.service'; import { Get, Post, RestController } from '@/decorators'; import { RESPONSE_ERROR_MESSAGES } from '@/constants'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { AuthenticatedRequest, LoginRequest, UserRequest } from '@/requests'; -import type { PublicUser } from '@/Interfaces'; +import type { PublicUser } from '@/interfaces'; import { handleEmailLogin, handleLdapLogin } from '@/auth'; import { PostHogClient } from '@/posthog'; import { diff --git a/packages/cli/src/controllers/community-packages.controller.ts b/packages/cli/src/controllers/community-packages.controller.ts index fcfd11ca2e..a947fd668f 100644 --- a/packages/cli/src/controllers/community-packages.controller.ts +++ b/packages/cli/src/controllers/community-packages.controller.ts @@ -6,9 +6,9 @@ import { import { Delete, Get, Patch, Post, RestController, GlobalScope } from '@/decorators'; import { NodeRequest } from '@/requests'; import type { InstalledPackages } from '@/databases/entities/installed-packages'; -import type { CommunityPackages } from '@/Interfaces'; +import type { CommunityPackages } from '@/interfaces'; import { Push } from '@/push'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts index 08301783e9..8e1434b9b4 100644 --- a/packages/cli/src/controllers/e2e.controller.ts +++ b/packages/cli/src/controllers/e2e.controller.ts @@ -9,7 +9,7 @@ import { License } from '@/license'; import { LICENSE_FEATURES, LICENSE_QUOTAS, UNLIMITED_LICENSE_QUOTA, inE2ETests } from '@/constants'; import { Patch, Post, RestController } from '@/decorators'; import type { UserSetupPayload } from '@/requests'; -import type { BooleanLicenseFeature, IPushDataType, NumericLicenseFeature } from '@/Interfaces'; +import type { BooleanLicenseFeature, IPushDataType, NumericLicenseFeature } from '@/interfaces'; import { MfaService } from '@/mfa/mfa.service'; import { Push } from '@/push'; import { CacheService } from '@/services/cache/cache.service'; diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts index 61177266b2..259bef0061 100644 --- a/packages/cli/src/controllers/invitation.controller.ts +++ b/packages/cli/src/controllers/invitation.controller.ts @@ -12,7 +12,7 @@ import { Logger } from '@/logger'; import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers'; import { PasswordUtility } from '@/services/password.utility'; import { PostHogClient } from '@/posthog'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { ForbiddenError } from '@/errors/response-errors/forbidden.error'; diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts index 26d9f04402..e571420d8d 100644 --- a/packages/cli/src/controllers/me.controller.ts +++ b/packages/cli/src/controllers/me.controller.ts @@ -7,14 +7,14 @@ import { AuthService } from '@/auth/auth.service'; import { Delete, Get, Patch, Post, RestController } from '@/decorators'; import { PasswordUtility } from '@/services/password.utility'; import { validateEntity } from '@/generic-helpers'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { AuthenticatedRequest, MeRequest, UserSettingsUpdatePayload, UserUpdatePayload, } from '@/requests'; -import type { PublicUser } from '@/Interfaces'; +import type { PublicUser } from '@/interfaces'; import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers'; import { UserService } from '@/services/user.service'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts similarity index 99% rename from packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts rename to packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts index e5be0e3bce..8eb93d5e46 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oAuth1Credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts @@ -7,7 +7,7 @@ import { mock } from 'jest-mock-extended'; import { OAuth1CredentialController } from '@/controllers/oauth/oauth1-credential.controller'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { OAuthRequest } from '@/requests'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts similarity index 99% rename from packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts rename to packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts index 996aa1170a..09c64a76b3 100644 --- a/packages/cli/src/controllers/oauth/__tests__/oAuth2Credential.controller.test.ts +++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts @@ -7,7 +7,7 @@ import { mock } from 'jest-mock-extended'; import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { OAuthRequest } from '@/requests'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts index 7f066c8704..6ec5fffae9 100644 --- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts +++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts @@ -8,7 +8,7 @@ import { jsonParse, ApplicationError } from 'n8n-workflow'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import type { ICredentialsDb } from '@/Interfaces'; +import type { ICredentialsDb } from '@/interfaces'; import type { OAuthRequest } from '@/requests'; import { RESPONSE_ERROR_MESSAGES } from '@/constants'; import { CredentialsHelper } from '@/credentials-helper'; diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts index 2755bfd786..567b44bc71 100644 --- a/packages/cli/src/controllers/users.controller.ts +++ b/packages/cli/src/controllers/users.controller.ts @@ -1,7 +1,7 @@ import { plainToInstance } from 'class-transformer'; import { AuthService } from '@/auth/auth.service'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { GlobalScope, Delete, Get, RestController, Patch, Licensed } from '@/decorators'; import { ListQuery, @@ -9,7 +9,7 @@ import { UserRoleChangePayload, UserSettingsUpdatePayload, } from '@/requests'; -import type { PublicUser } from '@/Interfaces'; +import type { PublicUser } from '@/interfaces'; import { AuthIdentity } from '@/databases/entities/auth-identity'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; diff --git a/packages/cli/src/controllers/workflow-statistics.controller.ts b/packages/cli/src/controllers/workflow-statistics.controller.ts index 6026b68bb5..dd8207ed5a 100644 --- a/packages/cli/src/controllers/workflow-statistics.controller.ts +++ b/packages/cli/src/controllers/workflow-statistics.controller.ts @@ -4,7 +4,7 @@ import type { WorkflowStatistics } from '@/databases/entities/workflow-statistic import { StatisticsNames } from '@/databases/entities/workflow-statistics'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository'; -import type { IWorkflowStatisticsDataLoaded } from '@/Interfaces'; +import type { IWorkflowStatisticsDataLoaded } from '@/interfaces'; import { Logger } from '@/logger'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { StatisticsRequest } from './workflow-statistics.types'; diff --git a/packages/cli/src/credentials-helper.ts b/packages/cli/src/credentials-helper.ts index 1a40dc3674..bb65a94750 100644 --- a/packages/cli/src/credentials-helper.ts +++ b/packages/cli/src/credentials-helper.ts @@ -27,7 +27,7 @@ import type { } from 'n8n-workflow'; import { ICredentialsHelper, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow'; -import type { ICredentialsDb } from '@/Interfaces'; +import type { ICredentialsDb } from '@/interfaces'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { CredentialTypes } from '@/credential-types'; diff --git a/packages/cli/src/credentials-overwrites.ts b/packages/cli/src/credentials-overwrites.ts index b8df1a848c..79a641e4d6 100644 --- a/packages/cli/src/credentials-overwrites.ts +++ b/packages/cli/src/credentials-overwrites.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import { GlobalConfig } from '@n8n/config'; import type { ICredentialDataDecryptedObject } from 'n8n-workflow'; import { deepCopy, jsonParse } from 'n8n-workflow'; -import type { ICredentialsOverwrite } from '@/Interfaces'; +import type { ICredentialsOverwrite } from '@/interfaces'; import { CredentialTypes } from '@/credential-types'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts index eabeb39a48..c58305bc70 100644 --- a/packages/cli/src/credentials/credentials.controller.ts +++ b/packages/cli/src/credentials/credentials.controller.ts @@ -23,7 +23,7 @@ import { } from '@/decorators'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { UserManagementMailer } from '@/user-management/email'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import * as utils from '@/utils'; import { listQueryMiddleware } from '@/middlewares'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts index 7aba293cdd..3f42d3bff8 100644 --- a/packages/cli/src/credentials/credentials.service.ee.ts +++ b/packages/cli/src/credentials/credentials.service.ee.ts @@ -1,6 +1,6 @@ // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In, type EntityManager } from '@n8n/typeorm'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { CredentialsService } from './credentials.service'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts index e9a88a9153..330dde807d 100644 --- a/packages/cli/src/credentials/credentials.service.ts +++ b/packages/cli/src/credentials/credentials.service.ts @@ -14,15 +14,15 @@ import { type FindOptionsWhere, } from '@n8n/typeorm'; import type { Scope } from '@n8n/permissions'; -import * as Db from '@/Db'; -import type { ICredentialsDb } from '@/Interfaces'; +import * as Db from '@/db'; +import type { ICredentialsDb } from '@/interfaces'; import { createCredentialsFromCredentialsEntity } from '@/credentials-helper'; import { CREDENTIAL_BLANKING_VALUE } from '@/constants'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { SharedCredentials } from '@/databases/entities/shared-credentials'; import { validateEntity } from '@/generic-helpers'; import { ExternalHooks } from '@/external-hooks'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { CredentialRequest, ListQuery } from '@/requests'; import { CredentialTypes } from '@/credential-types'; import { OwnershipService } from '@/services/ownership.service'; diff --git a/packages/cli/src/databases/dsl/Column.ts b/packages/cli/src/databases/dsl/column.ts similarity index 100% rename from packages/cli/src/databases/dsl/Column.ts rename to packages/cli/src/databases/dsl/column.ts diff --git a/packages/cli/src/databases/dsl/index.ts b/packages/cli/src/databases/dsl/index.ts index a51e61bd17..c60e5819f4 100644 --- a/packages/cli/src/databases/dsl/index.ts +++ b/packages/cli/src/databases/dsl/index.ts @@ -1,5 +1,5 @@ import type { QueryRunner } from '@n8n/typeorm'; -import { Column } from './Column'; +import { Column } from './column'; import { AddColumns, AddForeignKey, @@ -9,8 +9,8 @@ import { DropForeignKey, DropNotNull, DropTable, -} from './Table'; -import { CreateIndex, DropIndex } from './Indices'; +} from './table'; +import { CreateIndex, DropIndex } from './indices'; export const createSchemaBuilder = (tablePrefix: string, queryRunner: QueryRunner) => ({ column: (name: string) => new Column(name), diff --git a/packages/cli/src/databases/dsl/Indices.ts b/packages/cli/src/databases/dsl/indices.ts similarity index 100% rename from packages/cli/src/databases/dsl/Indices.ts rename to packages/cli/src/databases/dsl/indices.ts diff --git a/packages/cli/src/databases/dsl/Table.ts b/packages/cli/src/databases/dsl/table.ts similarity index 99% rename from packages/cli/src/databases/dsl/Table.ts rename to packages/cli/src/databases/dsl/table.ts index b2d3fcea39..414be858f8 100644 --- a/packages/cli/src/databases/dsl/Table.ts +++ b/packages/cli/src/databases/dsl/table.ts @@ -1,7 +1,7 @@ import type { TableForeignKeyOptions, TableIndexOptions, QueryRunner } from '@n8n/typeorm'; import { Table, TableColumn, TableForeignKey } from '@n8n/typeorm'; import LazyPromise from 'p-lazy'; -import { Column } from './Column'; +import { Column } from './column'; import { ApplicationError } from 'n8n-workflow'; abstract class TableOperation extends LazyPromise { diff --git a/packages/cli/src/databases/entities/__tests__/user.entity.test.ts b/packages/cli/src/databases/entities/__tests__/user.entity.test.ts index d135db04b0..5901d0218b 100644 --- a/packages/cli/src/databases/entities/__tests__/user.entity.test.ts +++ b/packages/cli/src/databases/entities/__tests__/user.entity.test.ts @@ -1,4 +1,4 @@ -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; describe('User Entity', () => { describe('JSON.stringify', () => { diff --git a/packages/cli/src/databases/entities/auth-identity.ts b/packages/cli/src/databases/entities/auth-identity.ts index f8c012d2c2..c050786614 100644 --- a/packages/cli/src/databases/entities/auth-identity.ts +++ b/packages/cli/src/databases/entities/auth-identity.ts @@ -1,6 +1,6 @@ import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from '@n8n/typeorm'; import { WithTimestamps } from './abstract-entity'; -import { User } from './User'; +import { User } from './user'; export type AuthProviderType = 'ldap' | 'email' | 'saml'; // | 'google'; diff --git a/packages/cli/src/databases/entities/auth-user.ts b/packages/cli/src/databases/entities/auth-user.ts index dbfb8f83fd..1f8b6960c8 100644 --- a/packages/cli/src/databases/entities/auth-user.ts +++ b/packages/cli/src/databases/entities/auth-user.ts @@ -1,5 +1,5 @@ import { Column, Entity } from '@n8n/typeorm'; -import { User } from './User'; +import { User } from './user'; @Entity({ name: 'user' }) export class AuthUser extends User { diff --git a/packages/cli/src/databases/entities/credentials-entity.ts b/packages/cli/src/databases/entities/credentials-entity.ts index ddbdf7e368..931e31aad4 100644 --- a/packages/cli/src/databases/entities/credentials-entity.ts +++ b/packages/cli/src/databases/entities/credentials-entity.ts @@ -2,7 +2,7 @@ import { Column, Entity, Index, OneToMany } from '@n8n/typeorm'; import { IsObject, IsString, Length } from 'class-validator'; import type { SharedCredentials } from './shared-credentials'; import { WithTimestampsAndStringId } from './abstract-entity'; -import type { ICredentialsDb } from '@/Interfaces'; +import type { ICredentialsDb } from '@/interfaces'; @Entity() export class CredentialsEntity extends WithTimestampsAndStringId implements ICredentialsDb { diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts index 275bf309c0..daac91e8c3 100644 --- a/packages/cli/src/databases/entities/index.ts +++ b/packages/cli/src/databases/entities/index.ts @@ -10,8 +10,8 @@ import { Settings } from './settings'; import { SharedCredentials } from './shared-credentials'; import { SharedWorkflow } from './shared-workflow'; import { TagEntity } from './tag-entity'; -import { User } from './User'; -import { Variables } from './Variables'; +import { User } from './user'; +import { Variables } from './variables'; import { WebhookEntity } from './webhook-entity'; import { WorkflowEntity } from './workflow-entity'; import { WorkflowTagMapping } from './workflow-tag-mapping'; diff --git a/packages/cli/src/databases/entities/project-relation.ts b/packages/cli/src/databases/entities/project-relation.ts index f8084532bc..2f0686c30c 100644 --- a/packages/cli/src/databases/entities/project-relation.ts +++ b/packages/cli/src/databases/entities/project-relation.ts @@ -1,5 +1,5 @@ import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm'; -import { User } from './User'; +import { User } from './user'; import { WithTimestamps } from './abstract-entity'; import { Project } from './project'; diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/user.ts similarity index 98% rename from packages/cli/src/databases/entities/User.ts rename to packages/cli/src/databases/entities/user.ts index 7819757195..8a69f2f9dc 100644 --- a/packages/cli/src/databases/entities/User.ts +++ b/packages/cli/src/databases/entities/user.ts @@ -16,7 +16,7 @@ import type { SharedCredentials } from './shared-credentials'; import { NoXss } from '@/validators/no-xss.validator'; import { objectRetriever, lowerCaser } from '../utils/transformers'; import { WithTimestamps, jsonColumnType } from './abstract-entity'; -import type { IPersonalizationSurveyAnswers } from '@/Interfaces'; +import type { IPersonalizationSurveyAnswers } from '@/interfaces'; import type { AuthIdentity } from './auth-identity'; import { GLOBAL_OWNER_SCOPES, diff --git a/packages/cli/src/databases/entities/Variables.ts b/packages/cli/src/databases/entities/variables.ts similarity index 100% rename from packages/cli/src/databases/entities/Variables.ts rename to packages/cli/src/databases/entities/variables.ts diff --git a/packages/cli/src/databases/entities/workflow-entity.ts b/packages/cli/src/databases/entities/workflow-entity.ts index b0dd56635b..0aa8ff0d81 100644 --- a/packages/cli/src/databases/entities/workflow-entity.ts +++ b/packages/cli/src/databases/entities/workflow-entity.ts @@ -11,7 +11,7 @@ import type { WorkflowStatistics } from './workflow-statistics'; import type { WorkflowTagMapping } from './workflow-tag-mapping'; import { objectRetriever, sqlite } from '../utils/transformers'; import { WithTimestampsAndStringId, dbType, jsonColumnType } from './abstract-entity'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; @Entity() export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkflowDb { diff --git a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts index ac1ec9d8e8..9bcf26ee9a 100644 --- a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts +++ b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts @@ -1,6 +1,6 @@ import type { MigrationContext, ReversibleMigration } from '@/databases/types'; import type { ProjectRole } from '@/databases/entities/project-relation'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { generateNanoId } from '@/databases/utils/generators'; import { ApplicationError } from 'n8n-workflow'; import { nanoid } from 'nanoid'; diff --git a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts index fc16c1711f..5a601e427c 100644 --- a/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts +++ b/packages/cli/src/databases/migrations/mysqldb/1681134145996-AddUserActivatedProperty.ts @@ -1,5 +1,5 @@ import type { MigrationContext, ReversibleMigration } from '@/databases/types'; -import type { UserSettings } from '@/Interfaces'; +import type { UserSettings } from '@/interfaces'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts index 0a0a87e20c..d01930bc73 100644 --- a/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts +++ b/packages/cli/src/databases/migrations/postgresdb/1681134145996-AddUserActivatedProperty.ts @@ -1,5 +1,5 @@ import type { MigrationContext, ReversibleMigration } from '@/databases/types'; -import type { UserSettings } from '@/Interfaces'; +import type { UserSettings } from '@/interfaces'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts b/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts index f9f7a0d74d..463eb12e80 100644 --- a/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts +++ b/packages/cli/src/databases/migrations/sqlite/1681134145996-AddUserActivatedProperty.ts @@ -1,5 +1,5 @@ import type { MigrationContext, ReversibleMigration } from '@/databases/types'; -import type { UserSettings } from '@/Interfaces'; +import type { UserSettings } from '@/interfaces'; export class AddUserActivatedProperty1681134145996 implements ReversibleMigration { async up({ queryRunner, tablePrefix }: MigrationContext) { diff --git a/packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts similarity index 98% rename from packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts rename to packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts index 14b827b8eb..8e67ed825f 100644 --- a/packages/cli/src/databases/repositories/__tests__/sharedCredentials.repository.test.ts +++ b/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts @@ -3,7 +3,7 @@ import { In } from '@n8n/typeorm'; import { mock } from 'jest-mock-extended'; import { hasScope } from '@n8n/permissions'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { SharedCredentials } from '@/databases/entities/shared-credentials'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/src/databases/repositories/__tests__/workflowStatistics.test.ts b/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts similarity index 100% rename from packages/cli/src/databases/repositories/__tests__/workflowStatistics.test.ts rename to packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts diff --git a/packages/cli/src/databases/repositories/credentials.repository.ts b/packages/cli/src/databases/repositories/credentials.repository.ts index 5878d9913c..77fb9ce973 100644 --- a/packages/cli/src/databases/repositories/credentials.repository.ts +++ b/packages/cli/src/databases/repositories/credentials.repository.ts @@ -3,7 +3,7 @@ import { DataSource, In, Repository, Like } from '@n8n/typeorm'; import type { FindManyOptions, FindOptionsWhere } from '@n8n/typeorm'; import { CredentialsEntity } from '../entities/credentials-entity'; import type { ListQuery } from '@/requests'; -import type { User } from '../entities/User'; +import type { User } from '../entities/user'; import type { Scope } from '@n8n/permissions'; import { RoleService } from '@/services/role.service'; diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts index d722c75dc9..f6438b5a83 100644 --- a/packages/cli/src/databases/repositories/execution.repository.ts +++ b/packages/cli/src/databases/repositories/execution.repository.ts @@ -35,7 +35,7 @@ import type { IExecutionBase, IExecutionFlattedDb, IExecutionResponse, -} from '@/Interfaces'; +} from '@/interfaces'; import config from '@/config'; import type { ExecutionData } from '../entities/execution-data'; diff --git a/packages/cli/src/databases/repositories/shared-credentials.repository.ts b/packages/cli/src/databases/repositories/shared-credentials.repository.ts index dd393b4e50..b24d736fff 100644 --- a/packages/cli/src/databases/repositories/shared-credentials.repository.ts +++ b/packages/cli/src/databases/repositories/shared-credentials.repository.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import type { EntityManager, FindOptionsRelations, FindOptionsWhere } from '@n8n/typeorm'; import { DataSource, In, Not, Repository } from '@n8n/typeorm'; import { type CredentialSharingRole, SharedCredentials } from '../entities/shared-credentials'; -import type { User } from '../entities/User'; +import type { User } from '../entities/user'; import { RoleService } from '@/services/role.service'; import type { Scope } from '@n8n/permissions'; import type { Project } from '../entities/project'; diff --git a/packages/cli/src/databases/repositories/shared-workflow.repository.ts b/packages/cli/src/databases/repositories/shared-workflow.repository.ts index b8d49d946c..37b47b8f1c 100644 --- a/packages/cli/src/databases/repositories/shared-workflow.repository.ts +++ b/packages/cli/src/databases/repositories/shared-workflow.repository.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import { DataSource, Repository, In, Not } from '@n8n/typeorm'; import type { EntityManager, FindManyOptions, FindOptionsWhere } from '@n8n/typeorm'; import { SharedWorkflow, type WorkflowSharingRole } from '../entities/shared-workflow'; -import { type User } from '../entities/User'; +import { type User } from '../entities/user'; import type { Scope } from '@n8n/permissions'; import { RoleService } from '@/services/role.service'; import type { Project } from '../entities/project'; diff --git a/packages/cli/src/databases/repositories/user.repository.ts b/packages/cli/src/databases/repositories/user.repository.ts index 52e1ec5501..40bf42edea 100644 --- a/packages/cli/src/databases/repositories/user.repository.ts +++ b/packages/cli/src/databases/repositories/user.repository.ts @@ -3,7 +3,7 @@ import type { DeepPartial, EntityManager, FindManyOptions } from '@n8n/typeorm'; import { DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm'; import type { ListQuery } from '@/requests'; -import { type GlobalRole, User } from '../entities/User'; +import { type GlobalRole, User } from '../entities/user'; import { Project } from '../entities/project'; import { ProjectRelation } from '../entities/project-relation'; diff --git a/packages/cli/src/databases/repositories/variables.repository.ts b/packages/cli/src/databases/repositories/variables.repository.ts index e2a321ce57..1b6c4c7cc5 100644 --- a/packages/cli/src/databases/repositories/variables.repository.ts +++ b/packages/cli/src/databases/repositories/variables.repository.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; import { DataSource, Repository } from '@n8n/typeorm'; -import { Variables } from '../entities/Variables'; +import { Variables } from '../entities/variables'; @Service() export class VariablesRepository extends Repository { diff --git a/packages/cli/src/databases/repositories/workflow-statistics.repository.ts b/packages/cli/src/databases/repositories/workflow-statistics.repository.ts index 24d9024df7..0b8f35f647 100644 --- a/packages/cli/src/databases/repositories/workflow-statistics.repository.ts +++ b/packages/cli/src/databases/repositories/workflow-statistics.repository.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; import { GlobalConfig } from '@n8n/config'; import { DataSource, MoreThanOrEqual, QueryFailedError, Repository } from '@n8n/typeorm'; import { StatisticsNames, WorkflowStatistics } from '../entities/workflow-statistics'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; type StatisticsInsertResult = 'insert' | 'failed' | 'alreadyExists'; type StatisticsUpsertResult = StatisticsInsertResult | 'update'; diff --git a/packages/cli/src/databases/subscribers/user-subscriber.ts b/packages/cli/src/databases/subscribers/user-subscriber.ts index dbb5e45d20..29aa387cad 100644 --- a/packages/cli/src/databases/subscribers/user-subscriber.ts +++ b/packages/cli/src/databases/subscribers/user-subscriber.ts @@ -5,7 +5,7 @@ import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow'; import { Logger } from '@/logger'; import { Project } from '../entities/project'; -import { User } from '../entities/User'; +import { User } from '../entities/user'; import { UserRepository } from '../repositories/user.repository'; @EventSubscriber() diff --git a/packages/cli/src/databases/utils/generators.ts b/packages/cli/src/databases/utils/generators.ts index 7a228d96ab..5c4a40cb77 100644 --- a/packages/cli/src/databases/utils/generators.ts +++ b/packages/cli/src/databases/utils/generators.ts @@ -1,6 +1,6 @@ import { customAlphabet } from 'nanoid'; import { ALPHABET } from 'n8n-workflow'; -import type { N8nInstanceType } from '@/Interfaces'; +import type { N8nInstanceType } from '@/interfaces'; const nanoid = customAlphabet(ALPHABET, 16); diff --git a/packages/cli/src/Db.ts b/packages/cli/src/db.ts similarity index 100% rename from packages/cli/src/Db.ts rename to packages/cli/src/db.ts diff --git a/packages/cli/src/decorators/controller.registry.ts b/packages/cli/src/decorators/controller.registry.ts index 6ab4e9191d..a550bef6ea 100644 --- a/packages/cli/src/decorators/controller.registry.ts +++ b/packages/cli/src/decorators/controller.registry.ts @@ -6,7 +6,7 @@ import { rateLimit as expressRateLimit } from 'express-rate-limit'; import { AuthService } from '@/auth/auth.service'; import { UnauthenticatedError } from '@/errors/response-errors/unauthenticated.error'; import { inProduction, RESPONSE_ERROR_MESSAGES } from '@/constants'; -import type { BooleanLicenseFeature } from '@/Interfaces'; +import type { BooleanLicenseFeature } from '@/interfaces'; import { License } from '@/license'; import type { AuthenticatedRequest } from '@/requests'; import { send } from '@/response-helper'; // TODO: move `ResponseHelper.send` to this file diff --git a/packages/cli/src/decorators/licensed.ts b/packages/cli/src/decorators/licensed.ts index 36d3e5a46b..10936562eb 100644 --- a/packages/cli/src/decorators/licensed.ts +++ b/packages/cli/src/decorators/licensed.ts @@ -1,4 +1,4 @@ -import type { BooleanLicenseFeature } from '@/Interfaces'; +import type { BooleanLicenseFeature } from '@/interfaces'; import { getRouteMetadata } from './controller.registry'; import type { Controller } from './types'; diff --git a/packages/cli/src/decorators/types.ts b/packages/cli/src/decorators/types.ts index 2acc2ae01e..da531599a2 100644 --- a/packages/cli/src/decorators/types.ts +++ b/packages/cli/src/decorators/types.ts @@ -1,6 +1,6 @@ import type { RequestHandler } from 'express'; import type { Class } from 'n8n-core'; -import type { BooleanLicenseFeature } from '@/Interfaces'; +import type { BooleanLicenseFeature } from '@/interfaces'; import type { Scope } from '@n8n/permissions'; export type Method = 'get' | 'post' | 'put' | 'patch' | 'delete'; diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts b/packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts index dc5ddfbedb..a97e3e5b21 100644 --- a/packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts +++ b/packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts @@ -1,6 +1,9 @@ import { mock } from 'jest-mock-extended'; import { SourceControlGitService } from '../source-control-git.service.ee'; import { simpleGit } from 'simple-git'; +import type { SimpleGit } from 'simple-git'; +import type { User } from '@/databases/entities/user'; +import type { SourceControlPreferences } from '../types/source-control-preferences'; const MOCK_BRANCHES = { all: ['origin/master', 'origin/feature/branch'], @@ -32,4 +35,36 @@ describe('SourceControlGitService', () => { expect(branches.branches).toEqual(['master', 'feature/branch']); }); }); + + describe('initRepository', () => { + describe('when local repo is set up after remote is ready', () => { + it('should track remote', async () => { + /** + * Arrange + */ + const gitService = new SourceControlGitService(mock(), mock(), mock()); + const prefs = mock({ branchName: 'main' }); + const user = mock(); + const git = mock(); + const checkoutSpy = jest.spyOn(git, 'checkout'); + const branchSpy = jest.spyOn(git, 'branch'); + gitService.git = git; + jest.spyOn(gitService, 'setGitSshCommand').mockResolvedValue(); + jest + .spyOn(gitService, 'getBranches') + .mockResolvedValue({ currentBranch: '', branches: ['main'] }); + + /** + * Act + */ + await gitService.initRepository(prefs, user); + + /** + * Assert + */ + expect(checkoutSpy).toHaveBeenCalledWith('main'); + expect(branchSpy).toHaveBeenCalledWith(['--set-upstream-to=origin/main', 'main']); + }); + }); + }); }); diff --git a/packages/cli/src/environments/source-control/__tests__/sourceControlGit.service.test.ts b/packages/cli/src/environments/source-control/__tests__/sourceControlGit.service.test.ts deleted file mode 100644 index 519aef188b..0000000000 --- a/packages/cli/src/environments/source-control/__tests__/sourceControlGit.service.test.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { SourceControlGitService } from '@/environments/source-control/source-control-git.service.ee'; -import { mock } from 'jest-mock-extended'; -import type { SourceControlPreferences } from '@/environments/source-control/types/source-control-preferences'; -import type { User } from '@/databases/entities/User'; -import type { SimpleGit } from 'simple-git'; - -describe('GitService', () => { - describe('initRepository', () => { - describe('when local repo is set up after remote is ready', () => { - it('should track remote', async () => { - /** - * Arrange - */ - const gitService = new SourceControlGitService(mock(), mock(), mock()); - const prefs = mock({ branchName: 'main' }); - const user = mock(); - const git = mock(); - const checkoutSpy = jest.spyOn(git, 'checkout'); - const branchSpy = jest.spyOn(git, 'branch'); - gitService.git = git; - jest.spyOn(gitService, 'setGitSshCommand').mockResolvedValue(); - jest - .spyOn(gitService, 'getBranches') - .mockResolvedValue({ currentBranch: '', branches: ['main'] }); - - /** - * Act - */ - await gitService.initRepository(prefs, user); - - /** - * Assert - */ - expect(checkoutSpy).toHaveBeenCalledWith('main'); - expect(branchSpy).toHaveBeenCalledWith(['--set-upstream-to=origin/main', 'main']); - }); - }); - }); -}); diff --git a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts b/packages/cli/src/environments/source-control/source-control-git.service.ee.ts index 4180725410..a2201e3ad0 100644 --- a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control-git.service.ee.ts @@ -19,7 +19,7 @@ import { SOURCE_CONTROL_ORIGIN, } from './constants'; import { sourceControlFoldersExistCheck } from './source-control-helper.ee'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { Logger } from '@/logger'; import { ApplicationError } from 'n8n-workflow'; import { OwnershipService } from '@/services/ownership.service'; diff --git a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts index 6ab7ab09b3..44d3de3ccb 100644 --- a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control-import.service.ee.ts @@ -11,9 +11,9 @@ import glob from 'fast-glob'; import { ApplicationError, jsonParse, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import { readFile as fsReadFile } from 'fs/promises'; import { Credentials, InstanceSettings } from 'n8n-core'; -import type { IWorkflowToImport } from '@/Interfaces'; +import type { IWorkflowToImport } from '@/interfaces'; import type { ExportableCredential } from './types/exportable-credential'; -import type { Variables } from '@/databases/entities/Variables'; +import type { Variables } from '@/databases/entities/variables'; import { SharedCredentials } from '@/databases/entities/shared-credentials'; import type { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping'; import type { TagEntity } from '@/databases/entities/tag-entity'; diff --git a/packages/cli/src/environments/source-control/source-control.service.ee.ts b/packages/cli/src/environments/source-control/source-control.service.ee.ts index a236f9b363..add002935a 100644 --- a/packages/cli/src/environments/source-control/source-control.service.ee.ts +++ b/packages/cli/src/environments/source-control/source-control.service.ee.ts @@ -24,10 +24,10 @@ import type { SourceControlledFile } from './types/source-controlled-file'; import { SourceControlPreferencesService } from './source-control-preferences.service.ee'; import { writeFileSync } from 'fs'; import { SourceControlImportService } from './source-control-import.service.ee'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { SourceControlGetStatus } from './types/source-control-get-status'; import type { TagEntity } from '@/databases/entities/tag-entity'; -import type { Variables } from '@/databases/entities/Variables'; +import type { Variables } from '@/databases/entities/variables'; import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id'; import type { ExportableCredential } from './types/exportable-credential'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments/variables/variables.service.ee.ts index de4d811fa0..ad7b3cba9b 100644 --- a/packages/cli/src/environments/variables/variables.service.ee.ts +++ b/packages/cli/src/environments/variables/variables.service.ee.ts @@ -1,5 +1,5 @@ import { Container, Service } from 'typedi'; -import type { Variables } from '@/databases/entities/Variables'; +import type { Variables } from '@/databases/entities/variables'; import { generateNanoId } from '@/databases/utils/generators'; import { canCreateNewVariable } from './environment-helpers'; import { CacheService } from '@/services/cache/cache.service'; diff --git a/packages/cli/src/errors/workflow-missing-id.error.ts b/packages/cli/src/errors/workflow-missing-id.error.ts index 469ee6f4f0..eaeba5452f 100644 --- a/packages/cli/src/errors/workflow-missing-id.error.ts +++ b/packages/cli/src/errors/workflow-missing-id.error.ts @@ -1,4 +1,4 @@ -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import type { Workflow } from 'n8n-workflow'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/eventbus/eventBus.controller.ts b/packages/cli/src/eventbus/event-bus.controller.ts similarity index 100% rename from packages/cli/src/eventbus/eventBus.controller.ts rename to packages/cli/src/eventbus/event-bus.controller.ts diff --git a/packages/cli/src/eventbus/event-message-classes/event-message-workflow.ts b/packages/cli/src/eventbus/event-message-classes/event-message-workflow.ts index 22c0fc6b51..e4662e0ffc 100644 --- a/packages/cli/src/eventbus/event-message-classes/event-message-workflow.ts +++ b/packages/cli/src/eventbus/event-message-classes/event-message-workflow.ts @@ -3,7 +3,7 @@ import type { IWorkflowBase, JsonObject } from 'n8n-workflow'; import { EventMessageTypeNames } from 'n8n-workflow'; import type { AbstractEventMessageOptions } from './abstract-event-message-options'; import type { AbstractEventPayload } from './abstract-event-payload'; -import type { IExecutionBase } from '@/Interfaces'; +import type { IExecutionBase } from '@/interfaces'; import type { EventNamesWorkflowType } from '.'; // -------------------------------------- diff --git a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts index 3a30738e63..99995f6d21 100644 --- a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts +++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts @@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended'; import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay'; import { EventService } from '@/events/event.service'; import type { INode, IRun, IWorkflowBase } from 'n8n-workflow'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import type { RelayEventMap } from '@/events/relay-event-map'; diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts index 4c3c1de4b5..93d134b5e4 100644 --- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts +++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts @@ -3,7 +3,7 @@ import { TelemetryEventRelay } from '@/events/telemetry-event-relay'; import { EventService } from '@/events/event.service'; import config from '@/config'; import type { IWorkflowBase } from 'n8n-workflow'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import type { Telemetry } from '@/telemetry'; import type { License } from '@/license'; import type { GlobalConfig } from '@n8n/config'; diff --git a/packages/cli/src/events/event.service.ts b/packages/cli/src/events/event.service.ts index 8eb6179444..ad2ecdf12f 100644 --- a/packages/cli/src/events/event.service.ts +++ b/packages/cli/src/events/event.service.ts @@ -1,5 +1,5 @@ import { Service } from 'typedi'; -import { TypedEmitter } from '@/TypedEmitter'; +import { TypedEmitter } from '@/typed-emitter'; import type { RelayEventMap } from './relay-event-map'; import type { QueueMetricsEventMap } from './queue-metrics-event-map'; diff --git a/packages/cli/src/events/relay-event-map.ts b/packages/cli/src/events/relay-event-map.ts index 7a2c7c0657..4e4f79c5a9 100644 --- a/packages/cli/src/events/relay-event-map.ts +++ b/packages/cli/src/events/relay-event-map.ts @@ -4,9 +4,9 @@ import type { IRun, IWorkflowBase, } from 'n8n-workflow'; -import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/interfaces'; import type { ProjectRole } from '@/databases/entities/project-relation'; -import type { GlobalRole } from '@/databases/entities/User'; +import type { GlobalRole } from '@/databases/entities/user'; import type { AuthProviderType } from '@/databases/entities/auth-identity'; export type UserLike = { diff --git a/packages/cli/src/events/telemetry-event-relay.ts b/packages/cli/src/events/telemetry-event-relay.ts index e374a4cf7c..1113c76dc3 100644 --- a/packages/cli/src/events/telemetry-event-relay.ts +++ b/packages/cli/src/events/telemetry-event-relay.ts @@ -14,7 +14,7 @@ import { TelemetryHelpers } from 'n8n-workflow'; import { NodeTypes } from '@/node-types'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; -import type { IExecutionTrackProperties } from '@/Interfaces'; +import type { IExecutionTrackProperties } from '@/interfaces'; import { determineFinalExecutionStatus } from '@/execution-lifecycle-hooks/shared/shared-hook-functions'; import { EventRelay } from './event-relay'; import { snakeCase } from 'change-case'; diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts index 5dc7172659..7c58590e35 100644 --- a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts +++ b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts @@ -9,7 +9,7 @@ import { type ITaskData, type IWorkflowBase, } from 'n8n-workflow'; -import type { IExecutionResponse } from '@/Interfaces'; +import type { IExecutionResponse } from '@/interfaces'; mockInstance(Logger); diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts index 2b418c05b1..be8aef4cff 100644 --- a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts +++ b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import type { ExecutionStatus, IRun, IWorkflowBase } from 'n8n-workflow'; -import type { ExecutionPayload, IExecutionDb } from '@/Interfaces'; +import type { ExecutionPayload, IExecutionDb } from '@/interfaces'; import pick from 'lodash/pick'; import { isWorkflowIdValid } from '@/utils'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts index dfdb4099bd..7b2801f779 100644 --- a/packages/cli/src/executions/__tests__/execution.service.test.ts +++ b/packages/cli/src/executions/__tests__/execution.service.test.ts @@ -5,7 +5,7 @@ import { ExecutionService } from '@/executions/execution.service'; import { AbortedExecutionRetryError } from '@/errors/aborted-execution-retry.error'; import { MissingExecutionStopError } from '@/errors/missing-execution-stop.error'; import type { ActiveExecutions } from '@/active-executions'; -import type { IExecutionResponse } from '@/Interfaces'; +import type { IExecutionResponse } from '@/interfaces'; import { ScalingService } from '@/scaling/scaling.service'; import type { WaitTracker } from '@/wait-tracker'; import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts index a3fe0536cc..ba4b79662b 100644 --- a/packages/cli/src/executions/execution-recovery.service.ts +++ b/packages/cli/src/executions/execution-recovery.service.ts @@ -7,7 +7,7 @@ import type { DateTime } from 'luxon'; import type { IRun, ITaskData } from 'n8n-workflow'; import { InstanceSettings } from 'n8n-core'; import type { EventMessageTypes } from '../eventbus/event-message-classes'; -import type { IExecutionResponse } from '@/Interfaces'; +import type { IExecutionResponse } from '@/interfaces'; import { NodeCrashedError } from '@/errors/node-crashed.error'; import { WorkflowCrashedError } from '@/errors/workflow-crashed.error'; import { ARTIFICIAL_TASK_DATA } from '@/constants'; diff --git a/packages/cli/src/executions/execution.service.ee.ts b/packages/cli/src/executions/execution.service.ee.ts index a7e9a51750..bdca53efe9 100644 --- a/packages/cli/src/executions/execution.service.ee.ts +++ b/packages/cli/src/executions/execution.service.ee.ts @@ -1,6 +1,6 @@ import { ExecutionService } from './execution.service'; import type { ExecutionRequest } from './execution.types'; -import type { IExecutionResponse, IExecutionFlattedResponse } from '@/Interfaces'; +import type { IExecutionResponse, IExecutionFlattedResponse } from '@/interfaces'; import { EnterpriseWorkflowService } from '../workflows/workflow.service.ee'; import type { WorkflowWithSharingsAndCredentials } from '@/workflows/workflows.types'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts index 3e34a66475..a546a7f9ee 100644 --- a/packages/cli/src/executions/execution.service.ts +++ b/packages/cli/src/executions/execution.service.ts @@ -22,7 +22,7 @@ import type { IExecutionResponse, IWorkflowDb, IWorkflowExecutionDataProcess, -} from '@/Interfaces'; +} from '@/interfaces'; import { NodeTypes } from '@/node-types'; import type { ExecutionRequest, ExecutionSummaries, StopResult } from './execution.types'; import { WorkflowRunner } from '@/workflow-runner'; @@ -39,7 +39,7 @@ import { QueuedExecutionRetryError } from '@/errors/queued-execution-retry.error import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service'; import { AbortedExecutionRetryError } from '@/errors/aborted-execution-retry.error'; import { License } from '@/license'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; export const schemaGetExecutionsQueryFilter = { diff --git a/packages/cli/src/executions/executions.controller.ts b/packages/cli/src/executions/executions.controller.ts index 23e51efda9..233aea6064 100644 --- a/packages/cli/src/executions/executions.controller.ts +++ b/packages/cli/src/executions/executions.controller.ts @@ -6,7 +6,7 @@ import { License } from '@/license'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { parseRangeQuery } from './parse-range-query.middleware'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { Scope } from '@n8n/permissions'; import { isPositiveInteger } from '@/utils'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts index d85b742e5f..00e0aa0388 100644 --- a/packages/cli/src/external-hooks.ts +++ b/packages/cli/src/external-hooks.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ import { Service } from 'typedi'; -import type { IExternalHooksFileData, IExternalHooksFunctions } from '@/Interfaces'; +import type { IExternalHooksFileData, IExternalHooksFunctions } from '@/interfaces'; import config from '@/config'; import { UserRepository } from '@/databases/repositories/user.repository'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; diff --git a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts b/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts index 28db4a84c2..c0ecdd9128 100644 --- a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts +++ b/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import { Cipher } from 'n8n-core'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; -import type { ExternalSecretsSettings } from '@/Interfaces'; +import type { ExternalSecretsSettings } from '@/interfaces'; import { License } from '@/license'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee'; diff --git a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets/external-secrets-manager.ee.ts index 1dea7bd686..9e5298bb49 100644 --- a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts +++ b/packages/cli/src/external-secrets/external-secrets-manager.ee.ts @@ -3,7 +3,7 @@ import type { ExternalSecretsSettings, SecretsProvider, SecretsProviderSettings, -} from '@/Interfaces'; +} from '@/interfaces'; import { Cipher } from 'n8n-core'; import Container, { Service } from 'typedi'; diff --git a/packages/cli/src/external-secrets/external-secrets-providers.ee.ts b/packages/cli/src/external-secrets/external-secrets-providers.ee.ts index 274a1d69aa..b4e7396fce 100644 --- a/packages/cli/src/external-secrets/external-secrets-providers.ee.ts +++ b/packages/cli/src/external-secrets/external-secrets-providers.ee.ts @@ -1,4 +1,4 @@ -import type { SecretsProvider } from '@/Interfaces'; +import type { SecretsProvider } from '@/interfaces'; import { Service } from 'typedi'; import { InfisicalProvider } from './providers/infisical'; import { VaultProvider } from './providers/vault'; diff --git a/packages/cli/src/external-secrets/external-secrets.service.ee.ts b/packages/cli/src/external-secrets/external-secrets.service.ee.ts index ea9f4ed170..d7ba686361 100644 --- a/packages/cli/src/external-secrets/external-secrets.service.ee.ts +++ b/packages/cli/src/external-secrets/external-secrets.service.ee.ts @@ -1,5 +1,5 @@ import { CREDENTIAL_BLANKING_VALUE } from '@/constants'; -import type { SecretsProvider } from '@/Interfaces'; +import type { SecretsProvider } from '@/interfaces'; import type { ExternalSecretsRequest } from '@/requests'; import type { IDataObject } from 'n8n-workflow'; import { deepCopy } from 'n8n-workflow'; diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts b/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts index a4de7d164c..3a310706dd 100644 --- a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts +++ b/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts @@ -1,7 +1,7 @@ import { AwsSecretsClient } from './aws-secrets-client'; import { UnknownAuthTypeError } from '@/errors/unknown-auth-type.error'; import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants'; -import type { SecretsProvider, SecretsProviderState } from '@/Interfaces'; +import type { SecretsProvider, SecretsProviderState } from '@/interfaces'; import type { INodeProperties } from 'n8n-workflow'; import type { AwsSecretsManagerContext } from './types'; diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/types.ts b/packages/cli/src/external-secrets/providers/aws-secrets/types.ts index dd48377b9e..236a31e61a 100644 --- a/packages/cli/src/external-secrets/providers/aws-secrets/types.ts +++ b/packages/cli/src/external-secrets/providers/aws-secrets/types.ts @@ -1,4 +1,4 @@ -import type { SecretsProviderSettings } from '@/Interfaces'; +import type { SecretsProviderSettings } from '@/interfaces'; export type SecretsNamesPage = { NextToken?: string; diff --git a/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts b/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts index ad272abe54..0060d1900f 100644 --- a/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts +++ b/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts @@ -1,6 +1,6 @@ import { ClientSecretCredential } from '@azure/identity'; import { SecretClient } from '@azure/keyvault-secrets'; -import type { SecretsProvider, SecretsProviderState } from '@/Interfaces'; +import type { SecretsProvider, SecretsProviderState } from '@/interfaces'; import type { INodeProperties } from 'n8n-workflow'; import type { AzureKeyVaultContext } from './types'; import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants'; diff --git a/packages/cli/src/external-secrets/providers/azure-key-vault/types.ts b/packages/cli/src/external-secrets/providers/azure-key-vault/types.ts index cd229a2589..a373017934 100644 --- a/packages/cli/src/external-secrets/providers/azure-key-vault/types.ts +++ b/packages/cli/src/external-secrets/providers/azure-key-vault/types.ts @@ -1,4 +1,4 @@ -import type { SecretsProviderSettings } from '@/Interfaces'; +import type { SecretsProviderSettings } from '@/interfaces'; export type AzureKeyVaultContext = SecretsProviderSettings<{ vaultName: string; diff --git a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts b/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts index ac00245c58..dae760fcc1 100644 --- a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts +++ b/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts @@ -1,6 +1,6 @@ import { SecretManagerServiceClient as GcpClient } from '@google-cloud/secret-manager'; import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants'; -import type { SecretsProvider, SecretsProviderState } from '@/Interfaces'; +import type { SecretsProvider, SecretsProviderState } from '@/interfaces'; import { jsonParse, type INodeProperties } from 'n8n-workflow'; import type { GcpSecretsManagerContext, diff --git a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts b/packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts index c9611df9c4..37ef5dce10 100644 --- a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts +++ b/packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts @@ -1,4 +1,4 @@ -import type { SecretsProviderSettings } from '@/Interfaces'; +import type { SecretsProviderSettings } from '@/interfaces'; type JsonString = string; diff --git a/packages/cli/src/external-secrets/providers/infisical.ts b/packages/cli/src/external-secrets/providers/infisical.ts index d352d59179..7a2a01e712 100644 --- a/packages/cli/src/external-secrets/providers/infisical.ts +++ b/packages/cli/src/external-secrets/providers/infisical.ts @@ -1,4 +1,4 @@ -import type { SecretsProvider, SecretsProviderSettings, SecretsProviderState } from '@/Interfaces'; +import type { SecretsProvider, SecretsProviderSettings, SecretsProviderState } from '@/interfaces'; import InfisicalClient from 'infisical-node'; import { populateClientWorkspaceConfigsHelper } from 'infisical-node/lib/helpers/key'; import { getServiceTokenData } from 'infisical-node/lib/api/serviceTokenData'; diff --git a/packages/cli/src/external-secrets/providers/vault.ts b/packages/cli/src/external-secrets/providers/vault.ts index e69a909481..d0baf6b1e3 100644 --- a/packages/cli/src/external-secrets/providers/vault.ts +++ b/packages/cli/src/external-secrets/providers/vault.ts @@ -1,5 +1,5 @@ -import type { SecretsProviderSettings, SecretsProviderState } from '@/Interfaces'; -import { SecretsProvider } from '@/Interfaces'; +import type { SecretsProviderSettings, SecretsProviderState } from '@/interfaces'; +import { SecretsProvider } from '@/interfaces'; import type { IDataObject, INodeProperties } from 'n8n-workflow'; import type { AxiosInstance, AxiosResponse } from 'axios'; import axios from 'axios'; diff --git a/packages/cli/src/generic-helpers.ts b/packages/cli/src/generic-helpers.ts index f1a10030fd..459af55923 100644 --- a/packages/cli/src/generic-helpers.ts +++ b/packages/cli/src/generic-helpers.ts @@ -2,7 +2,7 @@ import { validate } from 'class-validator'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { TagEntity } from '@/databases/entities/tag-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { UserRoleChangePayload, UserSettingsUpdatePayload, diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/interfaces.ts similarity index 99% rename from packages/cli/src/Interfaces.ts rename to packages/cli/src/interfaces.ts index e047d4391e..68b4483beb 100644 --- a/packages/cli/src/Interfaces.ts +++ b/packages/cli/src/interfaces.ts @@ -34,7 +34,7 @@ import type PCancelable from 'p-cancelable'; import type { AuthProviderType } from '@/databases/entities/auth-identity'; import type { SharedCredentials } from '@/databases/entities/shared-credentials'; import type { TagEntity } from '@/databases/entities/tag-entity'; -import type { AssignableRole, GlobalRole, User } from '@/databases/entities/User'; +import type { AssignableRole, GlobalRole, User } from '@/databases/entities/user'; import type { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import type { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { UserRepository } from '@/databases/repositories/user.repository'; diff --git a/packages/cli/src/ldap/__tests__/helpers.test.ts b/packages/cli/src/ldap/__tests__/helpers.test.ts index 116cbd45ad..4295ac6f6f 100644 --- a/packages/cli/src/ldap/__tests__/helpers.test.ts +++ b/packages/cli/src/ldap/__tests__/helpers.test.ts @@ -2,7 +2,7 @@ import { UserRepository } from '@/databases/repositories/user.repository'; import { mockInstance } from '@test/mocking'; import * as helpers from '@/ldap/helpers.ee'; import { AuthIdentity } from '@/databases/entities/auth-identity'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { generateNanoId } from '@/databases/utils/generators'; const userRepository = mockInstance(UserRepository); diff --git a/packages/cli/src/ldap/helpers.ee.ts b/packages/cli/src/ldap/helpers.ee.ts index 552392d036..d5eec5c5b1 100644 --- a/packages/cli/src/ldap/helpers.ee.ts +++ b/packages/cli/src/ldap/helpers.ee.ts @@ -4,9 +4,9 @@ import { Container } from 'typedi'; import { validate } from 'jsonschema'; import { randomString } from 'n8n-workflow'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import config from '@/config'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { AuthIdentity } from '@/databases/entities/auth-identity'; import type { AuthProviderSyncHistory } from '@/databases/entities/auth-provider-sync-history'; diff --git a/packages/cli/src/ldap/ldap.service.ee.ts b/packages/cli/src/ldap/ldap.service.ee.ts index ffe1426775..7eba59191d 100644 --- a/packages/cli/src/ldap/ldap.service.ee.ts +++ b/packages/cli/src/ldap/ldap.service.ee.ts @@ -8,7 +8,7 @@ import { ApplicationError, jsonParse } from 'n8n-workflow'; import { Cipher } from 'n8n-core'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { RunningMode, SyncStatus } from '@/databases/entities/auth-provider-sync-history'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { Logger } from '@/logger'; diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts index 7b402c0369..ee8bfd0fae 100644 --- a/packages/cli/src/license.ts +++ b/packages/cli/src/license.ts @@ -12,7 +12,7 @@ import { UNLIMITED_LICENSE_QUOTA, } from './constants'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; -import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './Interfaces'; +import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './interfaces'; import type { RedisServicePubSubPublisher } from './services/redis/redis-service-pub-sub-publisher'; import { RedisService } from './services/redis.service'; import { OrchestrationService } from '@/services/orchestration.service'; diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts index b48fd17621..178e8b1bf2 100644 --- a/packages/cli/src/license/license.service.ts +++ b/packages/cli/src/license/license.service.ts @@ -4,7 +4,7 @@ import axios from 'axios'; import { Logger } from '@/logger'; import { License } from '@/license'; import { EventService } from '@/events/event.service'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { UrlService } from '@/services/url.service'; diff --git a/packages/cli/src/middlewares/list-query/__tests__/listQuery.test.ts b/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts similarity index 100% rename from packages/cli/src/middlewares/list-query/__tests__/listQuery.test.ts rename to packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts diff --git a/packages/cli/src/permissions/check-access.ts b/packages/cli/src/permissions/check-access.ts index 7e2825d119..f29a1e95d2 100644 --- a/packages/cli/src/permissions/check-access.ts +++ b/packages/cli/src/permissions/check-access.ts @@ -6,7 +6,7 @@ import { RoleService } from '@/services/role.service'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { Scope } from '@n8n/permissions'; import { ApplicationError } from 'n8n-workflow'; diff --git a/packages/cli/src/posthog/__tests__/PostHog.test.ts b/packages/cli/src/posthog/__tests__/posthog.test.ts similarity index 100% rename from packages/cli/src/posthog/__tests__/PostHog.test.ts rename to packages/cli/src/posthog/__tests__/posthog.test.ts diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts index 1fb688c6d7..63289f8e4b 100644 --- a/packages/cli/src/posthog/index.ts +++ b/packages/cli/src/posthog/index.ts @@ -3,7 +3,7 @@ import type { PostHog } from 'posthog-node'; import type { FeatureFlags, ITelemetryTrackProperties } from 'n8n-workflow'; import { InstanceSettings } from 'n8n-core'; import config from '@/config'; -import type { PublicUser } from '@/Interfaces'; +import type { PublicUser } from '@/interfaces'; @Service() export class PostHogClient { diff --git a/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts index 5f0502aa11..11bcbd9c54 100644 --- a/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts +++ b/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts @@ -5,11 +5,11 @@ import type { INodeProperties, INodePropertyOptions, } from 'n8n-workflow'; -import * as Db from '@/Db'; -import type { ICredentialsDb } from '@/Interfaces'; +import * as Db from '@/db'; +import type { ICredentialsDb } from '@/interfaces'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { SharedCredentials } from '@/databases/entities/shared-credentials'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ExternalHooks } from '@/external-hooks'; import type { IDependency, IJsonSchema } from '../../../types'; import type { CredentialRequest } from '@/requests'; diff --git a/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts b/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts index 8c3f61c376..263224e4d1 100644 --- a/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts +++ b/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import { UserRepository } from '@/databases/repositories/user.repository'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import pick from 'lodash/pick'; import { validate as uuidValidate } from 'uuid'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts index 388f9b6797..c16c362d0f 100644 --- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts +++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; -import * as Db from '@/Db'; -import type { User } from '@/databases/entities/User'; +import * as Db from '@/db'; +import type { User } from '@/databases/entities/user'; import { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping'; import { SharedWorkflow, type WorkflowSharingRole } from '@/databases/entities/shared-workflow'; diff --git a/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts index 1b70b9770d..dcba76ec55 100644 --- a/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts +++ b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts @@ -9,7 +9,7 @@ import type { PaginatedRequest } from '../../../types'; import { decodeCursor } from '../services/pagination.service'; import type { Scope } from '@n8n/permissions'; import { userHasScope } from '@/permissions/check-access'; -import type { BooleanLicenseFeature } from '@/Interfaces'; +import type { BooleanLicenseFeature } from '@/interfaces'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; const UNLIMITED_USERS_QUOTA = -1; diff --git a/packages/cli/src/push/__tests__/index.test.ts b/packages/cli/src/push/__tests__/index.test.ts index 2a7caab8b8..02bc428fdb 100644 --- a/packages/cli/src/push/__tests__/index.test.ts +++ b/packages/cli/src/push/__tests__/index.test.ts @@ -2,7 +2,7 @@ import type { WebSocket } from 'ws'; import { mock } from 'jest-mock-extended'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { Push } from '@/push'; import { SSEPush } from '@/push/sse.push'; import { WebSocketPush } from '@/push/websocket.push'; diff --git a/packages/cli/src/push/__tests__/websocket.push.test.ts b/packages/cli/src/push/__tests__/websocket.push.test.ts index 81d4fda0fb..b1202b3a13 100644 --- a/packages/cli/src/push/__tests__/websocket.push.test.ts +++ b/packages/cli/src/push/__tests__/websocket.push.test.ts @@ -4,7 +4,7 @@ import type WebSocket from 'ws'; import { WebSocketPush } from '@/push/websocket.push'; import { Logger } from '@/logger'; -import type { PushDataExecutionRecovered } from '@/Interfaces'; +import type { PushDataExecutionRecovered } from '@/interfaces'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts index 67beb7f30a..8859540330 100644 --- a/packages/cli/src/push/abstract.push.ts +++ b/packages/cli/src/push/abstract.push.ts @@ -1,5 +1,5 @@ import { assert, jsonStringify } from 'n8n-workflow'; -import type { IPushDataType } from '@/Interfaces'; +import type { IPushDataType } from '@/interfaces'; import type { Logger } from '@/logger'; /** diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts index 2336862eb7..defe070196 100644 --- a/packages/cli/src/push/index.ts +++ b/packages/cli/src/push/index.ts @@ -10,13 +10,13 @@ import config from '@/config'; import { OnShutdown } from '@/decorators/on-shutdown'; import { AuthService } from '@/auth/auth.service'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; -import type { IPushDataType } from '@/Interfaces'; +import type { IPushDataType } from '@/interfaces'; import { OrchestrationService } from '@/services/orchestration.service'; import { SSEPush } from './sse.push'; import { WebSocketPush } from './websocket.push'; import type { PushResponse, SSEPushRequest, WebSocketPushRequest } from './types'; -import { TypedEmitter } from '@/TypedEmitter'; +import { TypedEmitter } from '@/typed-emitter'; type PushEvents = { editorUiConnected: string; diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts index e293fcf932..6340cf8b53 100644 --- a/packages/cli/src/requests.ts +++ b/packages/cli/src/requests.ts @@ -15,10 +15,10 @@ import type { import { Expose } from 'class-transformer'; import { IsBoolean, IsEmail, IsIn, IsOptional, IsString, Length } from 'class-validator'; import { NoXss } from '@/validators/no-xss.validator'; -import type { PublicUser, SecretsProvider, SecretsProviderState } from '@/Interfaces'; -import { AssignableRole } from '@/databases/entities/User'; -import type { GlobalRole, User } from '@/databases/entities/User'; -import type { Variables } from '@/databases/entities/Variables'; +import type { PublicUser, SecretsProvider, SecretsProviderState } from '@/interfaces'; +import { AssignableRole } from '@/databases/entities/user'; +import type { GlobalRole, User } from '@/databases/entities/user'; +import type { Variables } from '@/databases/entities/variables'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import type { WorkflowHistory } from '@/databases/entities/workflow-history'; diff --git a/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts index 57867d0150..109879c12a 100644 --- a/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts @@ -12,7 +12,7 @@ import { } from '@/security-audit/constants'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { Risk, RiskReporter } from '@/security-audit/types'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; import { GlobalConfig } from '@n8n/config'; @Service() diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts index c90c913ab0..29e60d3776 100644 --- a/packages/cli/src/server.ts +++ b/packages/cli/src/server.ts @@ -23,7 +23,7 @@ import { import type { APIRequest } from '@/requests'; import { ControllerRegistry } from '@/decorators'; import { isApiEnabled, loadPublicApiVersions } from '@/public-api'; -import type { ICredentialsOverwrite } from '@/Interfaces'; +import type { ICredentialsOverwrite } from '@/interfaces'; import { CredentialsOverwrites } from '@/credentials-overwrites'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import * as ResponseHelper from '@/response-helper'; @@ -59,7 +59,7 @@ import '@/controllers/users.controller'; import '@/controllers/user-settings.controller'; import '@/controllers/workflow-statistics.controller'; import '@/credentials/credentials.controller'; -import '@/eventbus/eventBus.controller'; +import '@/eventbus/event-bus.controller'; import '@/executions/executions.controller'; import '@/external-secrets/external-secrets.controller.ee'; import '@/license/license.controller'; diff --git a/packages/cli/src/services/__tests__/active-workflows.service.test.ts b/packages/cli/src/services/__tests__/active-workflows.service.test.ts index 4d6b34728b..8fa36b808a 100644 --- a/packages/cli/src/services/__tests__/active-workflows.service.test.ts +++ b/packages/cli/src/services/__tests__/active-workflows.service.test.ts @@ -1,5 +1,5 @@ import type { ActivationErrorsService } from '@/activation-errors.service'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ActiveWorkflowsService } from '@/services/active-workflows.service'; diff --git a/packages/cli/src/services/__tests__/community-packages.service.test.ts b/packages/cli/src/services/__tests__/community-packages.service.test.ts index 99dfeb70c1..f30ff372a6 100644 --- a/packages/cli/src/services/__tests__/community-packages.service.test.ts +++ b/packages/cli/src/services/__tests__/community-packages.service.test.ts @@ -14,8 +14,8 @@ import { RESPONSE_ERROR_MESSAGES, } from '@/constants'; import { InstalledPackages } from '@/databases/entities/installed-packages'; -import type { CommunityPackages } from '@/Interfaces'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import type { CommunityPackages } from '@/interfaces'; +import { CommunityPackagesService } from '@/services/community-packages.service'; import { InstalledNodesRepository } from '@/databases/repositories/installed-nodes.repository'; import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository'; import { InstalledNodes } from '@/databases/entities/installed-nodes'; diff --git a/packages/cli/src/services/__tests__/hooks.service.test.ts b/packages/cli/src/services/__tests__/hooks.service.test.ts index 6d8c03a852..76bade8474 100644 --- a/packages/cli/src/services/__tests__/hooks.service.test.ts +++ b/packages/cli/src/services/__tests__/hooks.service.test.ts @@ -9,7 +9,7 @@ import type { WorkflowRepository } from '@/databases/repositories/workflow.repos import type { AuthService } from '@/auth/auth.service'; import type { UserService } from '@/services/user.service'; import { HooksService } from '@/services/hooks.service'; -import type { Invitation } from '@/Interfaces'; +import type { Invitation } from '@/interfaces'; import type { AuthenticatedRequest } from '@/requests'; import type { AuthUserRepository } from '@/databases/repositories/auth-user.repository'; import RudderStack from '@rudderstack/rudder-sdk-node'; diff --git a/packages/cli/src/services/__tests__/ownership.service.test.ts b/packages/cli/src/services/__tests__/ownership.service.test.ts index 55998f4c7e..18061a4027 100644 --- a/packages/cli/src/services/__tests__/ownership.service.test.ts +++ b/packages/cli/src/services/__tests__/ownership.service.test.ts @@ -1,7 +1,7 @@ import { OwnershipService } from '@/services/ownership.service'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { SharedWorkflow } from '@/databases/entities/shared-workflow'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import type { SharedCredentials } from '@/databases/entities/shared-credentials'; import { mockInstance } from '@test/mocking'; import { WorkflowEntity } from '@/databases/entities/workflow-entity'; diff --git a/packages/cli/src/services/__tests__/user.service.test.ts b/packages/cli/src/services/__tests__/user.service.test.ts index af9723cf69..d2da4aac45 100644 --- a/packages/cli/src/services/__tests__/user.service.test.ts +++ b/packages/cli/src/services/__tests__/user.service.test.ts @@ -1,7 +1,7 @@ import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { UserService } from '@/services/user.service'; import { UrlService } from '@/services/url.service'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts index 910dbb8fac..34c8743b73 100644 --- a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts +++ b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts @@ -11,7 +11,7 @@ import { mocked } from 'jest-mock'; import { mock } from 'jest-mock-extended'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { WorkflowStatistics } from '@/databases/entities/workflow-statistics'; import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository'; import { WorkflowStatisticsService } from '@/services/workflow-statistics.service'; diff --git a/packages/cli/src/services/active-workflows.service.ts b/packages/cli/src/services/active-workflows.service.ts index e65ec1e434..6c6671faad 100644 --- a/packages/cli/src/services/active-workflows.service.ts +++ b/packages/cli/src/services/active-workflows.service.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ActivationErrorsService } from '@/activation-errors.service'; diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts index eaa58c32f0..04d019530e 100644 --- a/packages/cli/src/services/cache/cache.service.ts +++ b/packages/cli/src/services/cache/cache.service.ts @@ -12,7 +12,7 @@ import type { Hash, } from '@/services/cache/cache.types'; import { TIME } from '@/constants'; -import { TypedEmitter } from '@/TypedEmitter'; +import { TypedEmitter } from '@/typed-emitter'; import { GlobalConfig } from '@n8n/config'; type CacheEvents = { diff --git a/packages/cli/src/services/communityPackages.service.ts b/packages/cli/src/services/community-packages.service.ts similarity index 99% rename from packages/cli/src/services/communityPackages.service.ts rename to packages/cli/src/services/community-packages.service.ts index 2718454d4c..828179bb28 100644 --- a/packages/cli/src/services/communityPackages.service.ts +++ b/packages/cli/src/services/community-packages.service.ts @@ -22,7 +22,7 @@ import { UNKNOWN_FAILURE_REASON, } from '@/constants'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; -import type { CommunityPackages } from '@/Interfaces'; +import type { CommunityPackages } from '@/interfaces'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { Logger } from '@/logger'; import { OrchestrationService } from './orchestration.service'; diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts index 1ed47f98ae..6337066c5f 100644 --- a/packages/cli/src/services/credentials-tester.service.ts +++ b/packages/cli/src/services/credentials-tester.service.ts @@ -35,7 +35,7 @@ import { } from 'n8n-workflow'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { NodeTypes } from '@/node-types'; import { CredentialTypes } from '@/credential-types'; import { RESPONSE_ERROR_MESSAGES } from '../constants'; diff --git a/packages/cli/src/services/cta.service.ts b/packages/cli/src/services/cta.service.ts index 6319cc7550..6aee3aad57 100644 --- a/packages/cli/src/services/cta.service.ts +++ b/packages/cli/src/services/cta.service.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; @Service() export class CtaService { diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts index 34466adae8..97406cca94 100644 --- a/packages/cli/src/services/frontend.service.ts +++ b/packages/cli/src/services/frontend.service.ts @@ -28,7 +28,7 @@ import { getWorkflowHistoryPruneTime, } from '@/workflows/workflow-history/workflow-history-helper.ee'; import { UserManagementMailer } from '@/user-management/email'; -import type { CommunityPackagesService } from '@/services/communityPackages.service'; +import type { CommunityPackagesService } from '@/services/community-packages.service'; import { Logger } from '@/logger'; import { UrlService } from './url.service'; import { EventService } from '@/events/event.service'; @@ -58,7 +58,7 @@ export class FrontendService { this.initSettings(); if (this.globalConfig.nodes.communityPackages.enabled) { - void import('@/services/communityPackages.service').then(({ CommunityPackagesService }) => { + void import('@/services/community-packages.service').then(({ CommunityPackagesService }) => { this.communityPackagesService = Container.get(CommunityPackagesService); }); } diff --git a/packages/cli/src/services/hooks.service.ts b/packages/cli/src/services/hooks.service.ts index 0cefeb9b57..69493c53c5 100644 --- a/packages/cli/src/services/hooks.service.ts +++ b/packages/cli/src/services/hooks.service.ts @@ -6,7 +6,7 @@ import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typ import { AuthService } from '@/auth/auth.service'; import type { AuthUser } from '@/databases/entities/auth-user'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; @@ -17,7 +17,7 @@ import { AuthUserRepository } from '@/databases/repositories/auth-user.repositor import type { Settings } from '@/databases/entities/settings'; import { UserService } from '@/services/user.service'; import type { AuthenticatedRequest } from '@/requests'; -import type { Invitation } from '@/Interfaces'; +import type { Invitation } from '@/interfaces'; import RudderStack, { type constructorOptions } from '@rudderstack/rudder-sdk-node'; /** diff --git a/packages/cli/src/services/import.service.ts b/packages/cli/src/services/import.service.ts index 992db5b75e..c295fd45e2 100644 --- a/packages/cli/src/services/import.service.ts +++ b/packages/cli/src/services/import.service.ts @@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid'; import { type INode, type INodeCredentialsDetails } from 'n8n-workflow'; import { Logger } from '@/logger'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { TagRepository } from '@/databases/repositories/tag.repository'; import { SharedWorkflow } from '@/databases/entities/shared-workflow'; @@ -12,7 +12,7 @@ import { Project } from '@/databases/entities/project'; import { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping'; import type { TagEntity } from '@/databases/entities/tag-entity'; -import type { ICredentialsDb } from '@/Interfaces'; +import type { ICredentialsDb } from '@/interfaces'; @Service() export class ImportService { diff --git a/packages/cli/src/services/orchestration/main/handle-command-message-main.ts b/packages/cli/src/services/orchestration/main/handle-command-message-main.ts index 266304ff30..9ea171b062 100644 --- a/packages/cli/src/services/orchestration/main/handle-command-message-main.ts +++ b/packages/cli/src/services/orchestration/main/handle-command-message-main.ts @@ -10,7 +10,7 @@ import { Push } from '@/push'; import { TestWebhooks } from '@/webhooks/test-webhooks'; import { OrchestrationService } from '@/services/orchestration.service'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; // eslint-disable-next-line complexity export async function handleCommandMessageMain(messageString: string) { diff --git a/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts b/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts index 19485bc0cb..3e1098350b 100644 --- a/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts +++ b/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts @@ -6,7 +6,7 @@ import { ErrorReporterProxy as EventReporter } from 'n8n-workflow'; import { Logger } from '@/logger'; import { RedisServicePubSubPublisher } from '@/services/redis/redis-service-pub-sub-publisher'; import { RedisClientService } from '@/services/redis/redis-client.service'; -import { TypedEmitter } from '@/TypedEmitter'; +import { TypedEmitter } from '@/typed-emitter'; type MultiMainEvents = { 'leader-stepdown': never; diff --git a/packages/cli/src/services/orchestration/pubsub/pubsub-message-map.ts b/packages/cli/src/services/orchestration/pubsub/pubsub-message-map.ts index d379bc93c0..177b8ad9ac 100644 --- a/packages/cli/src/services/orchestration/pubsub/pubsub-message-map.ts +++ b/packages/cli/src/services/orchestration/pubsub/pubsub-message-map.ts @@ -1,4 +1,4 @@ -import type { IPushDataType, IWorkflowDb } from '@/Interfaces'; +import type { IPushDataType, IWorkflowDb } from '@/interfaces'; import type { RunningJobSummary } from '@/scaling/scaling.types'; export type PubSubMessageMap = { diff --git a/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts b/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts index 7f01017e72..9a5b9b739a 100644 --- a/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts +++ b/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts @@ -5,7 +5,7 @@ import Container from 'typedi'; import { Logger } from 'winston'; import { messageToRedisServiceCommandObject, debounceMessageReceiver } from '../helpers'; import config from '@/config'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; export async function handleCommandMessageWebhook(messageString: string) { const queueModeId = config.getEnv('redis.queueModeId'); diff --git a/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts b/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts index 38696bfec5..8b680068a6 100644 --- a/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts +++ b/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts @@ -10,7 +10,7 @@ import { debounceMessageReceiver, getOsCpuString } from '../helpers'; import type { WorkerCommandReceivedHandlerOptions } from './types'; import { Logger } from '@/logger'; import { N8N_VERSION } from '@/constants'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; export function getWorkerCommandReceivedHandler(options: WorkerCommandReceivedHandlerOptions) { // eslint-disable-next-line complexity diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts index 5ae757f784..dd4fb3acfe 100644 --- a/packages/cli/src/services/ownership.service.ts +++ b/packages/cli/src/services/ownership.service.ts @@ -5,7 +5,7 @@ import { UserRepository } from '@/databases/repositories/user.repository'; import type { ListQuery } from '@/requests'; import type { Project } from '@/databases/entities/project'; import { ProjectRepository } from '@/databases/repositories/project.repository'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; @Service() diff --git a/packages/cli/src/services/project.service.ts b/packages/cli/src/services/project.service.ts index 5c588682ea..795311bacc 100644 --- a/packages/cli/src/services/project.service.ts +++ b/packages/cli/src/services/project.service.ts @@ -1,7 +1,7 @@ import { Project, type ProjectType } from '@/databases/entities/project'; import { ProjectRelation } from '@/databases/entities/project-relation'; import type { ProjectRole } from '@/databases/entities/project-relation'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import diff --git a/packages/cli/src/services/redis/redis-service-commands.ts b/packages/cli/src/services/redis/redis-service-commands.ts index b7786adad3..054cec3b44 100644 --- a/packages/cli/src/services/redis/redis-service-commands.ts +++ b/packages/cli/src/services/redis/redis-service-commands.ts @@ -1,4 +1,4 @@ -import type { IPushDataType, IPushDataWorkerStatusPayload, IWorkflowDb } from '@/Interfaces'; +import type { IPushDataType, IPushDataWorkerStatusPayload, IWorkflowDb } from '@/interfaces'; export type RedisServiceCommand = | 'getStatus' diff --git a/packages/cli/src/services/role.service.ts b/packages/cli/src/services/role.service.ts index e4f43e1929..6d5e857520 100644 --- a/packages/cli/src/services/role.service.ts +++ b/packages/cli/src/services/role.service.ts @@ -4,7 +4,7 @@ import type { SharedCredentials, } from '@/databases/entities/shared-credentials'; import type { SharedWorkflow, WorkflowSharingRole } from '@/databases/entities/shared-workflow'; -import type { GlobalRole, User } from '@/databases/entities/User'; +import type { GlobalRole, User } from '@/databases/entities/user'; import { GLOBAL_ADMIN_SCOPES, GLOBAL_MEMBER_SCOPES, diff --git a/packages/cli/src/services/tag.service.ts b/packages/cli/src/services/tag.service.ts index 683b7e56ae..2ddd3dd899 100644 --- a/packages/cli/src/services/tag.service.ts +++ b/packages/cli/src/services/tag.service.ts @@ -1,7 +1,7 @@ import { TagRepository } from '@/databases/repositories/tag.repository'; import { Service } from 'typedi'; import { validateEntity } from '@/generic-helpers'; -import type { ITagWithCountDb } from '@/Interfaces'; +import type { ITagWithCountDb } from '@/interfaces'; import type { TagEntity } from '@/databases/entities/tag-entity'; import { ExternalHooks } from '@/external-hooks'; diff --git a/packages/cli/src/services/user-onboarding.service.ts b/packages/cli/src/services/user-onboarding.service.ts index 91b37f9304..ff929e93da 100644 --- a/packages/cli/src/services/user-onboarding.service.ts +++ b/packages/cli/src/services/user-onboarding.service.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In } from '@n8n/typeorm'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { UserService } from '@/services/user.service'; diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts index ea18576f76..17d3b40b07 100644 --- a/packages/cli/src/services/user.service.ts +++ b/packages/cli/src/services/user.service.ts @@ -2,9 +2,9 @@ import { Service } from 'typedi'; import type { IUserSettings } from 'n8n-workflow'; import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; -import type { User, AssignableRole } from '@/databases/entities/User'; +import type { User, AssignableRole } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; -import type { Invitation, PublicUser } from '@/Interfaces'; +import type { Invitation, PublicUser } from '@/interfaces'; import type { PostHogClient } from '@/posthog'; import { Logger } from '@/logger'; import { UserManagementMailer } from '@/user-management/email'; diff --git a/packages/cli/src/services/workflow-statistics.service.ts b/packages/cli/src/services/workflow-statistics.service.ts index 37da22d757..fa01dabcfd 100644 --- a/packages/cli/src/services/workflow-statistics.service.ts +++ b/packages/cli/src/services/workflow-statistics.service.ts @@ -5,7 +5,7 @@ import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow- import { UserService } from '@/services/user.service'; import { Logger } from '@/logger'; import { OwnershipService } from './ownership.service'; -import { TypedEmitter } from '@/TypedEmitter'; +import { TypedEmitter } from '@/typed-emitter'; import { EventService } from '@/events/event.service'; type WorkflowStatisticsEvents = { diff --git a/packages/cli/src/shutdown/__tests__/Shutdown.service.test.ts b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts similarity index 100% rename from packages/cli/src/shutdown/__tests__/Shutdown.service.test.ts rename to packages/cli/src/shutdown/__tests__/shutdown.service.test.ts diff --git a/packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts b/packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts similarity index 97% rename from packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts rename to packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts index e00d4b7d34..c1ea30993a 100644 --- a/packages/cli/src/sso/saml/__tests__/samlHelpers.test.ts +++ b/packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts @@ -1,4 +1,4 @@ -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { generateNanoId } from '@/databases/utils/generators'; import * as helpers from '@/sso/saml/saml-helpers'; import type { SamlUserAttributes } from '@/sso/saml/types/saml-user-attributes'; diff --git a/packages/cli/src/sso/saml/saml-helpers.ts b/packages/cli/src/sso/saml/saml-helpers.ts index ecd8104c54..b6150343cf 100644 --- a/packages/cli/src/sso/saml/saml-helpers.ts +++ b/packages/cli/src/sso/saml/saml-helpers.ts @@ -4,7 +4,7 @@ import { randomString } from 'n8n-workflow'; import config from '@/config'; import { AuthIdentity } from '@/databases/entities/auth-identity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts index 23045ad66f..8fd63c2c1b 100644 --- a/packages/cli/src/sso/saml/saml.service.ee.ts +++ b/packages/cli/src/sso/saml/saml.service.ee.ts @@ -1,6 +1,6 @@ import type express from 'express'; import Container, { Service } from 'typedi'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ApplicationError, jsonParse } from 'n8n-workflow'; import { getServiceProviderInstance } from './service-provider.ee'; import type { SamlUserAttributes } from './types/saml-user-attributes'; diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index 3e89c529e8..8aeede7968 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -6,7 +6,7 @@ import type { ITelemetryTrackProperties } from 'n8n-workflow'; import { InstanceSettings } from 'n8n-core'; import config from '@/config'; -import type { IExecutionTrackProperties } from '@/Interfaces'; +import type { IExecutionTrackProperties } from '@/interfaces'; import { Logger } from '@/logger'; import { License } from '@/license'; import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants'; diff --git a/packages/cli/src/TypedEmitter.ts b/packages/cli/src/typed-emitter.ts similarity index 100% rename from packages/cli/src/TypedEmitter.ts rename to packages/cli/src/typed-emitter.ts diff --git a/packages/cli/src/user-management/email/__tests__/user-management-mailer.test.ts b/packages/cli/src/user-management/email/__tests__/user-management-mailer.test.ts index b08a8569e1..77529d6808 100644 --- a/packages/cli/src/user-management/email/__tests__/user-management-mailer.test.ts +++ b/packages/cli/src/user-management/email/__tests__/user-management-mailer.test.ts @@ -1,8 +1,8 @@ import type { GlobalConfig } from '@n8n/config'; import { mock } from 'jest-mock-extended'; +import type { InviteEmailData, PasswordResetData } from '@/user-management/email/interfaces'; import type { UrlService } from '@/services/url.service'; -import type { InviteEmailData, PasswordResetData } from '@/user-management/email/Interfaces'; import { NodeMailer } from '@/user-management/email/node-mailer'; import { UserManagementMailer } from '@/user-management/email/user-management-mailer'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/user-management/email/Interfaces.ts b/packages/cli/src/user-management/email/interfaces.ts similarity index 100% rename from packages/cli/src/user-management/email/Interfaces.ts rename to packages/cli/src/user-management/email/interfaces.ts diff --git a/packages/cli/src/user-management/email/node-mailer.ts b/packages/cli/src/user-management/email/node-mailer.ts index 8964ccc8e7..e172699d05 100644 --- a/packages/cli/src/user-management/email/node-mailer.ts +++ b/packages/cli/src/user-management/email/node-mailer.ts @@ -8,7 +8,7 @@ import { GlobalConfig } from '@n8n/config'; import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import { Logger } from '@/logger'; -import type { MailData, SendEmailResult } from './Interfaces'; +import type { MailData, SendEmailResult } from './interfaces'; @Service() export class NodeMailer { diff --git a/packages/cli/src/user-management/email/user-management-mailer.ts b/packages/cli/src/user-management/email/user-management-mailer.ts index f67d205a28..40ec991f76 100644 --- a/packages/cli/src/user-management/email/user-management-mailer.ts +++ b/packages/cli/src/user-management/email/user-management-mailer.ts @@ -5,7 +5,7 @@ import Handlebars from 'handlebars'; import { join as pathJoin } from 'path'; import { GlobalConfig } from '@n8n/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { UserRepository } from '@/databases/repositories/user.repository'; import { EventService } from '@/events/event.service'; @@ -14,7 +14,7 @@ import { UrlService } from '@/services/url.service'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; import { toError } from '@/utils'; -import type { InviteEmailData, PasswordResetData, SendEmailResult } from './Interfaces'; +import type { InviteEmailData, PasswordResetData, SendEmailResult } from './interfaces'; import { NodeMailer } from './node-mailer'; import { inTest } from '@/constants'; diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts index 17a1bb9c0e..8e4bb051ef 100644 --- a/packages/cli/src/wait-tracker.ts +++ b/packages/cli/src/wait-tracker.ts @@ -1,6 +1,6 @@ import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow'; import { Service } from 'typedi'; -import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowExecutionDataProcess } from '@/interfaces'; import { WorkflowRunner } from '@/workflow-runner'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { OwnershipService } from '@/services/ownership.service'; diff --git a/packages/cli/src/waiting-forms.ts b/packages/cli/src/waiting-forms.ts index 2fc1655594..6f57e1d8fd 100644 --- a/packages/cli/src/waiting-forms.ts +++ b/packages/cli/src/waiting-forms.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import type { IExecutionResponse } from '@/Interfaces'; +import type { IExecutionResponse } from '@/interfaces'; import { WaitingWebhooks } from '@/webhooks/waiting-webhooks'; @Service() diff --git a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts index 292b20e1bd..f1fa5338fc 100644 --- a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts +++ b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts @@ -7,7 +7,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error'; import * as WebhookHelpers from '@/webhooks/webhook-helpers'; import type * as express from 'express'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import type { IWebhookData, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow'; import type { TestWebhookRegistrationsService, diff --git a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts index 5cb8e005ad..221476672a 100644 --- a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts +++ b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts @@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended'; import { WaitingWebhooks } from '@/webhooks/waiting-webhooks'; import { ConflictError } from '@/errors/response-errors/conflict.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; -import type { IExecutionResponse } from '@/Interfaces'; +import type { IExecutionResponse } from '@/interfaces'; import type express from 'express'; import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; import type { WaitingWebhookRequest } from '@/webhooks/webhook.types'; diff --git a/packages/cli/src/webhooks/test-webhook-registrations.service.ts b/packages/cli/src/webhooks/test-webhook-registrations.service.ts index 94e7e7d826..5bc046c67f 100644 --- a/packages/cli/src/webhooks/test-webhook-registrations.service.ts +++ b/packages/cli/src/webhooks/test-webhook-registrations.service.ts @@ -1,7 +1,7 @@ import { Service } from 'typedi'; import { CacheService } from '@/services/cache/cache.service'; import type { IWebhookData } from 'n8n-workflow'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants'; import { OrchestrationService } from '@/services/orchestration.service'; diff --git a/packages/cli/src/webhooks/test-webhooks.ts b/packages/cli/src/webhooks/test-webhooks.ts index e10b77aa24..3ed6f86271 100644 --- a/packages/cli/src/webhooks/test-webhooks.ts +++ b/packages/cli/src/webhooks/test-webhooks.ts @@ -26,7 +26,7 @@ import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrati import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service'; import { OrchestrationService } from '@/services/orchestration.service'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; /** * Service for handling the execution of webhooks of manual executions diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts index 8fa0896a17..cfba81a91d 100644 --- a/packages/cli/src/webhooks/waiting-webhooks.ts +++ b/packages/cli/src/webhooks/waiting-webhooks.ts @@ -14,7 +14,7 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito import { Logger } from '@/logger'; import { ConflictError } from '@/errors/response-errors/conflict.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; -import type { IExecutionResponse, IWorkflowDb } from '@/Interfaces'; +import type { IExecutionResponse, IWorkflowDb } from '@/interfaces'; /** * Service for handling the execution of webhooks of Wait nodes that use the diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts index 5976cb06e3..f3fc584fb4 100644 --- a/packages/cli/src/webhooks/webhook-helpers.ts +++ b/packages/cli/src/webhooks/webhook-helpers.ts @@ -53,7 +53,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error'; import type { Project } from '@/databases/entities/project'; -import type { IExecutionDb, IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IExecutionDb, IWorkflowDb, IWorkflowExecutionDataProcess } from '@/interfaces'; /** * Returns all the webhooks which should be created for the given workflow diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index 86817f3a05..dfa079ffbe 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -46,7 +46,7 @@ import type { IWorkflowErrorData, IPushDataType, ExecutionPayload, -} from '@/Interfaces'; +} from '@/interfaces'; import { NodeTypes } from '@/node-types'; import { Push } from '@/push'; import * as WorkflowHelpers from '@/workflow-helpers'; diff --git a/packages/cli/src/workflow-helpers.ts b/packages/cli/src/workflow-helpers.ts index 3619f7ace1..3fcc3b3fcd 100644 --- a/packages/cli/src/workflow-helpers.ts +++ b/packages/cli/src/workflow-helpers.ts @@ -13,7 +13,7 @@ import type { NodeOperationError, } from 'n8n-workflow'; -import type { IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IWorkflowExecutionDataProcess } from '@/interfaces'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { VariablesService } from '@/environments/variables/variables.service.ee'; diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts index 77c57397c7..e25933507e 100644 --- a/packages/cli/src/workflow-runner.ts +++ b/packages/cli/src/workflow-runner.ts @@ -26,7 +26,7 @@ import { ActiveExecutions } from '@/active-executions'; import config from '@/config'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExternalHooks } from '@/external-hooks'; -import type { IExecutionResponse, IWorkflowExecutionDataProcess } from '@/Interfaces'; +import type { IExecutionResponse, IWorkflowExecutionDataProcess } from '@/interfaces'; import { NodeTypes } from '@/node-types'; import type { Job, JobData, JobResult } from '@/scaling/scaling.types'; import type { ScalingService } from '@/scaling/scaling.service'; diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts index 0792e528d4..5a75653275 100644 --- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts +++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts @@ -2,7 +2,7 @@ import type { INode } from 'n8n-workflow'; import { mock } from 'jest-mock-extended'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import { WorkflowExecutionService } from '@/workflows/workflow-execution.service'; import type { WorkflowRunner } from '@/workflow-runner'; diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts index 1fe7c46818..395aed66f0 100644 --- a/packages/cli/src/workflows/workflow-execution.service.ts +++ b/packages/cli/src/workflows/workflow-execution.service.ts @@ -16,7 +16,7 @@ import { ErrorReporterProxy as ErrorReporter, } from 'n8n-workflow'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import * as WorkflowHelpers from '@/workflow-helpers'; @@ -26,7 +26,7 @@ import type { IWorkflowDb, IWorkflowErrorData, IWorkflowExecutionDataProcess, -} from '@/Interfaces'; +} from '@/interfaces'; import { NodeTypes } from '@/node-types'; import { WorkflowRunner } from '@/workflow-runner'; import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data'; diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts b/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts index 21b2c303ee..038e25d257 100644 --- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts +++ b/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts @@ -1,5 +1,5 @@ import { mockClear } from 'jest-mock-extended'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee'; diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts b/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts index 4cd9d3a702..7b28d28f35 100644 --- a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts +++ b/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { WorkflowHistory } from '@/databases/entities/workflow-history'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; diff --git a/packages/cli/src/workflows/workflow-sharing.service.ts b/packages/cli/src/workflows/workflow-sharing.service.ts index 7a7c4a2caa..b4db7879fd 100644 --- a/packages/cli/src/workflows/workflow-sharing.service.ts +++ b/packages/cli/src/workflows/workflow-sharing.service.ts @@ -2,7 +2,7 @@ import { Service } from 'typedi'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In } from '@n8n/typeorm'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { RoleService } from '@/services/role.service'; import type { Scope } from '@n8n/permissions'; diff --git a/packages/cli/src/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts index 7b1fd85528..d58daf0a4d 100644 --- a/packages/cli/src/workflows/workflow.request.ts +++ b/packages/cli/src/workflows/workflow.request.ts @@ -1,4 +1,4 @@ -import type { IWorkflowDb } from '@/Interfaces'; +import type { IWorkflowDb } from '@/interfaces'; import type { AuthenticatedRequest, ListQuery } from '@/requests'; import type { INode, IConnections, IWorkflowSettings, IRunData, StartNodeData } from 'n8n-workflow'; diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts index 560942064a..f5f45ef3af 100644 --- a/packages/cli/src/workflows/workflow.service.ee.ts +++ b/packages/cli/src/workflows/workflow.service.ee.ts @@ -3,7 +3,7 @@ import omit from 'lodash/omit'; import { ApplicationError, NodeOperationError, WorkflowActivationError } from 'n8n-workflow'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts index 25943725ab..dfa8e3275d 100644 --- a/packages/cli/src/workflows/workflow.service.ts +++ b/packages/cli/src/workflows/workflow.service.ts @@ -6,7 +6,7 @@ import { v4 as uuid } from 'uuid'; import { BinaryDataService } from 'n8n-core'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository'; diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts index 7fa32c2685..a8e8052f03 100644 --- a/packages/cli/src/workflows/workflows.controller.ts +++ b/packages/cli/src/workflows/workflows.controller.ts @@ -2,10 +2,10 @@ import express from 'express'; import { v4 as uuid } from 'uuid'; import axios from 'axios'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import * as ResponseHelper from '@/response-helper'; import * as WorkflowHelpers from '@/workflow-helpers'; -import type { IWorkflowResponse } from '@/Interfaces'; +import type { IWorkflowResponse } from '@/interfaces'; import config from '@/config'; import { Delete, Get, Patch, Post, ProjectScope, Put, RestController } from '@/decorators'; import { SharedWorkflow } from '@/databases/entities/shared-workflow'; diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts index 52565b9edf..a41bca3dbd 100644 --- a/packages/cli/test/integration/auth.api.test.ts +++ b/packages/cli/test/integration/auth.api.test.ts @@ -3,7 +3,7 @@ import validator from 'validator'; import config from '@/config'; import { AUTH_COOKIE_NAME } from '@/constants'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { MfaService } from '@/mfa/mfa.service'; diff --git a/packages/cli/test/integration/community-packages.api.test.ts b/packages/cli/test/integration/community-packages.api.test.ts index 78b03c1396..0fa722c5e5 100644 --- a/packages/cli/test/integration/community-packages.api.test.ts +++ b/packages/cli/test/integration/community-packages.api.test.ts @@ -3,7 +3,7 @@ import path from 'path'; import type { InstalledPackages } from '@/databases/entities/installed-packages'; import type { InstalledNodes } from '@/databases/entities/installed-nodes'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; import { mockInstance } from '../shared/mocking'; import { COMMUNITY_PACKAGE_VERSION } from './shared/constants'; diff --git a/packages/cli/test/integration/controllers/invitation/assertions.ts b/packages/cli/test/integration/controllers/invitation/assertions.ts index 349eac4e8e..cc4848e0e2 100644 --- a/packages/cli/test/integration/controllers/invitation/assertions.ts +++ b/packages/cli/test/integration/controllers/invitation/assertions.ts @@ -1,5 +1,5 @@ import validator from 'validator'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { UserInvitationResult } from '../../shared/utils/users'; export function assertReturnedUserProps(user: User) { diff --git a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts index 99d981a2d8..a4816a32a0 100644 --- a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts +++ b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts @@ -22,7 +22,7 @@ import { assertUserInviteResult, } from './assertions'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { UserInvitationResult } from '../../shared/utils/users'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; diff --git a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts index 11069ad008..3513767379 100644 --- a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts +++ b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts @@ -4,7 +4,7 @@ import nock from 'nock'; import { parse as parseQs } from 'querystring'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { CredentialsHelper } from '@/credentials-helper'; import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller'; diff --git a/packages/cli/test/integration/credentials-helper.test.ts b/packages/cli/test/integration/credentials-helper.test.ts index 9c979d9d24..7686e75840 100644 --- a/packages/cli/test/integration/credentials-helper.test.ts +++ b/packages/cli/test/integration/credentials-helper.test.ts @@ -3,7 +3,7 @@ import * as testDb from './shared/test-db'; import { CredentialsHelper } from '@/credentials-helper'; import { createOwner, createAdmin, createMember } from './shared/db/users'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { saveCredential } from './shared/db/credentials'; import { randomCredentialPayload } from './shared/random'; import { createTeamProject, linkUserToProject } from './shared/db/projects'; diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts index 11edc2c4e9..1540fe46e4 100644 --- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts @@ -3,7 +3,7 @@ import { In } from '@n8n/typeorm'; import config from '@/config'; import type { ListQuery } from '@/requests'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { Project } from '@/databases/entities/project'; diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts index 41bcce9489..71ed1d8cfb 100644 --- a/packages/cli/test/integration/credentials/credentials.api.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.test.ts @@ -5,7 +5,7 @@ import { Credentials } from 'n8n-core'; import { randomString } from 'n8n-workflow'; import type { ListQuery } from '@/requests'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { Project } from '@/databases/entities/project'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; diff --git a/packages/cli/test/integration/credentials/credentials.service.test.ts b/packages/cli/test/integration/credentials/credentials.service.test.ts index 819ce9bb2f..bc2d193570 100644 --- a/packages/cli/test/integration/credentials/credentials.service.test.ts +++ b/packages/cli/test/integration/credentials/credentials.service.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { saveCredential, shareCredentialWithUsers } from '../shared/db/credentials'; import { createMember } from '../shared/db/users'; diff --git a/packages/cli/test/integration/cta.service.test.ts b/packages/cli/test/integration/cta.service.test.ts index e720ae0bec..c1e4109b4e 100644 --- a/packages/cli/test/integration/cta.service.test.ts +++ b/packages/cli/test/integration/cta.service.test.ts @@ -3,7 +3,7 @@ import * as testDb from './shared/test-db'; import { CtaService } from '@/services/cta.service'; import { createUser } from './shared/db/users'; import { createManyWorkflows } from './shared/db/workflows'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { createWorkflowStatisticsItem } from './shared/db/workflow-statistics'; import { StatisticsNames } from '@/databases/entities/workflow-statistics'; diff --git a/packages/cli/test/integration/environments/source-control.test.ts b/packages/cli/test/integration/environments/source-control.test.ts index 4547dc9f23..2ee20160a8 100644 --- a/packages/cli/test/integration/environments/source-control.test.ts +++ b/packages/cli/test/integration/environments/source-control.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import config from '@/config'; import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee'; import { SourceControlService } from '@/environments/source-control/source-control.service.ee'; diff --git a/packages/cli/test/integration/eventbus.ee.test.ts b/packages/cli/test/integration/eventbus.ee.test.ts index ec4786b068..9af3e0702d 100644 --- a/packages/cli/test/integration/eventbus.ee.test.ts +++ b/packages/cli/test/integration/eventbus.ee.test.ts @@ -13,7 +13,7 @@ import { defaultMessageEventBusDestinationWebhookOptions, } from 'n8n-workflow'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic'; import type { MessageEventBusDestinationSyslog } from '@/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee'; diff --git a/packages/cli/test/integration/eventbus.test.ts b/packages/cli/test/integration/eventbus.test.ts index 05019966e6..4ac70b7c3f 100644 --- a/packages/cli/test/integration/eventbus.test.ts +++ b/packages/cli/test/integration/eventbus.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { ExecutionRecoveryService } from '@/executions/execution-recovery.service'; diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts index 700af7abd4..ab02a5047e 100644 --- a/packages/cli/test/integration/executions.controller.test.ts +++ b/packages/cli/test/integration/executions.controller.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { createSuccessfulExecution, getAllExecutions } from './shared/db/executions'; import { createMember, createOwner } from './shared/db/users'; diff --git a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts index f15d0a94c5..0cf6a27f79 100644 --- a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts +++ b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts @@ -4,7 +4,7 @@ import { jsonParse, type IDataObject } from 'n8n-workflow'; import { mock } from 'jest-mock-extended'; import { License } from '@/license'; -import type { ExternalSecretsSettings, SecretsProviderState } from '@/Interfaces'; +import type { ExternalSecretsSettings, SecretsProviderState } from '@/interfaces'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee'; import config from '@/config'; diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts index 7e3ca724b4..b55a853365 100644 --- a/packages/cli/test/integration/import.service.test.ts +++ b/packages/cli/test/integration/import.service.test.ts @@ -20,7 +20,7 @@ import { newWorkflow, } from './shared/db/workflows'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { Project } from '@/databases/entities/project'; import { getPersonalProject } from './shared/db/projects'; diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index 2c272a1062..f30889492b 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -4,7 +4,7 @@ import { Not } from '@n8n/typeorm'; import { Cipher } from 'n8n-core'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository'; import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap/constants'; diff --git a/packages/cli/test/integration/license.api.test.ts b/packages/cli/test/integration/license.api.test.ts index 44071e1b68..d20476831d 100644 --- a/packages/cli/test/integration/license.api.test.ts +++ b/packages/cli/test/integration/license.api.test.ts @@ -1,8 +1,8 @@ import nock from 'nock'; import config from '@/config'; import { RESPONSE_ERROR_MESSAGES } from '@/constants'; -import type { User } from '@/databases/entities/User'; -import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces'; +import type { User } from '@/databases/entities/user'; +import type { ILicensePostResponse, ILicenseReadResponse } from '@/interfaces'; import { License } from '@/license'; import * as testDb from './shared/test-db'; diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts index e88b9c1447..829b296fe6 100644 --- a/packages/cli/test/integration/me.api.test.ts +++ b/packages/cli/test/integration/me.api.test.ts @@ -2,7 +2,7 @@ import { Container } from 'typedi'; import { IsNull } from '@n8n/typeorm'; import validator from 'validator'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { ProjectRepository } from '@/databases/repositories/project.repository'; diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts index 52f257dc36..296009c04d 100644 --- a/packages/cli/test/integration/mfa/mfa.api.test.ts +++ b/packages/cli/test/integration/mfa/mfa.api.test.ts @@ -3,7 +3,7 @@ import { randomInt, randomString } from 'n8n-workflow'; import { AuthService } from '@/auth/auth.service'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { AuthUserRepository } from '@/databases/repositories/auth-user.repository'; import { TOTPService } from '@/mfa/totp.service'; diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts index a90aa8ecd5..43a469b5f8 100644 --- a/packages/cli/test/integration/owner.api.test.ts +++ b/packages/cli/test/integration/owner.api.test.ts @@ -2,7 +2,7 @@ import { Container } from 'typedi'; import validator from 'validator'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { UserRepository } from '@/databases/repositories/user.repository'; import { diff --git a/packages/cli/test/integration/password-reset.api.test.ts b/packages/cli/test/integration/password-reset.api.test.ts index 3037945c20..7689ba9b79 100644 --- a/packages/cli/test/integration/password-reset.api.test.ts +++ b/packages/cli/test/integration/password-reset.api.test.ts @@ -7,7 +7,7 @@ import { randomString } from 'n8n-workflow'; import { AuthService } from '@/auth/auth.service'; import { License } from '@/license'; import config from '@/config'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; import { ExternalHooks } from '@/external-hooks'; import { JwtService } from '@/services/jwt.service'; diff --git a/packages/cli/test/integration/permission-checker.test.ts b/packages/cli/test/integration/permission-checker.test.ts index 75da58e92a..32c9b83c93 100644 --- a/packages/cli/test/integration/permission-checker.test.ts +++ b/packages/cli/test/integration/permission-checker.test.ts @@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid'; import { Container } from 'typedi'; import type { INode, INodeTypeData } from 'n8n-workflow'; import { randomInt } from 'n8n-workflow'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/test/integration/project.api.test.ts b/packages/cli/test/integration/project.api.test.ts index 0a788b8b0b..7b405749a3 100644 --- a/packages/cli/test/integration/project.api.test.ts +++ b/packages/cli/test/integration/project.api.test.ts @@ -23,7 +23,7 @@ import { randomCredentialPayload } from './shared/random'; import { getWorkflowById } from '@/public-api/v1/handlers/workflows/workflows.service'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import type { GlobalRole } from '@/databases/entities/User'; +import type { GlobalRole } from '@/databases/entities/user'; import type { Scope } from '@n8n/permissions'; import { CacheService } from '@/services/cache/cache.service'; import { mockInstance } from '../shared/mocking'; diff --git a/packages/cli/test/integration/public-api/credentials.test.ts b/packages/cli/test/integration/public-api/credentials.test.ts index d924832a69..08812bf688 100644 --- a/packages/cli/test/integration/public-api/credentials.test.ts +++ b/packages/cli/test/integration/public-api/credentials.test.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import { randomString } from 'n8n-workflow'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/test/integration/public-api/executions.test.ts b/packages/cli/test/integration/public-api/executions.test.ts index f68001b24c..fd597baf83 100644 --- a/packages/cli/test/integration/public-api/executions.test.ts +++ b/packages/cli/test/integration/public-api/executions.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { ActiveWorkflowManager } from '@/active-workflow-manager'; import { randomApiKey } from '../shared/random'; diff --git a/packages/cli/test/integration/public-api/tags.test.ts b/packages/cli/test/integration/public-api/tags.test.ts index 3de96e3ab2..754aa4e7f1 100644 --- a/packages/cli/test/integration/public-api/tags.test.ts +++ b/packages/cli/test/integration/public-api/tags.test.ts @@ -1,5 +1,5 @@ import { Container } from 'typedi'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { TagRepository } from '@/databases/repositories/tag.repository'; import { randomApiKey } from '../shared/random'; diff --git a/packages/cli/test/integration/public-api/users.ee.test.ts b/packages/cli/test/integration/public-api/users.ee.test.ts index b45c33e51b..e3aca89ec2 100644 --- a/packages/cli/test/integration/public-api/users.ee.test.ts +++ b/packages/cli/test/integration/public-api/users.ee.test.ts @@ -10,7 +10,7 @@ import * as testDb from '../shared/test-db'; import { createOwner, createUser, createUserShell } from '../shared/db/users'; import type { SuperAgentTest } from '../shared/types'; import { createTeamProject, linkUserToProject } from '@test-integration/db/projects'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; mockInstance(License, { getUsersLimit: jest.fn().mockReturnValue(-1), diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts index e126be6ca0..fcdb15f5ee 100644 --- a/packages/cli/test/integration/public-api/workflows.test.ts +++ b/packages/cli/test/integration/public-api/workflows.test.ts @@ -4,7 +4,7 @@ import type { INode } from 'n8n-workflow'; import config from '@/config'; import { STARTING_NODES } from '@/constants'; import type { TagEntity } from '@/databases/entities/tag-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { Project } from '@/databases/entities/project'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; diff --git a/packages/cli/test/integration/role.api.test.ts b/packages/cli/test/integration/role.api.test.ts index 7291bff61c..a25dc2b131 100644 --- a/packages/cli/test/integration/role.api.test.ts +++ b/packages/cli/test/integration/role.api.test.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import type { Scope } from '@n8n/permissions'; -import type { GlobalRole } from '@/databases/entities/User'; +import type { GlobalRole } from '@/databases/entities/user'; import type { ProjectRole } from '@/databases/entities/project-relation'; import type { CredentialSharingRole } from '@/databases/entities/shared-credentials'; import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow'; diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts index b667d3ddb9..c5db39eb82 100644 --- a/packages/cli/test/integration/saml/saml.api.test.ts +++ b/packages/cli/test/integration/saml/saml.api.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { setSamlLoginEnabled } from '@/sso/saml/saml-helpers'; import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; diff --git a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts index 6a93447137..46b64d73fd 100644 --- a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts @@ -5,7 +5,7 @@ import { OFFICIAL_RISKY_NODE_TYPES, NODES_REPORT } from '@/security-audit/consta import { toReportTitle } from '@/security-audit/utils'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; -import { CommunityPackagesService } from '@/services/communityPackages.service'; +import { CommunityPackagesService } from '@/services/community-packages.service'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { mockInstance } from '../../shared/mocking'; diff --git a/packages/cli/test/integration/shared/db/credentials.ts b/packages/cli/test/integration/shared/db/credentials.ts index 03493ab116..2174fd440d 100644 --- a/packages/cli/test/integration/shared/db/credentials.ts +++ b/packages/cli/test/integration/shared/db/credentials.ts @@ -1,10 +1,10 @@ import { Container } from 'typedi'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import type { CredentialSharingRole } from '@/databases/entities/shared-credentials'; -import type { ICredentialsDb } from '@/Interfaces'; +import type { ICredentialsDb } from '@/interfaces'; import type { CredentialPayload } from '../types'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import type { Project } from '@/databases/entities/project'; diff --git a/packages/cli/test/integration/shared/db/projects.ts b/packages/cli/test/integration/shared/db/projects.ts index 4f64b3c395..4f569bcebd 100644 --- a/packages/cli/test/integration/shared/db/projects.ts +++ b/packages/cli/test/integration/shared/db/projects.ts @@ -3,7 +3,7 @@ import Container from 'typedi'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { randomName } from '../random'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import type { Project } from '@/databases/entities/project'; import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation'; diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts index 035a4425ea..45556ccb26 100644 --- a/packages/cli/test/integration/shared/db/users.ts +++ b/packages/cli/test/integration/shared/db/users.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import { hash } from 'bcryptjs'; import { AuthIdentity } from '@/databases/entities/auth-identity'; -import { type GlobalRole, type User } from '@/databases/entities/User'; +import { type GlobalRole, type User } from '@/databases/entities/user'; import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; import { TOTPService } from '@/mfa/totp.service'; diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts index aa22575ebf..5b52dd62ff 100644 --- a/packages/cli/test/integration/shared/db/workflows.ts +++ b/packages/cli/test/integration/shared/db/workflows.ts @@ -2,7 +2,7 @@ import Container from 'typedi'; import type { DeepPartial } from '@n8n/typeorm'; import { v4 as uuid } from 'uuid'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; diff --git a/packages/cli/test/integration/shared/license.ts b/packages/cli/test/integration/shared/license.ts index 701cc36eab..3c8df3884c 100644 --- a/packages/cli/test/integration/shared/license.ts +++ b/packages/cli/test/integration/shared/license.ts @@ -1,4 +1,4 @@ -import type { BooleanLicenseFeature, NumericLicenseFeature } from '@/Interfaces'; +import type { BooleanLicenseFeature, NumericLicenseFeature } from '@/interfaces'; import type { License } from '@/license'; export interface LicenseMockDefaults { diff --git a/packages/cli/test/integration/shared/test-db.ts b/packages/cli/test/integration/shared/test-db.ts index 639b726223..dc0b13b13d 100644 --- a/packages/cli/test/integration/shared/test-db.ts +++ b/packages/cli/test/integration/shared/test-db.ts @@ -5,7 +5,7 @@ import { GlobalConfig } from '@n8n/config'; import type { Class } from 'n8n-core'; import { randomString } from 'n8n-workflow'; -import * as Db from '@/Db'; +import * as Db from '@/db'; import { getOptionOverrides } from '@/databases/config'; import { kebabCase } from 'lodash'; diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts index 2813d448df..e5292e4982 100644 --- a/packages/cli/test/integration/shared/types.ts +++ b/packages/cli/test/integration/shared/types.ts @@ -4,8 +4,8 @@ import type TestAgent from 'supertest/lib/agent'; import type { Server } from 'http'; import type { CredentialsEntity } from '@/databases/entities/credentials-entity'; -import type { User } from '@/databases/entities/User'; -import type { BooleanLicenseFeature, ICredentialsDb, NumericLicenseFeature } from '@/Interfaces'; +import type { User } from '@/databases/entities/user'; +import type { BooleanLicenseFeature, ICredentialsDb, NumericLicenseFeature } from '@/interfaces'; import type { LicenseMocker } from './license'; import type { Project } from '@/databases/entities/project'; diff --git a/packages/cli/test/integration/shared/utils/test-server.ts b/packages/cli/test/integration/shared/utils/test-server.ts index a66cde217f..5036d680b1 100644 --- a/packages/cli/test/integration/shared/utils/test-server.ts +++ b/packages/cli/test/integration/shared/utils/test-server.ts @@ -7,7 +7,7 @@ import { URL } from 'url'; import config from '@/config'; import { AUTH_COOKIE_NAME } from '@/constants'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ControllerRegistry } from '@/decorators'; import { rawBodyReader, bodyParser } from '@/middlewares'; import { PostHogClient } from '@/posthog'; @@ -150,7 +150,7 @@ export const setupTestServer = ({ break; case 'eventBus': - await import('@/eventbus/eventBus.controller'); + await import('@/eventbus/event-bus.controller'); break; case 'auth': diff --git a/packages/cli/test/integration/shared/utils/users.ts b/packages/cli/test/integration/shared/utils/users.ts index e812558674..13887d3ce9 100644 --- a/packages/cli/test/integration/shared/utils/users.ts +++ b/packages/cli/test/integration/shared/utils/users.ts @@ -1,5 +1,5 @@ -import type { PublicUser } from '@/Interfaces'; -import type { User } from '@/databases/entities/User'; +import type { PublicUser } from '@/interfaces'; +import type { User } from '@/databases/entities/user'; export const validateUser = (user: PublicUser) => { expect(typeof user.id).toBe('string'); diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts index 94d9edff25..ff9d428799 100644 --- a/packages/cli/test/integration/users.api.test.ts +++ b/packages/cli/test/integration/users.api.test.ts @@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid'; import { RESPONSE_ERROR_MESSAGES } from '@/constants'; import { UsersController } from '@/controllers/users.controller'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts index d29dd1d485..16eeb3c205 100644 --- a/packages/cli/test/integration/variables.test.ts +++ b/packages/cli/test/integration/variables.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; -import type { Variables } from '@/databases/entities/Variables'; +import type { Variables } from '@/databases/entities/variables'; import { VariablesRepository } from '@/databases/repositories/variables.repository'; import { generateNanoId } from '@/databases/utils/generators'; import { VariablesService } from '@/environments/variables/variables.service.ee'; diff --git a/packages/cli/test/integration/workflow-history.api.test.ts b/packages/cli/test/integration/workflow-history.api.test.ts index 8d3cecd8f1..4451dafa79 100644 --- a/packages/cli/test/integration/workflow-history.api.test.ts +++ b/packages/cli/test/integration/workflow-history.api.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; diff --git a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts index 5ecff6b7fd..496436860b 100644 --- a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; import * as testDb from '../shared/test-db'; diff --git a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts index 95bac8aee7..d27a341d5d 100644 --- a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts @@ -1,4 +1,4 @@ -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import * as utils from '../shared/utils/'; import * as testDb from '../shared/test-db'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts index a57502f345..035e53a1b4 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts @@ -5,7 +5,7 @@ import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workf import config from '@/config'; import type { Project } from '@/databases/entities/project'; import { ProjectRepository } from '@/databases/repositories/project.repository'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { License } from '@/license'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts index ac801b4e43..8959ca7af4 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts @@ -3,7 +3,7 @@ import { v4 as uuid } from 'uuid'; import type { INode, IPinData } from 'n8n-workflow'; import type { Scope } from '@n8n/permissions'; -import type { User } from '@/databases/entities/User'; +import type { User } from '@/databases/entities/user'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { ListQuery } from '@/requests'; diff --git a/packages/cli/test/shared/external-secrets/utils.ts b/packages/cli/test/shared/external-secrets/utils.ts index 93b14e226b..f488adf84b 100644 --- a/packages/cli/test/shared/external-secrets/utils.ts +++ b/packages/cli/test/shared/external-secrets/utils.ts @@ -1,5 +1,5 @@ -import { SecretsProvider } from '@/Interfaces'; -import type { SecretsProviderSettings, SecretsProviderState } from '@/Interfaces'; +import { SecretsProvider } from '@/interfaces'; +import type { SecretsProviderSettings, SecretsProviderState } from '@/interfaces'; import type { IDataObject, INodeProperties } from 'n8n-workflow'; export class MockProviders { diff --git a/packages/cli/test/shared/mock-objects.ts b/packages/cli/test/shared/mock-objects.ts index 3465b68ece..d22f20016d 100644 --- a/packages/cli/test/shared/mock-objects.ts +++ b/packages/cli/test/shared/mock-objects.ts @@ -1,5 +1,5 @@ import { randomInt } from 'n8n-workflow'; -import { User } from '@/databases/entities/User'; +import { User } from '@/databases/entities/user'; import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { Project } from '@/databases/entities/project';