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=1785357d589a253af76012de5ca29fc11a03fe97;hb=dc6f911c680574a9b57c34dcf515ac8f9aa808da;hp=10f850444894e08a10aa704eb4e88d986f85a975;hpb=490d9907457c43acfa965e7979ce5974bc1ba6ca;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 10f850444..1785357d5 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
@@ -19,15 +19,18 @@ package org.argeo.security.core;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 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.argeo.security.nature.SimpleUserNature;
 import org.springframework.security.Authentication;
 import org.springframework.security.GrantedAuthority;
 import org.springframework.security.GrantedAuthorityImpl;
+import org.springframework.security.context.SecurityContextHolder;
 import org.springframework.security.userdetails.User;
 import org.springframework.security.userdetails.UserDetails;
 
@@ -35,14 +38,14 @@ 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 Map<String, UserNature> userNatures;
 	private final List<String> roles;
 
-	public ArgeoUserDetails(String username, List<UserNature> userNatures,
-			String password, GrantedAuthority[] authorities)
-			throws IllegalArgumentException {
+	public ArgeoUserDetails(String username,
+			Map<String, UserNature> userNatures, String password,
+			GrantedAuthority[] authorities) throws IllegalArgumentException {
 		super(username, password, true, true, true, true, authorities);
-		this.userNatures = Collections.unmodifiableList(userNatures);
+		this.userNatures = Collections.unmodifiableMap(userNatures);
 
 		// Roles
 		this.roles = Collections.unmodifiableList(addAuthoritiesToRoles(
@@ -54,12 +57,13 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 				.getPassword(), rolesToAuthorities(argeoUser.getRoles()));
 	}
 
-	public List<UserNature> getUserNatures() {
+	public Map<String, UserNature> getUserNatures() {
 		return userNatures;
 	}
 
-	public void updateUserNatures(List<UserNature> userNaturesData) {
-		UserNature.updateUserNaturesWithCheck(userNatures, userNaturesData);
+	public void updateUserNatures(Map<String, UserNature> userNaturesData) {
+		SimpleArgeoUser
+				.updateUserNaturesWithCheck(userNatures, userNaturesData);
 	}
 
 	public List<String> getRoles() {
@@ -67,7 +71,7 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 	}
 
 	/** The provided list, for chaining using {@link Collections} */
-	protected static List<String> addAuthoritiesToRoles(
+	public static List<String> addAuthoritiesToRoles(
 			GrantedAuthority[] authorities, List<String> roles) {
 		for (GrantedAuthority authority : authorities) {
 			roles.add(authority.getAuthority());
@@ -75,7 +79,7 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 		return roles;
 	}
 
-	protected static GrantedAuthority[] rolesToAuthorities(List<String> roles) {
+	public 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);
@@ -93,25 +97,34 @@ public class ArgeoUserDetails extends User implements ArgeoUser {
 		} else {
 			SimpleArgeoUser argeoUser = new SimpleArgeoUser();
 			argeoUser.setUsername(userDetails.getUsername());
-			addAuthoritiesToRoles(userDetails.getAuthorities(), argeoUser
-					.getRoles());
+			addAuthoritiesToRoles(userDetails.getAuthorities(),
+					argeoUser.getRoles());
 			return argeoUser;
 		}
 	}
 
+	/** Creates an argeo user based on spring authentication */
 	public static ArgeoUser asArgeoUser(Authentication authentication) {
 		if (authentication == null)
 			return null;
 
 		if (authentication.getPrincipal() instanceof ArgeoUser) {
-			return new SimpleArgeoUser((ArgeoUser) authentication
-					.getPrincipal());
+			return new SimpleArgeoUser(
+					(ArgeoUser) authentication.getPrincipal());
 		} else {
 			SimpleArgeoUser argeoUser = new SimpleArgeoUser();
 			argeoUser.setUsername(authentication.getName());
-			addAuthoritiesToRoles(authentication.getAuthorities(), argeoUser
-					.getRoles());
+			addAuthoritiesToRoles(authentication.getAuthorities(),
+					argeoUser.getRoles());
 			return argeoUser;
 		}
 	}
+
+	/** The Spring security context as an argeo user */
+	public static ArgeoUser securityContextUser() {
+		Authentication authentication = SecurityContextHolder.getContext()
+				.getAuthentication();
+		ArgeoUser argeoUser = ArgeoUserDetails.asArgeoUser(authentication);
+		return argeoUser;
+	}
 }