X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FArgeoUserDetails.java;h=6793f3c1fa1a911e3f054b5550a964e8edeb280e;hb=51cdd7c0883f0ccd756f0f5d0dc2ac97b327d25d;hp=a018826f844939b8ce53e4b74d0250f8ca23fef2;hpb=ec59a58bc368dc922a454d52eb70bb91dfd68793;p=lgpl%2Fargeo-commons.git

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 a018826f8..6793f3c1f 100644
--- 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,8 +4,10 @@ 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;
@@ -15,6 +17,7 @@ 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;
@@ -55,16 +58,20 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 	protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
 		GrantedAuthority[] arr = new GrantedAuthority[roles.size()];
 		for (int i = 0; i < roles.size(); i++) {
-			arr[i] = new GrantedAuthorityImpl(roles.get(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(UserDetails userDetails) {
+	public static SimpleArgeoUser createSimpleArgeoUser(UserDetails userDetails) {
 		if (userDetails instanceof ArgeoUser) {
-			return new BasicArgeoUser((ArgeoUser) userDetails);
+			return new SimpleArgeoUser((ArgeoUser) userDetails);
 		} else {
-			BasicArgeoUser argeoUser = new BasicArgeoUser();
+			SimpleArgeoUser argeoUser = new SimpleArgeoUser();
 			argeoUser.setUsername(userDetails.getUsername());
 			addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
 					.getRoles());
@@ -73,10 +80,14 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 	}
 
 	public static ArgeoUser asArgeoUser(Authentication authentication) {
+		if (authentication == null)
+			return null;
+
 		if (authentication.getPrincipal() instanceof ArgeoUser) {
-			return (ArgeoUser) authentication.getPrincipal();
+			return new SimpleArgeoUser((ArgeoUser) authentication
+					.getPrincipal());
 		} else {
-			BasicArgeoUser argeoUser = new BasicArgeoUser();
+			SimpleArgeoUser argeoUser = new SimpleArgeoUser();
 			argeoUser.setUsername(authentication.getName());
 			addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
 					.getRoles());