Make security UI more robust

[lgpl/argeo-commons.git] / security / runtime / org.argeo.security.core / src / main / java / org / argeo / security / SimpleArgeoUser.java

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java
index 9dd3d694343b896ae5755f970ca7ffce277e50bf..ca7229c2b27cef7770295f84500ba54d98ccd2b8 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/SimpleArgeoUser.java
@@ -18,14 +18,22 @@ package org.argeo.security;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
+import org.argeo.ArgeoException;
+
+/**
+ * Read-write implementation of an Argeo user. Typically initialized with a
+ * generic instance (read-only9 in order to modify a user.
+ */
 public class SimpleArgeoUser implements ArgeoUser, Serializable {
        private static final long serialVersionUID = 1L;
 
        private String username;
        private String password;
-       private List<UserNature> userNatures = new ArrayList<UserNature>();
+       private Map<String, UserNature> userNatures = new HashMap<String, UserNature>();
        private List<String> roles = new ArrayList<String>();
 
        public SimpleArgeoUser() {
@@ -35,16 +43,54 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
        public SimpleArgeoUser(ArgeoUser argeoUser) {
                username = argeoUser.getUsername();
                password = argeoUser.getPassword();
-               userNatures = new ArrayList<UserNature>(argeoUser.getUserNatures());
+               userNatures = new HashMap<String, UserNature>(
+                               argeoUser.getUserNatures());
                roles = new ArrayList<String>(argeoUser.getRoles());
        }
 
-       public List<UserNature> getUserNatures() {
+       public Map<String, UserNature> getUserNatures() {
                return userNatures;
        }
 
-       public void updateUserNatures(List<UserNature> userNaturesData) {
-               UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+       public void updateUserNatures(Map<String, UserNature> userNaturesData) {
+               updateUserNaturesWithCheck(userNatures, userNaturesData);
+       }
+
+       public static void updateUserNaturesWithCheck(
+                       Map<String, UserNature> userNatures,
+                       Map<String, UserNature> userNaturesData) {
+               // checks consistency
+               if (userNatures.size() != userNaturesData.size())
+                       throw new ArgeoException(
+                                       "It is forbidden to add or remove user natures via this method");
+
+               for (String type : userNatures.keySet()) {
+                       if (!userNaturesData.containsKey(type))
+                               throw new ArgeoException(
+                                               "Could not find a user nature of type " + type);
+               }
+
+               // for (int i = 0; i < userNatures.size(); i++) {
+               // String type = userNatures.get(i).getType();
+               // boolean found = false;
+               // for (int j = 0; j < userNatures.size(); j++) {
+               // String newType = userNaturesData.get(j).getType();
+               // if (type.equals(newType))
+               // found = true;
+               // }
+               // if (!found)
+               // throw new ArgeoException(
+               // "Could not find a user nature of type " + type);
+               // }
+
+               for (String key : userNatures.keySet()) {
+                       userNatures.put(key, userNaturesData.get(key));
+               }
+       }
+
+       @Override
+       public String toString() {
+               return username;
        }
 
        public List<String> getRoles() {
@@ -59,7 +105,7 @@ public class SimpleArgeoUser implements ArgeoUser, Serializable {
                this.username = username;
        }
 
-       public void setUserNatures(List<UserNature> userNatures) {
+       public void setUserNatures(Map<String, UserNature> userNatures) {
                this.userNatures = userNatures;
        }