Adapt commands to the new security model.

[lgpl/argeo-commons.git] / org.argeo.security.ui.admin / src / org / argeo / security / ui / admin / internal / UiAdminUtils.java

diff --git a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
index d1596190a906b3a7812046a13268dc833fa0a974..05858cbd4e4b290a74a0afb5821137e4e734a2de 100644 (file)
--- a/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
+++ b/org.argeo.security.ui.admin/src/org/argeo/security/ui/admin/internal/UiAdminUtils.java
@@ -6,6 +6,9 @@ import java.security.Principal;
 import javax.security.auth.Subject;
 import javax.security.auth.x500.X500Principal;
 
+import org.osgi.service.useradmin.Role;
+import org.osgi.service.useradmin.User;
+
 /** First effort to centralize back end methods used by the user admin UI */
 public class UiAdminUtils {
        public final static String getUsername() {
@@ -16,8 +19,41 @@ public class UiAdminUtils {
 
        }
 
+       public final static String getUsername(User user) {
+               String cn = getProperty(user, UserAdminConstants.KEY_CN);
+               if (isEmpty(cn))
+                       cn = getProperty(user, UserAdminConstants.KEY_UID);
+               return cn;
+       }
+
+       public final static String getProperty(Role role, String key) {
+               Object obj = role.getProperties().get(key);
+               if (obj != null)
+                       return (String) obj;
+               else
+                       return "";
+       }
+
+       public final static String getDefaultCn(String firstName, String lastName) {
+               return (firstName.trim() + " " + lastName.trim() + " ").trim();
+       }
+
        /*
         * INTERNAL METHODS: Below methods are meant to stay here and are not part
         * of a potential generic backend to manage the useradmin
         */
+       public final static boolean notNull(String string) {
+               if (string == null)
+                       return false;
+               else
+                       return !"".equals(string.trim());
+       }
+
+       public final static boolean isEmpty(String string) {
+               if (string == null)
+                       return true;
+               else
+                       return "".equals(string.trim());
+       }
+
 }
\ No newline at end of file