Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-26 22:02:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove authorities -> AuthorizationGrantAuthenticationToken constructor

Browse Source 
Fixes gh-4602
This commit is contained in:
Joe Grandja 2017-10-05 20:22:50 -04:00
parent 29d36e4d16
commit dec0bce100
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/AuthorizationCodeAuthenticationToken.java
View File

@ -15,7 +15,6 @@
*/ */
package org.springframework.security.oauth2.client.authentication; package org.springframework.security.oauth2.client.authentication;
import org.springframework.security.core.authority.AuthorityUtils;
import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.oauth2.core.endpoint.AuthorizationRequestAttributes; import org.springframework.security.oauth2.core.endpoint.AuthorizationRequestAttributes;
@ -39,7 +38,7 @@ public class AuthorizationCodeAuthenticationToken extends AuthorizationGrantAuth
public AuthorizationCodeAuthenticationToken(String authorizationCode, public AuthorizationCodeAuthenticationToken(String authorizationCode,
ClientRegistration clientRegistration, ClientRegistration clientRegistration,
AuthorizationRequestAttributes authorizationRequest) { AuthorizationRequestAttributes authorizationRequest) {
super(AuthorizationGrantType.AUTHORIZATION_CODE, AuthorityUtils.NO_AUTHORITIES); super(AuthorizationGrantType.AUTHORIZATION_CODE);
Assert.hasText(authorizationCode, "authorizationCode cannot be empty"); Assert.hasText(authorizationCode, "authorizationCode cannot be empty");
Assert.notNull(clientRegistration, "clientRegistration cannot be null"); Assert.notNull(clientRegistration, "clientRegistration cannot be null");
Assert.notNull(authorizationRequest, "authorizationRequest cannot be null"); Assert.notNull(authorizationRequest, "authorizationRequest cannot be null");

9
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/authentication/AuthorizationGrantAuthenticationToken.java
View File

@ -16,12 +16,11 @@
package org.springframework.security.oauth2.client.authentication; package org.springframework.security.oauth2.client.authentication;
import org.springframework.security.authentication.AbstractAuthenticationToken; import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.SpringSecurityCoreVersion; import org.springframework.security.core.SpringSecurityCoreVersion;
import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import java.util.Collection; import java.util.Collections;
/** /**
* Base implementation of an {@link AbstractAuthenticationToken} that holds * Base implementation of an {@link AbstractAuthenticationToken} that holds
@ -36,10 +35,8 @@ public abstract class AuthorizationGrantAuthenticationToken extends AbstractAuth
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
private final AuthorizationGrantType authorizationGrantType; private final AuthorizationGrantType authorizationGrantType;
protected AuthorizationGrantAuthenticationToken(AuthorizationGrantType authorizationGrantType, protected AuthorizationGrantAuthenticationToken(AuthorizationGrantType authorizationGrantType) {
Collection<? extends GrantedAuthority> authorities) { super(Collections.emptyList());
super(authorities);
Assert.notNull(authorizationGrantType, "authorizationGrantType cannot be null"); Assert.notNull(authorizationGrantType, "authorizationGrantType cannot be null");
this.authorizationGrantType = authorizationGrantType; this.authorizationGrantType = authorizationGrantType;
} }