Skip to content

Commit 0d5305a

Browse files
jgrandjajgrandja
committed
1 parent c999de7 commit 0d5305a

9 files changed

+615
-626
lines changed

‎core/src/main/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationService.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.springframework.security.oauth2.server.authorization;
1717

18+
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
1819
import org.springframework.util.Assert;
1920

2021
import java.util.List;
@@ -65,7 +66,7 @@ public OAuth2Authorization findByTokenAndTokenType(String token, TokenType token
6566

6667
private boolean hasToken(OAuth2Authorization authorization, String token, TokenType tokenType) {
6768
if (TokenType.AUTHORIZATION_CODE.equals(tokenType)) {
68-
return token.equals(authorization.getAttributes().get(TokenType.AUTHORIZATION_CODE.getValue()));
69+
return token.equals(authorization.getAttributes().get(OAuth2ParameterNames.class.getName().concat(".CODE")));
6970
} else if (TokenType.ACCESS_TOKEN.equals(tokenType)) {
7071
return authorization.getAccessToken() != null &&
7172
authorization.getAccessToken().getTokenValue().equals(token);

‎core/src/main/java/org/springframework/security/oauth2/server/authorization/OAuth2Authorization.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.springframework.security.oauth2.server.authorization;
1717

1818
import org.springframework.security.oauth2.core.OAuth2AccessToken;
19+
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
1920
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
2021
import org.springframework.util.Assert;
2122

@@ -196,7 +197,7 @@ public Builder attributes(Consumer<Map<String, Object>> attributesConsumer) {
196197
*/
197198
public OAuth2Authorization build() {
198199
Assert.hasText(this.principalName, "principalName cannot be empty");
199-
Assert.notNull(this.attributes.get(TokenType.AUTHORIZATION_CODE.getValue()), "authorization code cannot be null");
200+
Assert.notNull(this.attributes.get(OAuth2ParameterNames.class.getName().concat(".CODE")), "authorization code cannot be null");
200201

201202
OAuth2Authorization authorization = new OAuth2Authorization();
202203
authorization.registeredClientId = this.registeredClientId;

‎core/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationEndpointFilter.java

+205-157
Large diffs are not rendered by default.

‎core/src/main/java/org/springframework/security/oauth2/server/authorization/web/OAuth2AuthorizationRequestConverter.java

-55
This file was deleted.

‎core/src/test/java/org/springframework/security/oauth2/server/authorization/InMemoryOAuth2AuthorizationServiceTests.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.junit.Before;
1919
import org.junit.Test;
2020
import org.springframework.security.oauth2.core.OAuth2AccessToken;
21+
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
2122
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
2223
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
2324

@@ -61,7 +62,7 @@ public void saveWhenAuthorizationNullThenThrowIllegalArgumentException() {
6162
public void saveWhenAuthorizationProvidedThenSaved() {
6263
OAuth2Authorization expectedAuthorization = OAuth2Authorization.withRegisteredClient(REGISTERED_CLIENT)
6364
.principalName(PRINCIPAL_NAME)
64-
.attribute(TokenType.AUTHORIZATION_CODE.getValue(), AUTHORIZATION_CODE)
65+
.attribute(OAuth2ParameterNames.class.getName().concat(".CODE"), AUTHORIZATION_CODE)
6566
.build();
6667
this.authorizationService.save(expectedAuthorization);
6768

@@ -88,7 +89,7 @@ public void findByTokenAndTokenTypeWhenTokenTypeNullThenThrowIllegalArgumentExce
8889
public void findByTokenAndTokenTypeWhenTokenTypeAuthorizationCodeThenFound() {
8990
OAuth2Authorization authorization = OAuth2Authorization.withRegisteredClient(REGISTERED_CLIENT)
9091
.principalName(PRINCIPAL_NAME)
91-
.attribute(TokenType.AUTHORIZATION_CODE.getValue(), AUTHORIZATION_CODE)
92+
.attribute(OAuth2ParameterNames.class.getName().concat(".CODE"), AUTHORIZATION_CODE)
9293
.build();
9394
this.authorizationService = new InMemoryOAuth2AuthorizationService(Collections.singletonList(authorization));
9495

@@ -103,7 +104,7 @@ public void findByTokenAndTokenTypeWhenTokenTypeAccessTokenThenFound() {
103104
"access-token", Instant.now().minusSeconds(60), Instant.now());
104105
OAuth2Authorization authorization = OAuth2Authorization.withRegisteredClient(REGISTERED_CLIENT)
105106
.principalName(PRINCIPAL_NAME)
106-
.attribute(TokenType.AUTHORIZATION_CODE.getValue(), AUTHORIZATION_CODE)
107+
.attribute(OAuth2ParameterNames.class.getName().concat(".CODE"), AUTHORIZATION_CODE)
107108
.accessToken(accessToken)
108109
.build();
109110
this.authorizationService.save(authorization);

‎core/src/test/java/org/springframework/security/oauth2/server/authorization/OAuth2AuthorizationTests.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import org.junit.Test;
1919
import org.springframework.security.oauth2.core.OAuth2AccessToken;
20+
import org.springframework.security.oauth2.core.endpoint.OAuth2ParameterNames;
2021
import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
2122
import org.springframework.security.oauth2.server.authorization.client.TestRegisteredClients;
2223

@@ -84,13 +85,13 @@ public void buildWhenAllAttributesAreProvidedThenAllAttributesAreSet() {
8485
OAuth2Authorization authorization = OAuth2Authorization.withRegisteredClient(REGISTERED_CLIENT)
8586
.principalName(PRINCIPAL_NAME)
8687
.accessToken(ACCESS_TOKEN)
87-
.attribute(TokenType.AUTHORIZATION_CODE.getValue(), AUTHORIZATION_CODE)
88+
.attribute(OAuth2ParameterNames.class.getName().concat(".CODE"), AUTHORIZATION_CODE)
8889
.build();
8990

9091
assertThat(authorization.getRegisteredClientId()).isEqualTo(REGISTERED_CLIENT.getId());
9192
assertThat(authorization.getPrincipalName()).isEqualTo(PRINCIPAL_NAME);
9293
assertThat(authorization.getAccessToken()).isEqualTo(ACCESS_TOKEN);
9394
assertThat(authorization.getAttributes()).containsExactly(
94-
entry(TokenType.AUTHORIZATION_CODE.getValue(), AUTHORIZATION_CODE));
95+
entry(OAuth2ParameterNames.class.getName().concat(".CODE"), AUTHORIZATION_CODE));
9596
}
9697
}

‎core/src/test/java/org/springframework/security/oauth2/server/authorization/client/TestRegisteredClients.java

-36
Original file line numberDiff line numberDiff line change
@@ -46,40 +46,4 @@ public static RegisteredClient.Builder registeredClient2() {
4646
.scope("profile")
4747
.scope("email");
4848
}
49-
50-
public static RegisteredClient.Builder validAuthorizationGrantRegisteredClient() {
51-
return RegisteredClient.withId("valid_client_id")
52-
.clientId("valid_client")
53-
.clientSecret("valid_secret")
54-
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
55-
.clientAuthenticationMethod(ClientAuthenticationMethod.BASIC)
56-
.redirectUri("http://localhost:8080/test-application/callback")
57-
.scope("openid")
58-
.scope("profile")
59-
.scope("email");
60-
}
61-
62-
public static RegisteredClient.Builder validAuthorizationGrantClientMultiRedirectUris() {
63-
return RegisteredClient.withId("valid_client_multi_uri_id")
64-
.clientId("valid_client_multi_uri")
65-
.clientSecret("valid_secret")
66-
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
67-
.clientAuthenticationMethod(ClientAuthenticationMethod.BASIC)
68-
.redirectUri("http://localhost:8080/test-application/callback")
69-
.redirectUri("http://localhost:8080/another-test-application/callback")
70-
.scope("openid")
71-
.scope("profile")
72-
.scope("email");
73-
}
74-
75-
public static RegisteredClient.Builder validClientCredentialsGrantRegisteredClient() {
76-
return RegisteredClient.withId("valid_cc_client_id")
77-
.clientId("valid_cc_client")
78-
.clientSecret("valid_secret")
79-
.authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
80-
.clientAuthenticationMethod(ClientAuthenticationMethod.BASIC)
81-
.scope("openid")
82-
.scope("profile")
83-
.scope("email");
84-
}
8549
}

0 commit comments

Comments
 (0)