X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FUserAdminUtils.java;h=84e75e32515f0f14bfc3e9907c3949c9fada3e7d;hb=HEAD;hp=3c24f98af3574627fc3f1bbe6fdf7762c7e165ba;hpb=0e533d2562def311fdd7aa71f1d0d704e466861e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
index 3c24f98af..84e75e325 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminUtils.java
@@ -6,7 +6,7 @@ import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.naming.ldap.Rdn;
 
-import org.argeo.api.acr.ldap.LdapAttrs;
+import org.argeo.api.acr.ldap.LdapAttr;
 import org.argeo.api.cms.CmsConstants;
 import org.argeo.cms.CurrentUser;
 import org.osgi.service.useradmin.Role;
@@ -14,12 +14,14 @@ import org.osgi.service.useradmin.User;
 import org.osgi.service.useradmin.UserAdmin;
 
 /** Centralise common patterns to manage users with a {@link UserAdmin} */
+@Deprecated
+// TODO use CmsRole after migrating to qualified properties
 public class UserAdminUtils {
 
 	// CURRENTUSER HELPERS
 	/** Checks if current user is the same as the passed one */
 	public static boolean isCurrentUser(User user) {
-		String userUsername = getProperty(user, LdapAttrs.DN);
+		String userUsername = getProperty(user, LdapAttr.DN);
 		LdapName userLdapName = getLdapName(userUsername);
 		LdapName selfUserName = getCurrentUserLdapName();
 		return userLdapName.equals(selfUserName);
@@ -44,7 +46,7 @@ public class UserAdminUtils {
 
 	/** Retrieves the current logged-in user common name */
 	public final static String getCommonName(User user) {
-		return getProperty(user, LdapAttrs.cn.name());
+		return getProperty(user, LdapAttr.cn.name());
 	}
 
 	// OTHER USERS HELPERS
@@ -55,8 +57,8 @@ public class UserAdminUtils {
 	public static String getUserLocalId(String dn) {
 		LdapName ldapName = getLdapName(dn);
 		Rdn last = ldapName.getRdn(ldapName.size() - 1);
-		if (last.getType().toLowerCase().equals(LdapAttrs.uid.name())
-				|| last.getType().toLowerCase().equals(LdapAttrs.cn.name()))
+		if (last.getType().toLowerCase().equals(LdapAttr.uid.name())
+				|| last.getType().toLowerCase().equals(LdapAttr.cn.name()))
 			return (String) last.getValue();
 		else
 			throw new IllegalArgumentException("Cannot retrieve user local id, non valid dn: " + dn);
@@ -73,12 +75,16 @@ public class UserAdminUtils {
 		return getUserDisplayName(user);
 	}
 
+	public static String getUserDisplayName(org.argeo.api.cms.directory.CmsRole user) {
+		return getUserDisplayName((Role) user);
+	}
+
 	public static String getUserDisplayName(Role user) {
-		String dName = getProperty(user, LdapAttrs.displayName.name());
+		String dName = getProperty(user, LdapAttr.displayName.name());
 		if (isEmpty(dName))
-			dName = getProperty(user, LdapAttrs.cn.name());
+			dName = getProperty(user, LdapAttr.cn.name());
 		if (isEmpty(dName))
-			dName = getProperty(user, LdapAttrs.uid.name());
+			dName = getProperty(user, LdapAttr.uid.name());
 		if (isEmpty(dName))
 			dName = getUserLocalId(user.getName());
 		return dName;
@@ -93,7 +99,7 @@ public class UserAdminUtils {
 		if (user == null)
 			return null;
 		else
-			return getProperty(user, LdapAttrs.mail.name());
+			return getProperty(user, LdapAttr.mail.name());
 	}
 
 	// LDAP NAMES HELPERS
@@ -126,7 +132,7 @@ public class UserAdminUtils {
 	}
 
 	/**
-	 * Simply retrieves a LDAP name from a {@link LdapAttrs.DN} with no exception
+	 * Simply retrieves a LDAP name from a {@link LdapAttr.DN} with no exception
 	 */
 	private static LdapName getLdapName(String dn) {
 		try {
@@ -151,8 +157,8 @@ public class UserAdminUtils {
 			int i = 0;
 			loop: while (i < rdns.size()) {
 				Rdn currrRdn = rdns.get(i);
-				if (LdapAttrs.uid.name().equals(currrRdn.getType()) || LdapAttrs.cn.name().equals(currrRdn.getType())
-						|| LdapAttrs.ou.name().equals(currrRdn.getType()))
+				if (LdapAttr.uid.name().equals(currrRdn.getType()) || LdapAttr.cn.name().equals(currrRdn.getType())
+						|| LdapAttr.ou.name().equals(currrRdn.getType()))
 					break loop;
 				else {
 					String currVal = (String) currrRdn.getValue();