X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FMatchingAuthenticationProvider.java;fp=org.argeo.security.core%2Fsrc%2Forg%2Fargeo%2Fsecurity%2Fcore%2FMatchingAuthenticationProvider.java;h=8fa3f0d6d6140d4fb305f3cd01ee52949c203623;hb=b3b39d5606a0c48d64a804f4aff5459ea3addc31;hp=0471151a219c27be7e51462627b3de459791b40e;hpb=5ae7bd094c6b8a2f9c0b6b3460b5abe6fe0b7fff;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java b/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java index 0471151a2..8fa3f0d6d 100644 --- a/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java +++ b/org.argeo.security.core/src/org/argeo/security/core/MatchingAuthenticationProvider.java @@ -21,14 +21,14 @@ import java.util.List; import java.util.Properties; import org.springframework.core.io.Resource; -import org.springframework.security.AuthenticationException; -import org.springframework.security.BadCredentialsException; -import org.springframework.security.GrantedAuthority; -import org.springframework.security.GrantedAuthorityImpl; -import org.springframework.security.providers.UsernamePasswordAuthenticationToken; -import org.springframework.security.providers.dao.AbstractUserDetailsAuthenticationProvider; -import org.springframework.security.userdetails.User; -import org.springframework.security.userdetails.UserDetails; +import org.springframework.security.authentication.BadCredentialsException; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.authentication.dao.AbstractUserDetailsAuthenticationProvider; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.GrantedAuthorityImpl; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; /** @deprecated */ @Deprecated @@ -72,15 +72,8 @@ public class MatchingAuthenticationProvider extends List grantedAuthorities = new ArrayList(); for (String role : defaultRoles) grantedAuthorities.add(new GrantedAuthorityImpl(role)); - return new User( - username, - value, - true, - true, - true, - true, - grantedAuthorities - .toArray(new GrantedAuthority[grantedAuthorities.size()])); + return new User(username, value, true, true, true, true, + grantedAuthorities); } public void setMapping(Resource mapping) {