Merge pull request #1 from camptocamp/fixing-group-lookup

Fixing group import / lookup process when connecting (#19889)
fgravin · May 13, 2014 · f3d1e48 · f3d1e48
2 parents 2a9d003 + 2d8afd9
commit f3d1e48
Show file tree

Hide file tree

Showing 3 changed files with 171 additions and 64 deletions.
diff --git a/...c/main/java/org/fao/geonet/kernel/security/ldap/AbstractLDAPUserDetailsContextMapper.java b/...c/main/java/org/fao/geonet/kernel/security/ldap/AbstractLDAPUserDetailsContextMapper.java
@@ -39,6 +39,7 @@
 import org.fao.geonet.repository.UserGroupRepository;
 import org.fao.geonet.repository.UserRepository;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.ldap.core.DirContextAdapter;
@@ -69,10 +70,13 @@ public abstract class AbstractLDAPUserDetailsContextMapper implements
 
     private boolean createNonExistingLdapGroup = true;
 
-    private ApplicationContext applicationContext;
+    protected ApplicationContext applicationContext;
 
     protected DefaultSpringSecurityContextSource contextSource;
 
+    @Autowired
+    protected UserRepository userRepository;
+
     public void mapUserToContext(UserDetails user, DirContextAdapter ctx) {
     }