Skip to content

Commit dec0bce

Browse files
committed
Remove authorities -> AuthorizationGrantAuthenticationToken constructor
Fixes gh-4602
1 parent 29d36e4 commit dec0bce

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
*/
1616
package org.springframework.security.oauth2.client.authentication;
1717

18-
import org.springframework.security.core.authority.AuthorityUtils;
1918
import org.springframework.security.oauth2.client.registration.ClientRegistration;
2019
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2120
import org.springframework.security.oauth2.core.endpoint.AuthorizationRequestAttributes;
@@ -39,7 +38,7 @@ public class AuthorizationCodeAuthenticationToken extends AuthorizationGrantAuth
3938
public AuthorizationCodeAuthenticationToken(String authorizationCode,
4039
ClientRegistration clientRegistration,
4140
AuthorizationRequestAttributes authorizationRequest) {
42-
super(AuthorizationGrantType.AUTHORIZATION_CODE, AuthorityUtils.NO_AUTHORITIES);
41+
super(AuthorizationGrantType.AUTHORIZATION_CODE);
4342
Assert.hasText(authorizationCode, "authorizationCode cannot be empty");
4443
Assert.notNull(clientRegistration, "clientRegistration cannot be null");
4544
Assert.notNull(authorizationRequest, "authorizationRequest cannot be null");

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
package org.springframework.security.oauth2.client.authentication;
1717

1818
import org.springframework.security.authentication.AbstractAuthenticationToken;
19-
import org.springframework.security.core.GrantedAuthority;
2019
import org.springframework.security.core.SpringSecurityCoreVersion;
2120
import org.springframework.security.oauth2.core.AuthorizationGrantType;
2221
import org.springframework.util.Assert;
2322

24-
import java.util.Collection;
23+
import java.util.Collections;
2524

2625
/**
2726
* Base implementation of an {@link AbstractAuthenticationToken} that holds
@@ -36,10 +35,8 @@ public abstract class AuthorizationGrantAuthenticationToken extends AbstractAuth
3635
private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID;
3736
private final AuthorizationGrantType authorizationGrantType;
3837

39-
protected AuthorizationGrantAuthenticationToken(AuthorizationGrantType authorizationGrantType,
40-
Collection<? extends GrantedAuthority> authorities) {
41-
42-
super(authorities);
38+
protected AuthorizationGrantAuthenticationToken(AuthorizationGrantType authorizationGrantType) {
39+
super(Collections.emptyList());
4340
Assert.notNull(authorizationGrantType, "authorizationGrantType cannot be null");
4441
this.authorizationGrantType = authorizationGrantType;
4542
}

0 commit comments

Comments
 (0)