GitHub-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Polish gh-10131

pull/10041/head
Steve Riesenberg 4 years ago
parent
044157061f
commit
acca3dba69
4 changed files with 32 additions and 25 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 15
      oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java
  2. 14
      oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java
  3. 14
      oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java
  4. 14
      oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java

15
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveAuthorizationCodeTokenResponseClientTests.java
Unescape View File

@ -359,8 +359,8 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests {
public void convertWhenHeadersConverterAddedThenCalled() throws Exception { public void convertWhenHeadersConverterAddedThenCalled() throws Exception {
OAuth2AuthorizationCodeGrantRequest request = authorizationCodeGrantRequest(); OAuth2AuthorizationCodeGrantRequest request = authorizationCodeGrantRequest();
Converter<OAuth2AuthorizationCodeGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class); Converter<OAuth2AuthorizationCodeGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM")); headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
given(addedHeadersConverter.convert(request)).willReturn(headers); given(addedHeadersConverter.convert(request)).willReturn(headers);
this.tokenResponseClient.addHeadersConverter(addedHeadersConverter); this.tokenResponseClient.addHeadersConverter(addedHeadersConverter);
// @formatter:off // @formatter:off
@ -377,15 +377,16 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests {
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)) assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ="); .isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
} }
@Test @Test
public void convertWhenHeadersConverterSetThenCalled() throws Exception { public void convertWhenHeadersConverterSetThenCalled() throws Exception {
OAuth2AuthorizationCodeGrantRequest request = authorizationCodeGrantRequest(); OAuth2AuthorizationCodeGrantRequest request = authorizationCodeGrantRequest();
ClientRegistration clientRegistration = request.getClientRegistration();
Converter<OAuth2AuthorizationCodeGrantRequest, HttpHeaders> headersConverter = mock(Converter.class); Converter<OAuth2AuthorizationCodeGrantRequest, HttpHeaders> headersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM")); headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
given(headersConverter.convert(request)).willReturn(headers); given(headersConverter.convert(request)).willReturn(headers);
this.tokenResponseClient.setHeadersConverter(headersConverter); this.tokenResponseClient.setHeadersConverter(headersConverter);
// @formatter:off // @formatter:off
@ -400,8 +401,8 @@ public class WebClientReactiveAuthorizationCodeTokenResponseClientTests {
this.tokenResponseClient.getTokenResponse(request).block(); this.tokenResponseClient.getTokenResponse(request).block();
verify(headersConverter).convert(request); verify(headersConverter).convert(request);
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
} }
} }

14
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveClientCredentialsTokenResponseClientTests.java
Unescape View File

@ -231,8 +231,8 @@ public class WebClientReactiveClientCredentialsTokenResponseClientTests {
OAuth2ClientCredentialsGrantRequest request = new OAuth2ClientCredentialsGrantRequest( OAuth2ClientCredentialsGrantRequest request = new OAuth2ClientCredentialsGrantRequest(
this.clientRegistration.build()); this.clientRegistration.build());
Converter<OAuth2ClientCredentialsGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class); Converter<OAuth2ClientCredentialsGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM")); headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
given(addedHeadersConverter.convert(request)).willReturn(headers); given(addedHeadersConverter.convert(request)).willReturn(headers);
this.client.addHeadersConverter(addedHeadersConverter); this.client.addHeadersConverter(addedHeadersConverter);
// @formatter:off // @formatter:off
@ -248,16 +248,17 @@ public class WebClientReactiveClientCredentialsTokenResponseClientTests {
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)) assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ="); .isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
} }
@Test @Test
public void convertWhenHeadersConverterSetThenCalled() throws Exception { public void convertWhenHeadersConverterSetThenCalled() throws Exception {
OAuth2ClientCredentialsGrantRequest request = new OAuth2ClientCredentialsGrantRequest( OAuth2ClientCredentialsGrantRequest request = new OAuth2ClientCredentialsGrantRequest(
this.clientRegistration.build()); this.clientRegistration.build());
ClientRegistration clientRegistration = request.getClientRegistration();
Converter<OAuth2ClientCredentialsGrantRequest, HttpHeaders> headersConverter = mock(Converter.class); Converter<OAuth2ClientCredentialsGrantRequest, HttpHeaders> headersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM")); headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
given(headersConverter.convert(request)).willReturn(headers); given(headersConverter.convert(request)).willReturn(headers);
this.client.setHeadersConverter(headersConverter); this.client.setHeadersConverter(headersConverter);
// @formatter:off // @formatter:off
@ -271,7 +272,8 @@ public class WebClientReactiveClientCredentialsTokenResponseClientTests {
this.client.getTokenResponse(request).block(); this.client.getTokenResponse(request).block();
verify(headersConverter).convert(request); verify(headersConverter).convert(request);
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
} }
} }

14
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactivePasswordTokenResponseClientTests.java
Unescape View File

@ -235,8 +235,8 @@ public class WebClientReactivePasswordTokenResponseClientTests {
OAuth2PasswordGrantRequest request = new OAuth2PasswordGrantRequest(this.clientRegistrationBuilder.build(), OAuth2PasswordGrantRequest request = new OAuth2PasswordGrantRequest(this.clientRegistrationBuilder.build(),
this.username, this.password); this.username, this.password);
Converter<OAuth2PasswordGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class); Converter<OAuth2PasswordGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM")); headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
given(addedHeadersConverter.convert(request)).willReturn(headers); given(addedHeadersConverter.convert(request)).willReturn(headers);
this.tokenResponseClient.addHeadersConverter(addedHeadersConverter); this.tokenResponseClient.addHeadersConverter(addedHeadersConverter);
// @formatter:off // @formatter:off
@ -253,16 +253,17 @@ public class WebClientReactivePasswordTokenResponseClientTests {
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)) assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ="); .isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
} }
@Test @Test
public void convertWhenHeadersConverterSetThenCalled() throws Exception { public void convertWhenHeadersConverterSetThenCalled() throws Exception {
OAuth2PasswordGrantRequest request = new OAuth2PasswordGrantRequest(this.clientRegistrationBuilder.build(), OAuth2PasswordGrantRequest request = new OAuth2PasswordGrantRequest(this.clientRegistrationBuilder.build(),
this.username, this.password); this.username, this.password);
ClientRegistration clientRegistration = request.getClientRegistration();
Converter<OAuth2PasswordGrantRequest, HttpHeaders> headersConverter = mock(Converter.class); Converter<OAuth2PasswordGrantRequest, HttpHeaders> headersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM")); headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
given(headersConverter.convert(request)).willReturn(headers); given(headersConverter.convert(request)).willReturn(headers);
this.tokenResponseClient.setHeadersConverter(headersConverter); this.tokenResponseClient.setHeadersConverter(headersConverter);
// @formatter:off // @formatter:off
@ -277,7 +278,8 @@ public class WebClientReactivePasswordTokenResponseClientTests {
this.tokenResponseClient.getTokenResponse(request).block(); this.tokenResponseClient.getTokenResponse(request).block();
verify(headersConverter).convert(request); verify(headersConverter).convert(request);
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
} }
} }

14
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/endpoint/WebClientReactiveRefreshTokenTokenResponseClientTests.java
Unescape View File

@ -238,8 +238,8 @@ public class WebClientReactiveRefreshTokenTokenResponseClientTests {
OAuth2RefreshTokenGrantRequest request = new OAuth2RefreshTokenGrantRequest( OAuth2RefreshTokenGrantRequest request = new OAuth2RefreshTokenGrantRequest(
this.clientRegistrationBuilder.build(), this.accessToken, this.refreshToken); this.clientRegistrationBuilder.build(), this.accessToken, this.refreshToken);
Converter<OAuth2RefreshTokenGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class); Converter<OAuth2RefreshTokenGrantRequest, HttpHeaders> addedHeadersConverter = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put("CUSTOM_AUTHORIZATION", Collections.singletonList("Basic CUSTOM")); headers.put("custom-header-name", Collections.singletonList("custom-header-value"));
given(addedHeadersConverter.convert(request)).willReturn(headers); given(addedHeadersConverter.convert(request)).willReturn(headers);
this.tokenResponseClient.addHeadersConverter(addedHeadersConverter); this.tokenResponseClient.addHeadersConverter(addedHeadersConverter);
// @formatter:off // @formatter:off
@ -256,16 +256,17 @@ public class WebClientReactiveRefreshTokenTokenResponseClientTests {
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)) assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ="); .isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
assertThat(actualRequest.getHeader("CUSTOM_AUTHORIZATION")).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader("custom-header-name")).isEqualTo("custom-header-value");
} }
@Test @Test
public void convertWhenHeadersConverterSetThenCalled() throws Exception { public void convertWhenHeadersConverterSetThenCalled() throws Exception {
OAuth2RefreshTokenGrantRequest request = new OAuth2RefreshTokenGrantRequest( OAuth2RefreshTokenGrantRequest request = new OAuth2RefreshTokenGrantRequest(
this.clientRegistrationBuilder.build(), this.accessToken, this.refreshToken); this.clientRegistrationBuilder.build(), this.accessToken, this.refreshToken);
ClientRegistration clientRegistration = request.getClientRegistration();
Converter<OAuth2RefreshTokenGrantRequest, HttpHeaders> headersConverter1 = mock(Converter.class); Converter<OAuth2RefreshTokenGrantRequest, HttpHeaders> headersConverter1 = mock(Converter.class);
final HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.put(HttpHeaders.AUTHORIZATION, Collections.singletonList("Basic CUSTOM")); headers.setBasicAuth(clientRegistration.getClientId(), clientRegistration.getClientSecret());
given(headersConverter1.convert(request)).willReturn(headers); given(headersConverter1.convert(request)).willReturn(headers);
this.tokenResponseClient.setHeadersConverter(headersConverter1); this.tokenResponseClient.setHeadersConverter(headersConverter1);
// @formatter:off // @formatter:off
@ -280,7 +281,8 @@ public class WebClientReactiveRefreshTokenTokenResponseClientTests {
this.tokenResponseClient.getTokenResponse(request).block(); this.tokenResponseClient.getTokenResponse(request).block();
verify(headersConverter1).convert(request); verify(headersConverter1).convert(request);
RecordedRequest actualRequest = this.server.takeRequest(); RecordedRequest actualRequest = this.server.takeRequest();
assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION)).isEqualTo("Basic CUSTOM"); assertThat(actualRequest.getHeader(HttpHeaders.AUTHORIZATION))
.isEqualTo("Basic Y2xpZW50LWlkOmNsaWVudC1zZWNyZXQ=");
} }
} }

Write Preview
Loading…
Cancel
Save