X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fjcr%2Fjackrabbit%2FJackrabbitUserAdminService.java;h=aceb5161293a50f7d144aac47f7bd85bd63cbcac;hb=5e24d4b3694253125077489270a86f545378f21e;hp=c0b4b4b1508a29def68a681eadcd873953592a3c;hpb=cb4de3944975b944c0a16ecc9cc28cc1b0470a46;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/jackrabbit/JackrabbitUserAdminService.java b/org.argeo.security.core/src/org/argeo/security/jcr/jackrabbit/JackrabbitUserAdminService.java
index c0b4b4b15..aceb51612 100644
--- a/org.argeo.security.core/src/org/argeo/security/jcr/jackrabbit/JackrabbitUserAdminService.java
+++ b/org.argeo.security.core/src/org/argeo/security/jcr/jackrabbit/JackrabbitUserAdminService.java
@@ -26,6 +26,7 @@ import org.argeo.security.NodeAuthenticationToken;
 import org.argeo.security.UserAdminService;
 import org.argeo.security.jcr.JcrSecurityModel;
 import org.argeo.security.jcr.JcrUserDetails;
+import org.argeo.security.login.GrantedAuthorityPrincipal;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.BadCredentialsException;
@@ -33,7 +34,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -280,16 +280,16 @@ public class JackrabbitUserAdminService implements UserAdminService,
 		if (username == null)
 			username = session.getUserID();
 		User user = (User) getUserManager().getAuthorizable(username);
-		ArrayList<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
+		ArrayList<GrantedAuthorityPrincipal> authorities = new ArrayList<GrantedAuthorityPrincipal>();
 		// FIXME make it more generic
-		authorities.add(new SimpleGrantedAuthority("ROLE_USER"));
+		authorities.add(new GrantedAuthorityPrincipal("ROLE_USER"));
 		Iterator<Group> groups = user.declaredMemberOf();
 		while (groups.hasNext()) {
 			Group group = groups.next();
 			// String role = "ROLE_"
 			// + group.getPrincipal().getName().toUpperCase();
 			String role = group.getPrincipal().getName();
-			authorities.add(new SimpleGrantedAuthority(role));
+			authorities.add(new GrantedAuthorityPrincipal(role));
 		}
 
 		Node userProfile = UserJcrUtils.getUserProfile(session, username);