root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Fix OAuth2 client tests as per upstream changes

This commit is contained in:
Madhura Bhave 2017-10-24 14:40:49 -07:00
parent 66b55defa0
commit 182b6f0d29
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ClientPropertiesRegistrationAdapterTests.java
View File

@ -111,7 +111,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
assertThat(adapted.getAuthorizationGrantType()).isEqualTo( assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
assertThat(adapted.getRedirectUri()).isEqualTo( assertThat(adapted.getRedirectUri()).isEqualTo(
"{scheme}://{serverName}:{serverPort}{contextPath}/login/oauth2/authorize/code/{registrationId}"); "{scheme}://{serverName}:{serverPort}{contextPath}/login/oauth2/{registrationId}");
assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email", assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email",
"address", "phone"); "address", "phone");
assertThat(adapted.getClientName()).isEqualTo("Google"); assertThat(adapted.getClientName()).isEqualTo("Google");
@ -195,7 +195,7 @@ public class OAuth2ClientPropertiesRegistrationAdapterTests {
assertThat(adapted.getAuthorizationGrantType()).isEqualTo( assertThat(adapted.getAuthorizationGrantType()).isEqualTo(
org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE); org.springframework.security.oauth2.core.AuthorizationGrantType.AUTHORIZATION_CODE);
assertThat(adapted.getRedirectUri()).isEqualTo( assertThat(adapted.getRedirectUri()).isEqualTo(
"{scheme}://{serverName}:{serverPort}{contextPath}/login/oauth2/authorize/code/{registrationId}"); "{scheme}://{serverName}:{serverPort}{contextPath}/login/oauth2/{registrationId}");
assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email", assertThat(adapted.getScopes()).containsExactly("openid", "profile", "email",
"address", "phone"); "address", "phone");
assertThat(adapted.getClientName()).isEqualTo("Google"); assertThat(adapted.getClientName()).isEqualTo("Google");

6
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2WebSecurityConfigurationTests.java
View File

@ -35,8 +35,8 @@ import org.springframework.security.config.annotation.web.configuration.WebSecur
import org.springframework.security.oauth2.client.registration.ClientRegistration; import org.springframework.security.oauth2.client.registration.ClientRegistration;
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository; import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository; import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
import org.springframework.security.oauth2.client.web.AuthorizationCodeAuthenticationFilter;
import org.springframework.security.oauth2.client.web.AuthorizationRequestRedirectFilter; import org.springframework.security.oauth2.client.web.AuthorizationRequestRedirectFilter;
import org.springframework.security.oauth2.client.web.OAuth2LoginAuthenticationFilter;
import org.springframework.security.oauth2.core.AuthorizationGrantType; import org.springframework.security.oauth2.core.AuthorizationGrantType;
import org.springframework.security.web.FilterChainProxy; import org.springframework.security.web.FilterChainProxy;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
@ -96,11 +96,11 @@ public class OAuth2WebSecurityConfigurationTests {
List<Filter> filters = (List<Filter>) ReflectionTestUtils List<Filter> filters = (List<Filter>) ReflectionTestUtils
.getField(filterChains.get(0), "filters"); .getField(filterChains.get(0), "filters");
List<Filter> oauth2Filters = filters.stream() List<Filter> oauth2Filters = filters.stream()
.filter((f) -> f instanceof AuthorizationCodeAuthenticationFilter .filter((f) -> f instanceof OAuth2LoginAuthenticationFilter
|| f instanceof AuthorizationRequestRedirectFilter) || f instanceof AuthorizationRequestRedirectFilter)
.collect(Collectors.toList()); .collect(Collectors.toList());
return oauth2Filters.stream() return oauth2Filters.stream()
.filter((f) -> f instanceof AuthorizationCodeAuthenticationFilter) .filter((f) -> f instanceof OAuth2LoginAuthenticationFilter)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }