Skip to content

Commit e3d15d3

Browse files
bibibiu2017bibibiu2017
committed
fixed: fixed client post and basic authorization not working
1 parent 687f03f commit e3d15d3

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/ClientSecretBasicAuthenticationConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public Authentication convert(HttpServletRequest request) {
8686
throw new OAuth2AuthenticationException(new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST), ex);
8787
}
8888

89-
return new OAuth2ClientAuthenticationToken(clientID, clientSecret, ClientAuthenticationMethod.BASIC,
89+
return new OAuth2ClientAuthenticationToken(clientID, clientSecret, ClientAuthenticationMethod.CLIENT_SECRET_BASIC,
9090
extractAdditionalParameters(request));
9191
}
9292

‎oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/web/ClientSecretPostAuthenticationConverter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public Authentication convert(HttpServletRequest request) {
6767
throw new OAuth2AuthenticationException(new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST));
6868
}
6969

70-
return new OAuth2ClientAuthenticationToken(clientId, clientSecret, ClientAuthenticationMethod.POST,
70+
return new OAuth2ClientAuthenticationToken(clientId, clientSecret, ClientAuthenticationMethod.CLIENT_SECRET_POST,
7171
extractAdditionalParameters(request));
7272
}
7373

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/authentication/OAuth2ClientAuthenticationProviderTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public void authenticateWhenInvalidClientSecretThenThrowOAuth2AuthenticationExce
139139
.thenReturn(registeredClient);
140140

141141
OAuth2ClientAuthenticationToken authentication = new OAuth2ClientAuthenticationToken(
142-
registeredClient.getClientId(), registeredClient.getClientSecret() + "-invalid", ClientAuthenticationMethod.BASIC, null);
142+
registeredClient.getClientId(), registeredClient.getClientSecret() + "-invalid", ClientAuthenticationMethod.CLIENT_SECRET_BASIC, null);
143143
assertThatThrownBy(() -> this.authenticationProvider.authenticate(authentication))
144144
.isInstanceOf(OAuth2AuthenticationException.class)
145145
.extracting(ex -> ((OAuth2AuthenticationException) ex).getError())
@@ -170,7 +170,7 @@ public void authenticateWhenValidCredentialsThenAuthenticated() {
170170
.thenReturn(registeredClient);
171171

172172
OAuth2ClientAuthenticationToken authentication = new OAuth2ClientAuthenticationToken(
173-
registeredClient.getClientId(), registeredClient.getClientSecret(), ClientAuthenticationMethod.BASIC, null);
173+
registeredClient.getClientId(), registeredClient.getClientSecret(), ClientAuthenticationMethod.CLIENT_SECRET_BASIC, null);
174174
OAuth2ClientAuthenticationToken authenticationResult =
175175
(OAuth2ClientAuthenticationToken) this.authenticationProvider.authenticate(authentication);
176176

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public static RegisteredClient.Builder registeredClient() {
3333
.clientSecret("secret")
3434
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
3535
.authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN)
36-
.clientAuthenticationMethod(ClientAuthenticationMethod.BASIC)
36+
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
3737
.redirectUri("https://example.com")
3838
.scope("scope1");
3939
}
@@ -46,8 +46,8 @@ public static RegisteredClient.Builder registeredClient2() {
4646
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
4747
.authorizationGrantType(AuthorizationGrantType.REFRESH_TOKEN)
4848
.authorizationGrantType(AuthorizationGrantType.CLIENT_CREDENTIALS)
49-
.clientAuthenticationMethod(ClientAuthenticationMethod.BASIC)
50-
.clientAuthenticationMethod(ClientAuthenticationMethod.POST)
49+
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_BASIC)
50+
.clientAuthenticationMethod(ClientAuthenticationMethod.CLIENT_SECRET_POST)
5151
.redirectUri("https://example.com")
5252
.scope("scope1")
5353
.scope("scope2");

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/ClientSecretBasicAuthenticationConverterTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void convertWhenAuthorizationHeaderBasicWithValidCredentialsThenReturnCli
9999
OAuth2ClientAuthenticationToken authentication = (OAuth2ClientAuthenticationToken) this.converter.convert(request);
100100
assertThat(authentication.getPrincipal()).isEqualTo("clientId");
101101
assertThat(authentication.getCredentials()).isEqualTo("secret");
102-
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.BASIC);
102+
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.CLIENT_SECRET_BASIC);
103103
}
104104

105105
@Test
@@ -109,7 +109,7 @@ public void convertWhenConfidentialClientWithPkceParametersThenAdditionalParamet
109109
OAuth2ClientAuthenticationToken authentication = (OAuth2ClientAuthenticationToken) this.converter.convert(request);
110110
assertThat(authentication.getPrincipal()).isEqualTo("clientId");
111111
assertThat(authentication.getCredentials()).isEqualTo("secret");
112-
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.BASIC);
112+
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.CLIENT_SECRET_BASIC);
113113
assertThat(authentication.getAdditionalParameters())
114114
.containsOnly(
115115
entry(OAuth2ParameterNames.GRANT_TYPE, AuthorizationGrantType.AUTHORIZATION_CODE.getValue()),

‎oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/ClientSecretPostAuthenticationConverterTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void convertWhenPostWithValidCredentialsThenReturnClientAuthenticationTok
8686
OAuth2ClientAuthenticationToken authentication = (OAuth2ClientAuthenticationToken) this.converter.convert(request);
8787
assertThat(authentication.getPrincipal()).isEqualTo("client-1");
8888
assertThat(authentication.getCredentials()).isEqualTo("client-secret");
89-
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.POST);
89+
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.CLIENT_SECRET_POST);
9090
}
9191

9292
@Test
@@ -97,7 +97,7 @@ public void convertWhenConfidentialClientWithPkceParametersThenAdditionalParamet
9797
OAuth2ClientAuthenticationToken authentication = (OAuth2ClientAuthenticationToken) this.converter.convert(request);
9898
assertThat(authentication.getPrincipal()).isEqualTo("client-1");
9999
assertThat(authentication.getCredentials()).isEqualTo("client-secret");
100-
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.POST);
100+
assertThat(authentication.getClientAuthenticationMethod()).isEqualTo(ClientAuthenticationMethod.CLIENT_SECRET_POST);
101101
assertThat(authentication.getAdditionalParameters())
102102
.containsOnly(
103103
entry(OAuth2ParameterNames.GRANT_TYPE, AuthorizationGrantType.AUTHORIZATION_CODE.getValue()),

0 commit comments

Comments
 (0)