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=7ec9ce74ee768bd780f8b9e58505e10bbf23d55f;hb=12f0ab4fa622e3507570f5dcbe586c05131a0050;hp=a018826f844939b8ce53e4b74d0250f8ca23fef2;hpb=408ce95ae08cd3115bafaf82389258b7057359b8;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..7ec9ce74e 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,7 +5,7 @@ import java.util.Collections;
 import java.util.List;
 
 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;
@@ -60,11 +60,11 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 		return arr;
 	}
 
-	public static BasicArgeoUser createBasicArgeoUser(UserDetails userDetails) {
+	public static SimpleArgeoUser createBasicArgeoUser(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());
@@ -74,9 +74,9 @@ public class ArgeoUserDetails extends User implements 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());