This is an automated email from the git hooks/post-receive script. New commit to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit beaafef93c8022ab4e5be7e08395e335fa005a04 Author: jcouteau <couteau@codelutin.com> Date: Fri Jan 15 09:56:42 2021 +0100 :bug: fixes #11143 : Prise en compte du baseDN de la configuration lors de la mise à jour LDAP --- .../faxtomail/services/service/LdapServiceImpl.java | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java index 80567837..8e51e744 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/LdapServiceImpl.java @@ -78,7 +78,7 @@ public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapServ Map<String, FaxToMailUser> userCache = new HashMap<>(); // get all groups - String groupsBaseDN = "OU=Mac-Groupe,DC=mac-groupe,DC=net"; + String groupsBaseDN = getApplicationConfig().getLdapBaseDn(); String groupsFilter = "(objectCategory=CN=Group,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net)"; SearchResult groupsResult = connection.search(groupsBaseDN, SearchScope.SUB, groupsFilter); List<SearchResultEntry> groupEntries = groupsResult.getSearchEntries(); @@ -96,7 +96,7 @@ public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapServ } // get all users ( - String usersBaseDN = "OU=Mac-Groupe,DC=mac-groupe,DC=net"; + String usersBaseDN = getApplicationConfig().getLdapBaseDn(); String usersFilter = "(objectCategory=CN=Person,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net)"; // on recupere d'abord les organisationUnit pour fractionner les requettes // sinon au dela de 1000 resultats ca veux plus @@ -409,11 +409,8 @@ public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapServ getApplicationConfig().getLdapPassword()); if (connection.isConnected()) { - FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); - FaxToMailUserGroupTopiaDao faxtomailUserGroupDao = getPersistenceContext().getFaxToMailUserGroupDao(); - // get all users ( - String usersBaseDN = "OU=Mac-Groupe,DC=mac-groupe,DC=net"; + String usersBaseDN = getApplicationConfig().getLdapBaseDn(); String usersFilter = "(objectCategory=CN=Person,CN=Schema,CN=Configuration,DC=mac-groupe,DC=net)"; // on recupere d'abord les organisationUnit pour fractionner les requettes @@ -449,14 +446,6 @@ public class LdapServiceImpl extends FaxToMailServiceSupport implements LdapServ return result; } - public List<FaxToMailUser> getUsersForGroup(FaxToMailUserGroup group){ - FaxToMailUserTopiaDao faxtomailUserDao = getPersistenceContext().getFaxToMailUserDao(); - - List<FaxToMailUser> users = faxtomailUserDao.forUserGroupsContains(group).findAll(); - return users; - - } - public static <T> List<List<T>> partition(List<T> list, int size) { if (list == null) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.