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=4a6882af432a666acb470b7c9aa3a5c9c816fadb;hpb=7c9ba14fbe8cd771af9d205c7988507c1dd7abb6;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 4a6882af4..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,36 +4,94 @@ 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.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> userInfos;
+	private final List<UserNature> userNatures;
 	private final List<String> roles;
 
-	public ArgeoUserDetails(String username, List<UserNature> userInfos,
+	public ArgeoUserDetails(String username, List<UserNature> userNatures,
 			String password, GrantedAuthority[] authorities)
 			throws IllegalArgumentException {
 		super(username, password, true, true, true, true, authorities);
-		this.userInfos = Collections.unmodifiableList(userInfos);
-		
+		this.userNatures = Collections.unmodifiableList(userNatures);
+
 		// Roles
-		List<String> roles = new ArrayList<String>();
-		for (GrantedAuthority authority : getAuthorities()) {
-			roles.add(authority.getAuthority());
-		}
-		this.roles = Collections.unmodifiableList(roles);
+		this.roles = Collections.unmodifiableList(addAuthoritiesToRoles(
+				getAuthorities(), new ArrayList<String>()));
+	}
+
+	public ArgeoUserDetails(ArgeoUser argeoUser) {
+		this(argeoUser.getUsername(), argeoUser.getUserNatures(), argeoUser
+				.getPassword(), rolesToAuthorities(argeoUser.getRoles()));
 	}
 
 	public List<UserNature> getUserNatures() {
-		return userInfos;
+		return userNatures;
 	}
 
 	public List<String> getRoles() {
 		return roles;
 	}
+
+	/** The provided list, for chaining using {@link Collections} */
+	protected static List<String> addAuthoritiesToRoles(
+			GrantedAuthority[] authorities, List<String> roles) {
+		for (GrantedAuthority authority : authorities) {
+			roles.add(authority.getAuthority());
+		}
+		return roles;
+	}
+
+	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 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 == null)
+			return null;
+
+		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;
+		}
+	}
 }