Fix various issues:

[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 b20bac447eaf9b5c3e4a6554498b0bfb668af5fb..a05dd1245399e931567cc56a9c0dc19a54c6c762 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
@@ -4,16 +4,20 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.argeo.security.ArgeoUser;
-import org.argeo.security.BasicArgeoUser;
+import org.argeo.security.SimpleArgeoUser;
 import org.argeo.security.UserNature;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
+import org.springframework.security.GrantedAuthorityImpl;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 
 public class ArgeoUserDetails extends User implements ArgeoUser {
        private static final long serialVersionUID = 1L;
+       private final static Log log = LogFactory.getLog(ArgeoUserDetails.class);
 
        private final List<UserNature> userNatures;
        private final List<String> roles;
@@ -29,6 +33,11 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
                                getAuthorities(), new ArrayList<String>()));
        }
 
+       public ArgeoUserDetails(ArgeoUser argeoUser) {
+               this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser
+                               .getPassword(), rolesToAuthorities(argeoUser.getRoles()));
+       }
+
        public List<UserNature> getUserNatures() {
                return userNatures;
        }
@@ -46,20 +55,40 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
                return roles;
        }
 
-       public static BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
-               BasicArgeoUser argeoUser = new BasicArgeoUser();
-               argeoUser.setUsername(userDetails.getUsername());
-               addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
-                               .getRoles());
-               return argeoUser;
+       protected 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);
+                       if (log.isTraceEnabled())
+                               log.debug("Convert role " + role + " to authority (i=" + i
+                                               + ")");
+                       arr[i] = new GrantedAuthorityImpl(role);
+               }
+               return arr;
        }
 
-       public static BasicArgeoUser createBasicArgeoUser(
-                       Authentication authentication) {
-               BasicArgeoUser argeoUser = new BasicArgeoUser();
-               argeoUser.setUsername(authentication.getName());
-               addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
-                               .getRoles());
-               return argeoUser;
+       public static SimpleArgeoUser createSimpleArgeoUser(UserDetails userDetails) {
+               if (userDetails instanceof ArgeoUser) {
+                       return new SimpleArgeoUser((ArgeoUser) userDetails);
+               } else {
+                       SimpleArgeoUser argeoUser = new SimpleArgeoUser();
+                       argeoUser.setUsername(userDetails.getUsername());
+                       addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
+                                       .getRoles());
+                       return argeoUser;
+               }
+       }
+
+       public static ArgeoUser asArgeoUser(Authentication authentication) {
+               if (authentication.getPrincipal() instanceof ArgeoUser) {
+                       return new SimpleArgeoUser((ArgeoUser) authentication
+                                       .getPrincipal());
+               } else {
+                       SimpleArgeoUser argeoUser = new SimpleArgeoUser();
+                       argeoUser.setUsername(authentication.getName());
+                       addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
+                                       .getRoles());
+                       return argeoUser;
+               }
        }
 }