Skip to content

Commit 31ddb84

Browse files
committed
refactor(ldap-enterprise): consume LDAPEnterprise proxy directly, drop sdk LDAPEE re-export
1 parent 4b8a08e commit 31ddb84

4 files changed

Lines changed: 5 additions & 6 deletions

File tree

apps/meteor/ee/server/api/ldap.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { LDAPEnterprise as LDAPEE } from '@rocket.chat/core-services';
2+
13
import { API } from '../../../app/api/server/api';
24
import { hasPermissionAsync } from '../../../app/authorization/server/functions/hasPermission';
35
import { settings } from '../../../app/settings/server';
4-
import { LDAPEE } from '../sdk';
56

67
API.v1.addRoute(
78
'ldap.syncNow',

apps/meteor/ee/server/configuration/abac.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import { Abac } from '@rocket.chat/core-services';
1+
import { Abac, LDAPEnterprise as LDAPEE } from '@rocket.chat/core-services';
22
import { cronJobs } from '@rocket.chat/cron';
33
import { License } from '@rocket.chat/license';
44
import { Users } from '@rocket.chat/models';
55
import { isValidCron } from 'cron-validator';
66
import { Meteor } from 'meteor/meteor';
77

88
import { settings } from '../../../app/settings/server';
9-
import { LDAPEE } from '../sdk';
109

1110
const VIRTRU_PDP_SYNC_JOB = 'ABAC_Virtru_PDP_Sync';
1211

apps/meteor/ee/server/configuration/ldap.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { LDAPEnterprise as LDAPEE } from '@rocket.chat/core-services';
12
import type { IImportUser, ILDAPEntry, IUser } from '@rocket.chat/core-typings';
23
import { cronJobs } from '@rocket.chat/cron';
34
import { License } from '@rocket.chat/license';
@@ -10,7 +11,6 @@ import { callbacks } from '../../../server/lib/callbacks';
1011
import type { LDAPConnection } from '../../../server/lib/ldap/Connection';
1112
import { logger } from '../../../server/lib/ldap/Logger';
1213
import { LDAPEEManager } from '../lib/ldap/Manager';
13-
import { LDAPEE } from '../sdk';
1414
import { addSettings, ldapIntervalValuesToCronMap } from '../settings/ldap';
1515

1616
Meteor.startup(async () => {

apps/meteor/ee/server/sdk/index.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import { LDAPEnterprise, proxify } from '@rocket.chat/core-services';
1+
import { proxify } from '@rocket.chat/core-services';
22

33
import type { IInstanceService } from './types/IInstanceService';
44

5-
export const LDAPEE = LDAPEnterprise;
65
export const Instance = proxify<IInstanceService>('instance');

0 commit comments

Comments
 (0)