mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: Rename LDAP files to include .ee (no-changelog) (#9943)

Browse source
This commit is contained in:
Val 2024-07-05 08:51:16 +01:00 committed by GitHub
parent 34019d62b0
commit 1d5b9836ca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
packages/cli/src/Ldap/helpers.ts → packages/cli/src/Ldap/helpers.ee.ts
View file

4
packages/cli/src/Ldap/ldap.controller.ts → packages/cli/src/Ldap/ldap.controller.ee.ts
View file

@ -4,9 +4,9 @@ import { InternalHooks } from '@/InternalHooks';
import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from './constants'; import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from './constants';
import { getLdapSynchronizations } from './helpers'; import { getLdapSynchronizations } from './helpers.ee';
import { LdapConfiguration } from './types'; import { LdapConfiguration } from './types';
import { LdapService } from './ldap.service'; import { LdapService } from './ldap.service.ee';
@RestController('/ldap') @RestController('/ldap')
export class LdapController { export class LdapController {

2
packages/cli/src/Ldap/ldap.service.ts → packages/cli/src/Ldap/ldap.service.ee.ts
View file

@ -38,7 +38,7 @@ import {
resolveEntryBinaryAttributes, resolveEntryBinaryAttributes,
saveLdapSynchronization, saveLdapSynchronization,
validateLdapConfigurationSchema, validateLdapConfigurationSchema,
} from './helpers'; } from './helpers.ee';
import { import {
BINARY_AD_ATTRIBUTES, BINARY_AD_ATTRIBUTES,
LDAP_FEATURE_NAME, LDAP_FEATURE_NAME,

6
packages/cli/src/Server.ts
View file

@ -29,7 +29,7 @@ import { CredentialsOverwrites } from '@/CredentialsOverwrites';
import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials'; import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
import * as ResponseHelper from '@/ResponseHelper'; import * as ResponseHelper from '@/ResponseHelper';
import { setupPushServer, setupPushHandler } from '@/push'; import { setupPushServer, setupPushHandler } from '@/push';
import { isLdapEnabled } from '@/Ldap/helpers'; import { isLdapEnabled } from '@/Ldap/helpers.ee';
import { AbstractServer } from '@/AbstractServer'; import { AbstractServer } from '@/AbstractServer';
import { PostHogClient } from '@/posthog'; import { PostHogClient } from '@/posthog';
import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus'; import { MessageEventBus } from '@/eventbus/MessageEventBus/MessageEventBus';
@ -113,8 +113,8 @@ export class Server extends AbstractServer {
} }
if (isLdapEnabled()) { if (isLdapEnabled()) {
const { LdapService } = await import('@/Ldap/ldap.service'); const { LdapService } = await import('@/Ldap/ldap.service.ee');
await import('@/Ldap/ldap.controller'); await import('@/Ldap/ldap.controller.ee');
await Container.get(LdapService).init(); await Container.get(LdapService).init();
} }

2
packages/cli/src/auth/methods/email.ts
View file

@ -2,7 +2,7 @@ import type { User } from '@db/entities/User';
import { PasswordUtility } from '@/services/password.utility'; import { PasswordUtility } from '@/services/password.utility';
import { Container } from 'typedi'; import { Container } from 'typedi';
import { InternalHooks } from '@/InternalHooks'; import { InternalHooks } from '@/InternalHooks';
import { isLdapLoginEnabled } from '@/Ldap/helpers'; import { isLdapLoginEnabled } from '@/Ldap/helpers.ee';
import { UserRepository } from '@db/repositories/user.repository'; import { UserRepository } from '@db/repositories/user.repository';
import { AuthError } from '@/errors/response-errors/auth.error'; import { AuthError } from '@/errors/response-errors/auth.error';

4
packages/cli/src/auth/methods/ldap.ts
View file

@ -1,7 +1,7 @@
import { Container } from 'typedi'; import { Container } from 'typedi';
import { InternalHooks } from '@/InternalHooks'; import { InternalHooks } from '@/InternalHooks';
import { LdapService } from '@/Ldap/ldap.service'; import { LdapService } from '@/Ldap/ldap.service.ee';
import { import {
createLdapUserOnLocalDb, createLdapUserOnLocalDb,
getUserByEmail, getUserByEmail,
@ -10,7 +10,7 @@ import {
mapLdapAttributesToUser, mapLdapAttributesToUser,
createLdapAuthIdentity, createLdapAuthIdentity,
updateLdapUserOnLocalDb, updateLdapUserOnLocalDb,
} from '@/Ldap/helpers'; } from '@/Ldap/helpers.ee';
import type { User } from '@db/entities/User'; import type { User } from '@db/entities/User';
import { EventRelay } from '@/eventbus/event-relay.service'; import { EventRelay } from '@/eventbus/event-relay.service';

2
packages/cli/src/services/frontend.service.ts
View file

@ -20,7 +20,7 @@ import { CredentialTypes } from '@/CredentialTypes';
import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials'; import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
import { License } from '@/License'; import { License } from '@/License';
import { getCurrentAuthenticationMethod } from '@/sso/ssoHelpers'; import { getCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
import { getLdapLoginLabel } from '@/Ldap/helpers'; import { getLdapLoginLabel } from '@/Ldap/helpers.ee';
import { getSamlLoginLabel } from '@/sso/saml/samlHelpers'; import { getSamlLoginLabel } from '@/sso/saml/samlHelpers';
import { getVariablesLimit } from '@/environments/variables/environmentHelpers'; import { getVariablesLimit } from '@/environments/variables/environmentHelpers';
import { import {

4
packages/cli/test/integration/commands/ldap/reset.test.ts
View file

@ -9,8 +9,8 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { CredentialsRepository } from '@db/repositories/credentials.repository'; import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository'; import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository'; import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import { getLdapSynchronizations, saveLdapSynchronization } from '@/Ldap/helpers'; import { getLdapSynchronizations, saveLdapSynchronization } from '@/Ldap/helpers.ee';
import { LdapService } from '@/Ldap/ldap.service'; import { LdapService } from '@/Ldap/ldap.service.ee';
import { Push } from '@/push'; import { Push } from '@/push';
import { Telemetry } from '@/telemetry'; import { Telemetry } from '@/telemetry';

4
packages/cli/test/integration/ldap/ldap.api.test.ts
View file

@ -8,8 +8,8 @@ import type { User } from '@db/entities/User';
import { UserRepository } from '@db/repositories/user.repository'; import { UserRepository } from '@db/repositories/user.repository';
import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository'; import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository';
import { LDAP_DEFAULT_CONFIGURATION } from '@/Ldap/constants'; import { LDAP_DEFAULT_CONFIGURATION } from '@/Ldap/constants';
import { LdapService } from '@/Ldap/ldap.service'; import { LdapService } from '@/Ldap/ldap.service.ee';
import { saveLdapSynchronization } from '@/Ldap/helpers'; import { saveLdapSynchronization } from '@/Ldap/helpers.ee';
import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers'; import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/ssoHelpers';
import { randomEmail, randomName, uniqueId } from './../shared/random'; import { randomEmail, randomName, uniqueId } from './../shared/random';

4
packages/cli/test/integration/shared/utils/testServer.ts
View file

@ -162,8 +162,8 @@ export const setupTestServer = ({
break; break;
case 'ldap': case 'ldap':
const { LdapService } = await import('@/Ldap/ldap.service'); const { LdapService } = await import('@/Ldap/ldap.service.ee');
await import('@/Ldap/ldap.controller'); await import('@/Ldap/ldap.controller.ee');
testServer.license.enable('feat:ldap'); testServer.license.enable('feat:ldap');
await Container.get(LdapService).init(); await Container.get(LdapService).init();
break; break;

2
packages/cli/test/unit/Ldap/helpers.test.ts
View file

@ -1,6 +1,6 @@
import { UserRepository } from '@/databases/repositories/user.repository'; import { UserRepository } from '@/databases/repositories/user.repository';
import { mockInstance } from '../../shared/mocking'; 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 { AuthIdentity } from '@/databases/entities/AuthIdentity';
import { User } from '@/databases/entities/User'; import { User } from '@/databases/entities/User';
import { generateNanoId } from '@/databases/utils/generators'; import { generateNanoId } from '@/databases/utils/generators';