feat: Add "Enable Users" option to "Sync User Active State" LDAP setting (#32173)

pull/27241/head^2
Matheus Barbosa Silva 2 years ago committed by GitHub
parent 4f5deef0aa
commit c4e58afd8b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      .changeset/swift-readers-speak.md
  2. 4
      apps/meteor/ee/server/lib/ldap/Manager.ts
  3. 1
      apps/meteor/ee/server/settings/ldap.ts
  4. 1
      packages/i18n/src/locales/en.i18n.json
  5. 1
      packages/i18n/src/locales/pt-BR.i18n.json

@ -0,0 +1,6 @@
---
"@rocket.chat/meteor": minor
"@rocket.chat/i18n": minor
---
Added "Enable Users" option under "Sync User Active State" LDAP setting to allow only re-enabling users found on LDAP background sync

@ -531,6 +531,10 @@ export class LDAPEEManager extends LDAPManager {
return;
}
if (syncUserState === 'enable' && deleted) {
return;
}
userData.deleted = deleted;
logger.info(`${deleted ? 'Deactivating' : 'Activating'} user ${userData.name} (${userData.username})`);
}

@ -97,6 +97,7 @@ export function addSettings(): Promise<void> {
values: [
{ key: 'none', i18nLabel: 'LDAP_Sync_User_Active_State_Nothing' },
{ key: 'disable', i18nLabel: 'LDAP_Sync_User_Active_State_Disable' },
{ key: 'enable', i18nLabel: 'LDAP_Sync_User_Active_State_Enable' },
{ key: 'both', i18nLabel: 'LDAP_Sync_User_Active_State_Both' },
],
i18nDescription: 'LDAP_Sync_User_Active_State_Description',

@ -3051,6 +3051,7 @@
"LDAP_Sync_User_Active_State_Both": "Enable and Disable Users",
"LDAP_Sync_User_Active_State_Description": "Determine if users should be enabled or disabled on Rocket.Chat based on the LDAP status. The 'pwdAccountLockedTime' attribute will be used to determine if the user is disabled.",
"LDAP_Sync_User_Active_State_Disable": "Disable Users",
"LDAP_Sync_User_Active_State_Enable": "Enable Users",
"LDAP_Sync_User_Active_State_Nothing": "Do Nothing",
"LDAP_Sync_User_Avatar": "Sync User Avatar",
"LDAP_Sync_User_Data_Roles": "Sync LDAP Groups",

@ -2574,6 +2574,7 @@
"LDAP_Sync_User_Active_State_Both": "Habilitar e desabilitar usuários",
"LDAP_Sync_User_Active_State_Description": "Determina se usuários devem ser habilitados ou desabilitados no Rocket.Chat baseado nos status do LDAP. O atributo 'pwdAccountLockedTime' será usado para determinar se o usuário está desativado.",
"LDAP_Sync_User_Active_State_Disable": "Desabilitar usuários",
"LDAP_Sync_User_Active_State_Enable": "Habilitar usuários",
"LDAP_Sync_User_Active_State_Nothing": "Não fazer nada",
"LDAP_Sync_User_Avatar": "Sincronizar avatar do usuário",
"LDAP_Sync_User_Data_Roles": "Sincronizar grupos do LDAP",

Loading…
Cancel
Save