X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FArgeoUserDetails.java;h=a018826f844939b8ce53e4b74d0250f8ca23fef2;hb=ec59a58bc368dc922a454d52eb70bb91dfd68793;hp=1f82ee949ae639ac837a95472f1227f1de90b3d7;hpb=62a87e0195f69747aa5168ebecfebd8626442ba8;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 1f82ee949..a018826f8 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
@@ -5,9 +5,13 @@ import java.util.Collections;
 import java.util.List;
 
 import org.argeo.security.ArgeoUser;
+import org.argeo.security.BasicArgeoUser;
 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;
@@ -20,13 +24,15 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 			throws IllegalArgumentException {
 		super(username, password, true, true, true, true, authorities);
 		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() {
@@ -36,4 +42,45 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 	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++) {
+			arr[i] = new GrantedAuthorityImpl(roles.get(i));
+		}
+		return arr;
+	}
+
+	public static BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
+		if (userDetails instanceof ArgeoUser) {
+			return new BasicArgeoUser((ArgeoUser) userDetails);
+		} else {
+			BasicArgeoUser argeoUser = new BasicArgeoUser();
+			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();
+		} else {
+			BasicArgeoUser argeoUser = new BasicArgeoUser();
+			argeoUser.setUsername(authentication.getName());
+			addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
+					.getRoles());
+			return argeoUser;
+		}
+	}
 }