Introduce Argeo user edition

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

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
index 1948d1252ae24a8d92cb6d81106d524e875bd507..1785357d589a253af76012de5ca29fc11a03fe97 100644 (file)
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/core/ArgeoUserDetails.java
@@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory;
 import org.argeo.security.ArgeoUser;
 import org.argeo.security.SimpleArgeoUser;
 import org.argeo.security.UserNature;
+import org.argeo.security.nature.SimpleUserNature;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
@@ -40,9 +41,9 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
        private final Map<String, UserNature> userNatures;
        private final List<String> roles;
 
-       public ArgeoUserDetails(String username, Map<String, UserNature> userNatures,
-                       String password, GrantedAuthority[] authorities)
-                       throws IllegalArgumentException {
+       public ArgeoUserDetails(String username,
+                       Map<String, UserNature> userNatures, String password,
+                       GrantedAuthority[] authorities) throws IllegalArgumentException {
                super(username, password, true, true, true, true, authorities);
                this.userNatures = Collections.unmodifiableMap(userNatures);
 
@@ -61,7 +62,8 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
        }
 
        public void updateUserNatures(Map<String, UserNature> userNaturesData) {
-               UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+               SimpleArgeoUser
+                               .updateUserNaturesWithCheck(userNatures, userNaturesData);
        }
 
        public List<String> getRoles() {
@@ -69,7 +71,7 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
        }
 
        /** The provided list, for chaining using {@link Collections} */
-       protected static List<String> addAuthoritiesToRoles(
+       public static List<String> addAuthoritiesToRoles(
                        GrantedAuthority[] authorities, List<String> roles) {
                for (GrantedAuthority authority : authorities) {
                        roles.add(authority.getAuthority());
@@ -77,7 +79,7 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
                return roles;
        }
 
-       protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
+       public static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
                GrantedAuthority[] arr = new GrantedAuthority[roles.size()];
                for (int i = 0; i < roles.size(); i++) {
                        String role = roles.get(i);