X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fauth%2FCmsUserManagerImpl.java;h=e69cda64459ac05058058b2a96d9ab317da149ae;hb=eb4324be6ac9cdff15828a21ee7d3f6ca2f19fb9;hp=84562ebd16660a860df397778421037581f9ba64;hpb=e168383bac50637131fef8c41e119db7eb2284a7;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
index 84562ebd1..e69cda644 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/auth/CmsUserManagerImpl.java
@@ -16,7 +16,9 @@ import java.util.Hashtable;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.NavigableMap;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.UUID;
 
@@ -230,7 +232,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		Map<String, String> dns = new HashMap<String, String>();
 		for (UserDirectory userDirectory : userDirectories.keySet()) {
 			Boolean readOnly = userDirectory.isReadOnly();
-			String baseDn = userDirectory.getBasePath();
+			String baseDn = userDirectory.getContext();
 
 			if (onlyWritable && readOnly)
 				continue;
@@ -245,7 +247,7 @@ public class CmsUserManagerImpl implements CmsUserManager {
 	}
 
 	public Set<UserDirectory> getUserDirectories() {
-		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getBasePath().compareTo(o2.getBasePath()));
+		TreeSet<UserDirectory> res = new TreeSet<>((o1, o2) -> o1.getContext().compareTo(o2.getContext()));
 		res.addAll(userDirectories.keySet());
 		return res;
 	}
@@ -438,6 +440,20 @@ public class CmsUserManagerImpl implements CmsUserManager {
 		}
 	}
 
+	@Override
+	public UserDirectory getDirectory(Role user) {
+		String name = user.getName();
+		NavigableMap<String, UserDirectory> possible = new TreeMap<>();
+		for (UserDirectory userDirectory : userDirectories.keySet()) {
+			if (name.endsWith(userDirectory.getContext())) {
+				possible.put(userDirectory.getContext(), userDirectory);
+			}
+		}
+		if (possible.size() == 0)
+			throw new IllegalStateException("No user directory found for user " + name);
+		return possible.lastEntry().getValue();
+	}
+
 //	public User createUserFromPerson(Node person) {
 //		String email = JcrUtils.get(person, LdapAttrs.mail.property());
 //		String dn = buildDefaultDN(email, Role.USER);