X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FJcrUserDetails.java;h=208f85261e955b8e9f1da572741756becc25d798;hb=b3b39d5606a0c48d64a804f4aff5459ea3addc31;hp=2f7b97b7842565bc6512f584fd814d1310e68988;hpb=5ae7bd094c6b8a2f9c0b6b3460b5abe6fe0b7fff;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java b/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java
index 2f7b97b78..208f85261 100644
--- a/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java
+++ b/org.argeo.security.core/src/org/argeo/security/jcr/JcrUserDetails.java
@@ -16,6 +16,7 @@
 package org.argeo.security.jcr;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.jcr.Node;
@@ -25,12 +26,12 @@ import javax.jcr.Session;
 
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.UserJcrUtils;
-import org.springframework.security.BadCredentialsException;
-import org.springframework.security.DisabledException;
-import org.springframework.security.GrantedAuthority;
-import org.springframework.security.GrantedAuthorityImpl;
-import org.springframework.security.LockedException;
-import org.springframework.security.userdetails.User;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.LockedException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
 
 /** User details based on a user profile node. */
 public class JcrUserDetails extends User implements ArgeoNames {
@@ -44,7 +45,8 @@ public class JcrUserDetails extends User implements ArgeoNames {
 	protected JcrUserDetails(String securityWorkspace, String homePath,
 			String username, String password, boolean enabled,
 			boolean accountNonExpired, boolean credentialsNonExpired,
-			boolean accountNonLocked, GrantedAuthority[] authorities)
+			boolean accountNonLocked,
+			Collection<? extends GrantedAuthority> authorities)
 			throws IllegalArgumentException {
 		super(username, password, enabled, accountNonExpired,
 				credentialsNonExpired, accountNonLocked, authorities);
@@ -53,7 +55,8 @@ public class JcrUserDetails extends User implements ArgeoNames {
 	}
 
 	public JcrUserDetails(Node userProfile, String password,
-			GrantedAuthority[] authorities) throws RepositoryException {
+			Collection<? extends GrantedAuthority> authorities)
+			throws RepositoryException {
 		super(
 				userProfile.getProperty(ARGEO_USER_ID).getString(),
 				password,
@@ -89,7 +92,8 @@ public class JcrUserDetails extends User implements ArgeoNames {
 	 *            the granted authorities
 	 */
 	public JcrUserDetails(Session session, String username, String password,
-			GrantedAuthority[] authorities) throws RepositoryException {
+			Collection<? extends GrantedAuthority> authorities)
+			throws RepositoryException {
 		this(UserJcrUtils.getUserProfile(session, username),
 				password != null ? password : "", authorities);
 	}
@@ -114,12 +118,11 @@ public class JcrUserDetails extends User implements ArgeoNames {
 	public JcrUserDetails cloneWithNewRoles(List<String> roles) {
 		List<GrantedAuthority> authorities = new ArrayList<GrantedAuthority>();
 		for (String role : roles) {
-			authorities.add(new GrantedAuthorityImpl(role));
+			authorities.add(new SimpleGrantedAuthority(role));
 		}
 		return new JcrUserDetails(securityWorkspace, homePath, getUsername(),
 				getPassword(), isEnabled(), isAccountNonExpired(),
-				isAccountNonExpired(), isAccountNonLocked(),
-				authorities.toArray(new GrantedAuthority[authorities.size()]));
+				isAccountNonExpired(), isAccountNonLocked(), authorities);
 	}
 
 	/** Clone immutable with new password */