X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FArgeoUserDetails.java;h=a05dd1245399e931567cc56a9c0dc19a54c6c762;hb=54ca073308e726107a5e59b50ce875ebeb43b965;hp=0b8368c6f8de29354850336aa82131b9d762bd4b;hpb=f3ff1f46c8a04c4a60bbccd44e16d5880b386229;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 0b8368c6f..a05dd1245 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;
@@ -31,8 +34,8 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 	}
 
 	public ArgeoUserDetails(ArgeoUser argeoUser) {
-		this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser.getPassword(),
-				rolesToAuthorities(argeoUser.getRoles()));
+		this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser
+				.getPassword(), rolesToAuthorities(argeoUser.getRoles()));
 	}
 
 	public List<UserNature> getUserNatures() {
@@ -55,24 +58,33 @@ 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) {
-		BasicArgeoUser argeoUser = new BasicArgeoUser();
-		argeoUser.setUsername(userDetails.getUsername());
-		addAuthoritiesToRoles(userDetails.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 (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());