mirror of
https://github.com/n8n-io/n8n.git
synced 2024-11-09 22:24:05 -08:00
fix: Rename LDAP files to include .ee (no-changelog) (#9943)
This commit is contained in:
parent
34019d62b0
commit
1d5b9836ca
|
@ -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 {
|
|
@ -38,7 +38,7 @@ import {
|
|||
resolveEntryBinaryAttributes,
|
||||
saveLdapSynchronization,
|
||||
validateLdapConfigurationSchema,
|
||||
} from './helpers';
|
||||
} from './helpers.ee';
|
||||
import {
|
||||
BINARY_AD_ATTRIBUTES,
|
||||
LDAP_FEATURE_NAME,
|
|
@ -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();
|
||||
}
|
||||
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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';
|
||||
|
||||
|
|
|
@ -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';
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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';
|
||||
|
|
Loading…
Reference in a new issue