Skip to content

Commit acca3db

Browse files
author
Steve Riesenberg
committed
Polish gh-10131 
1 parent 0441570 commit acca3db

File tree

4 files changed

+32
-25
lines changed

4 files changed

+32
-25
lines changed

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ public void addHeadersConverterWhenNullThenThrowIllegalArgumentException() {
359359
public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
360360
OAuth2AuthorizationCodeGrantRequest request = authorizationCodeGrantRequest();
361361
Converter<OAuth2AuthorizationCodeGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
362-
final HttpHeaders headers = new HttpHeaders();
363-
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM"));
362+
HttpHeaders headers = new HttpHeaders();
363+
headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
364364
given(addedHeadersConverter.convert(request)).willReturn(headers);
365365
this.tokenResponseClient.addHeadersConverter(addedHeadersConverter);
366366
// @formatter:off
@@ -377,15 +377,16 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
377377
RecordedRequest actualRequest = this.server.takeRequest();
378378
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
379379
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
380-
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM");
380+
assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
381381
}
382382

383383
@Test
384384
public void convertWhenHeadersConverterSetThenCalled() throws Exception {
385385
OAuth2AuthorizationCodeGrantRequest request = authorizationCodeGrantRequest();
386+
ClientRegistration clientRegistration = request.getClientRegistration();
386387
Converter<OAuth2AuthorizationCodeGrantRequest, HttpHeaders> headersConverter = mock(Converter.class);
387-
final HttpHeaders headers = new HttpHeaders();
388-
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM"));
388+
HttpHeaders headers = new HttpHeaders();
389+
headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
389390
given(headersConverter.convert(request)).willReturn(headers);
390391
this.tokenResponseClient.setHeadersConverter(headersConverter);
391392
// @formatter:off
@@ -400,8 +401,8 @@ public void convertWhenHeadersConverterSetThenCalled() throws Exception {
400401
this.tokenResponseClient.getTokenResponse(request).block();
401402
verify(headersConverter).convert(request);
402403
RecordedRequest actualRequest = this.server.takeRequest();
403-
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM");
404-
404+
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
405+
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
405406
}
406407

407408
}

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
231231
OAuth2ClientCredentialsGrantRequest request = new OAuth2ClientCredentialsGrantRequest(
232232
this.clientRegistration.build());
233233
Converter<OAuth2ClientCredentialsGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
234-
final HttpHeaders headers = new HttpHeaders();
235-
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM"));
234+
HttpHeaders headers = new HttpHeaders();
235+
headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
236236
given(addedHeadersConverter.convert(request)).willReturn(headers);
237237
this.client.addHeadersConverter(addedHeadersConverter);
238238
// @formatter:off
@@ -248,16 +248,17 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
248248
RecordedRequest actualRequest = this.server.takeRequest();
249249
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
250250
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
251-
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM");
251+
assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
252252
}
253253

254254
@Test
255255
public void convertWhenHeadersConverterSetThenCalled() throws Exception {
256256
OAuth2ClientCredentialsGrantRequest request = new OAuth2ClientCredentialsGrantRequest(
257257
this.clientRegistration.build());
258+
ClientRegistration clientRegistration = request.getClientRegistration();
258259
Converter<OAuth2ClientCredentialsGrantRequest, HttpHeaders> headersConverter = mock(Converter.class);
259-
final HttpHeaders headers = new HttpHeaders();
260-
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM"));
260+
HttpHeaders headers = new HttpHeaders();
261+
headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
261262
given(headersConverter.convert(request)).willReturn(headers);
262263
this.client.setHeadersConverter(headersConverter);
263264
// @formatter:off
@@ -271,7 +272,8 @@ public void convertWhenHeadersConverterSetThenCalled() throws Exception {
271272
this.client.getTokenResponse(request).block();
272273
verify(headersConverter).convert(request);
273274
RecordedRequest actualRequest = this.server.takeRequest();
274-
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM");
275+
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
276+
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
275277
}
276278

277279
}

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
235235
OAuth2PasswordGrantRequest request = new OAuth2PasswordGrantRequest(this.clientRegistrationBuilder.build(),
236236
this.username, this.password);
237237
Converter<OAuth2PasswordGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
238-
final HttpHeaders headers = new HttpHeaders();
239-
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM"));
238+
HttpHeaders headers = new HttpHeaders();
239+
headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
240240
given(addedHeadersConverter.convert(request)).willReturn(headers);
241241
this.tokenResponseClient.addHeadersConverter(addedHeadersConverter);
242242
// @formatter:off
@@ -253,16 +253,17 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
253253
RecordedRequest actualRequest = this.server.takeRequest();
254254
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
255255
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
256-
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM");
256+
assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
257257
}
258258

259259
@Test
260260
public void convertWhenHeadersConverterSetThenCalled() throws Exception {
261261
OAuth2PasswordGrantRequest request = new OAuth2PasswordGrantRequest(this.clientRegistrationBuilder.build(),
262262
this.username, this.password);
263+
ClientRegistration clientRegistration = request.getClientRegistration();
263264
Converter<OAuth2PasswordGrantRequest, HttpHeaders> headersConverter = mock(Converter.class);
264-
final HttpHeaders headers = new HttpHeaders();
265-
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM"));
265+
HttpHeaders headers = new HttpHeaders();
266+
headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
266267
given(headersConverter.convert(request)).willReturn(headers);
267268
this.tokenResponseClient.setHeadersConverter(headersConverter);
268269
// @formatter:off
@@ -277,7 +278,8 @@ public void convertWhenHeadersConverterSetThenCalled() throws Exception {
277278
this.tokenResponseClient.getTokenResponse(request).block();
278279
verify(headersConverter).convert(request);
279280
RecordedRequest actualRequest = this.server.takeRequest();
280-
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM");
281+
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
282+
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
281283
}
282284

283285
}

‎oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
238238
OAuth2RefreshTokenGrantRequest request = new OAuth2RefreshTokenGrantRequest(
239239
this.clientRegistrationBuilder.build(), this.accessToken, this.refreshToken);
240240
Converter<OAuth2RefreshTokenGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
241-
final HttpHeaders headers = new HttpHeaders();
242-
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM"));
241+
HttpHeaders headers = new HttpHeaders();
242+
headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
243243
given(addedHeadersConverter.convert(request)).willReturn(headers);
244244
this.tokenResponseClient.addHeadersConverter(addedHeadersConverter);
245245
// @formatter:off
@@ -256,16 +256,17 @@ public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
256256
RecordedRequest actualRequest = this.server.takeRequest();
257257
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
258258
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
259-
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM");
259+
assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
260260
}
261261

262262
@Test
263263
public void convertWhenHeadersConverterSetThenCalled() throws Exception {
264264
OAuth2RefreshTokenGrantRequest request = new OAuth2RefreshTokenGrantRequest(
265265
this.clientRegistrationBuilder.build(), this.accessToken, this.refreshToken);
266+
ClientRegistration clientRegistration = request.getClientRegistration();
266267
Converter<OAuth2RefreshTokenGrantRequest, HttpHeaders> headersConverter1 = mock(Converter.class);
267-
final HttpHeaders headers = new HttpHeaders();
268-
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM"));
268+
HttpHeaders headers = new HttpHeaders();
269+
headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
269270
given(headersConverter1.convert(request)).willReturn(headers);
270271
this.tokenResponseClient.setHeadersConverter(headersConverter1);
271272
// @formatter:off
@@ -280,7 +281,8 @@ public void convertWhenHeadersConverterSetThenCalled() throws Exception {
280281
this.tokenResponseClient.getTokenResponse(request).block();
281282
verify(headersConverter1).convert(request);
282283
RecordedRequest actualRequest = this.server.takeRequest();
283-
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM");
284+
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
285+
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
284286
}
285287

286288
}

0 commit comments

Comments
 (0)