X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fcore%2FArgeoUserDetails.java;h=1080eb82c016c909a37f7c476588628bbc353c6a;hp=b20bac447eaf9b5c3e4a6554498b0bfb668af5fb;hb=8220766ace9f3bde3a9d69890cd8307c34fe8ddd;hpb=a5f40d4dd3faeffbd0801771f778e887df93b103

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 b20bac447..1080eb82c 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
@@ -9,6 +9,7 @@ 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;
 
@@ -29,6 +30,12 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 				getAuthorities(), new ArrayList<String>()));
 	}
 
+	public ArgeoUserDetails(ArgeoUser argeoUser) {
+		// TODO: password
+		this(argeoUser.getUsername(), argeoUser.getUserNatures(), null,
+				rolesToAuthorities(argeoUser.getRoles()));
+	}
+
 	public List<UserNature> getUserNatures() {
 		return userNatures;
 	}
@@ -46,6 +53,14 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 		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) {
 		BasicArgeoUser argeoUser = new BasicArgeoUser();
 		argeoUser.setUsername(userDetails.getUsername());
@@ -54,12 +69,15 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 		return argeoUser;
 	}
 
-	public static BasicArgeoUser createBasicArgeoUser(
-			Authentication authentication) {
-		BasicArgeoUser argeoUser = new BasicArgeoUser();
-		argeoUser.setUsername(authentication.getName());
-		addAuthoritiesToRoles(authentication.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;
+		}
 	}
 }