From 1d5b9836cab5e89b7e5e0b7b5a51a36e03e11c23 Mon Sep 17 00:00:00 2001 From: Val <68596159+valya@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:51:16 +0100 Subject: [PATCH] fix: Rename LDAP files to include .ee (no-changelog) (#9943) --- packages/cli/src/Ldap/{helpers.ts => helpers.ee.ts} | 0 .../src/Ldap/{ldap.controller.ts => ldap.controller.ee.ts} | 4 ++-- .../cli/src/Ldap/{ldap.service.ts => ldap.service.ee.ts} | 2 +- packages/cli/src/Server.ts | 6 +++--- packages/cli/src/auth/methods/email.ts | 2 +- packages/cli/src/auth/methods/ldap.ts | 4 ++-- packages/cli/src/services/frontend.service.ts | 2 +- packages/cli/test/integration/commands/ldap/reset.test.ts | 4 ++-- packages/cli/test/integration/ldap/ldap.api.test.ts | 4 ++-- packages/cli/test/integration/shared/utils/testServer.ts | 4 ++-- packages/cli/test/unit/Ldap/helpers.test.ts | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) rename packages/cli/src/Ldap/{helpers.ts => helpers.ee.ts} (100%) rename packages/cli/src/Ldap/{ldap.controller.ts => ldap.controller.ee.ts} (94%) rename packages/cli/src/Ldap/{ldap.service.ts => ldap.service.ee.ts} (99%) diff --git a/packages/cli/src/Ldap/helpers.ts b/packages/cli/src/Ldap/helpers.ee.ts similarity index 100% rename from packages/cli/src/Ldap/helpers.ts rename to packages/cli/src/Ldap/helpers.ee.ts diff --git a/packages/cli/src/Ldap/ldap.controller.ts b/packages/cli/src/Ldap/ldap.controller.ee.ts similarity index 94% rename from packages/cli/src/Ldap/ldap.controller.ts rename to packages/cli/src/Ldap/ldap.controller.ee.ts index e7715630bf..5a5983521f 100644 --- a/packages/cli/src/Ldap/ldap.controller.ts +++ b/packages/cli/src/Ldap/ldap.controller.ee.ts @@ -4,9 +4,9 @@ import { InternalHooks } from '@/InternalHooks'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from './constants'; -import { getLdapSynchronizations } from './helpers'; +import { getLdapSynchronizations } from './helpers.ee'; import { LdapConfiguration } from './types'; -import { LdapService } from './ldap.service'; +import { LdapService } from './ldap.service.ee'; @RestController('/ldap') export class LdapController { diff --git a/packages/cli/src/Ldap/ldap.service.ts b/packages/cli/src/Ldap/ldap.service.ee.ts similarity index 99% rename from packages/cli/src/Ldap/ldap.service.ts rename to packages/cli/src/Ldap/ldap.service.ee.ts index b161c11bee..7852a709e5 100644 --- a/packages/cli/src/Ldap/ldap.service.ts +++ b/packages/cli/src/Ldap/ldap.service.ee.ts @@ -38,7 +38,7 @@ import { resolveEntryBinaryAttributes, saveLdapSynchronization, validateLdapConfigurationSchema, -} from './helpers'; +} from './helpers.ee'; import { BINARY_AD_ATTRIBUTES, LDAP_FEATURE_NAME, diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts index 04496e4c8a..597c96ec0f 100644 --- a/packages/cli/src/Server.ts +++ b/packages/cli/src/Server.ts @@ -29,7 +29,7 @@ import { CredentialsOverwrites } from '@/CredentialsOverwrites'; import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials'; import * as ResponseHelper from '@/ResponseHelper'; import { setupPushServer, setupPushHandler } from '@/push'; -import { isLdapEnabled } from '@/Ldap/helpers'; +import { isLdapEnabled } from '@/Ldap/helpers.ee'; import { AbstractServer } from '@/AbstractServer'; import { PostHogClient } from '@/posthog'; import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus'; @@ -113,8 +113,8 @@ export class Server extends AbstractServer { } if (isLdapEnabled()) { - const { LdapService } = await import('@/Ldap/ldap.service'); - await import('@/Ldap/ldap.controller'); + const { LdapService } = await import('@/Ldap/ldap.service.ee'); + await import('@/Ldap/ldap.controller.ee'); await Container.get(LdapService).init(); } diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts index ba839fa4e6..2cff8432f0 100644 --- a/packages/cli/src/auth/methods/email.ts +++ b/packages/cli/src/auth/methods/email.ts @@ -2,7 +2,7 @@ import type { User } from '@db/entities/User'; import { PasswordUtility } from '@/services/password.utility'; import { Container } from 'typedi'; import { InternalHooks } from '@/InternalHooks'; -import { isLdapLoginEnabled } from '@/Ldap/helpers'; +import { isLdapLoginEnabled } from '@/Ldap/helpers.ee'; import { UserRepository } from '@db/repositories/user.repository'; import { AuthError } from '@/errors/response-errors/auth.error'; diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts index d7a254889e..5bc86fec28 100644 --- a/packages/cli/src/auth/methods/ldap.ts +++ b/packages/cli/src/auth/methods/ldap.ts @@ -1,7 +1,7 @@ import { Container } from 'typedi'; import { InternalHooks } from '@/InternalHooks'; -import { LdapService } from '@/Ldap/ldap.service'; +import { LdapService } from '@/Ldap/ldap.service.ee'; import { createLdapUserOnLocalDb, getUserByEmail, @@ -10,7 +10,7 @@ import { mapLdapAttributesToUser, createLdapAuthIdentity, updateLdapUserOnLocalDb, -} from '@/Ldap/helpers'; +} from '@/Ldap/helpers.ee'; import type { User } from '@db/entities/User'; import { EventRelay } from '@/eventbus/event-relay.service'; diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts index 260fde5f52..226f80534d 100644 --- a/packages/cli/src/services/frontend.service.ts +++ b/packages/cli/src/services/frontend.service.ts @@ -20,7 +20,7 @@ import { CredentialTypes } from '@/CredentialTypes'; import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials'; import { License } from '@/License'; import { getCurrentAuthenticationMethod } from '@/sso/ssoHelpers'; -import { getLdapLoginLabel } from '@/Ldap/helpers'; +import { getLdapLoginLabel } from '@/Ldap/helpers.ee'; import { getSamlLoginLabel } from '@/sso/saml/samlHelpers'; import { getVariablesLimit } from '@/environments/variables/environmentHelpers'; import { diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index 1464b56728..12833b633f 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -9,8 +9,8 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository'; import { CredentialsRepository } from '@db/repositories/credentials.repository'; import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository'; import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository'; -import { getLdapSynchronizations, saveLdapSynchronization } from '@/Ldap/helpers'; -import { LdapService } from '@/Ldap/ldap.service'; +import { getLdapSynchronizations, saveLdapSynchronization } from '@/Ldap/helpers.ee'; +import { LdapService } from '@/Ldap/ldap.service.ee'; import { Push } from '@/push'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index 2a2f1f1810..25dbbd3b9d 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -8,8 +8,8 @@ import type { User } from '@db/entities/User'; import { UserRepository } from '@db/repositories/user.repository'; import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository'; import { LDAP_DEFAULT_CONFIGURATION } from '@/Ldap/constants'; -import { LdapService } from '@/Ldap/ldap.service'; -import { saveLdapSynchronization } from '@/Ldap/helpers'; +import { LdapService } from '@/Ldap/ldap.service.ee'; +import { saveLdapSynchronization } from '@/Ldap/helpers.ee'; import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers'; import { randomEmail, randomName, uniqueId } from './../shared/random'; diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/testServer.ts index 7f6a312b6b..a9921a6354 100644 --- a/packages/cli/test/integration/shared/utils/testServer.ts +++ b/packages/cli/test/integration/shared/utils/testServer.ts @@ -162,8 +162,8 @@ export const setupTestServer = ({ break; case 'ldap': - const { LdapService } = await import('@/Ldap/ldap.service'); - await import('@/Ldap/ldap.controller'); + const { LdapService } = await import('@/Ldap/ldap.service.ee'); + await import('@/Ldap/ldap.controller.ee'); testServer.license.enable('feat:ldap'); await Container.get(LdapService).init(); break; diff --git a/packages/cli/test/unit/Ldap/helpers.test.ts b/packages/cli/test/unit/Ldap/helpers.test.ts index b5c8c25a67..debb96da38 100644 --- a/packages/cli/test/unit/Ldap/helpers.test.ts +++ b/packages/cli/test/unit/Ldap/helpers.test.ts @@ -1,6 +1,6 @@ import { UserRepository } from '@/databases/repositories/user.repository'; import { mockInstance } from '../../shared/mocking'; -import * as helpers from '@/Ldap/helpers'; +import * as helpers from '@/Ldap/helpers.ee'; import { AuthIdentity } from '@/databases/entities/AuthIdentity'; import { User } from '@/databases/entities/User'; import { generateNanoId } from '@/databases/utils/generators';