Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Register OAuth2AuthorizedClientRepository bean"

Browse Source 
Closes gh-13870
This commit is contained in:
Madhura Bhave
2018-07-24 13:31:03 -07:00
parent 2dcf19938d
commit f5617601aa
2 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/servlet/OAuth2WebSecurityConfiguration.java
View File

@@ -50,7 +50,8 @@ class OAuth2WebSecurityConfiguration {
@ConditionalOnMissingBean
public OAuth2AuthorizedClientRepository authorizedClientRepository(
OAuth2AuthorizedClientService authorizedClientService) {
return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(authorizedClientService);
return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(
authorizedClientService);
}
@Configuration

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

@@ -24,7 +24,6 @@ import javax.servlet.Filter;
import org.junit.Test;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.test.context.assertj.AssertableApplicationContext;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -94,16 +93,12 @@ public class OAuth2WebSecurityConfigurationTests {
}
@Test
public void configurationRegistersAuthorizedRepositoryServiceBean() {
this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class,
OAuth2WebSecurityConfiguration.class).run((context) -> {
OAuth2AuthorizedClientRepository bean = context
.getBean(OAuth2AuthorizedClientRepository.class);
OAuth2AuthorizedClientRepository authorizedClientService = (OAuth2AuthorizedClientRepository) ReflectionTestUtils
.getField(getAuthCodeFilters(context).get(0),
"authorizedClientRepository");
assertThat(authorizedClientService).isEqualTo(bean);
});
public void configurationRegistersAuthorizedClientRepositoryBean() {
this.contextRunner
.withUserConfiguration(ClientRepositoryConfiguration.class,
OAuth2WebSecurityConfiguration.class)
.run((context) -> assertThat(context)
.hasSingleBean(OAuth2AuthorizedClientRepository.class));
}
@Test
@@ -130,16 +125,12 @@ public class OAuth2WebSecurityConfigurationTests {
@Test
public void authorizedClientRepositoryBeanIsConditionalOnMissingBean() {
this.contextRunner
.withUserConfiguration(OAuth2AuthorizedClientServiceConfiguration.class,
OAuth2WebSecurityConfiguration.class)
.run((context) -> {
OAuth2AuthorizedClientRepository bean = context
.getBean(OAuth2AuthorizedClientRepository.class);
OAuth2AuthorizedClientRepository authorizedClientService = (OAuth2AuthorizedClientRepository) ReflectionTestUtils
.getField(getAuthCodeFilters(context).get(0),
"authorizedClientRepository");
assertThat(authorizedClientService).isEqualTo(bean);
this.contextRunner.withUserConfiguration(
OAuth2AuthorizedClientRepositoryConfiguration.class,
OAuth2WebSecurityConfiguration.class).run((context) -> {
assertThat(context)
.hasSingleBean(OAuth2AuthorizedClientRepository.class);
assertThat(context).hasBean("testAuthorizedClientRepository");
});
}
@@ -241,11 +232,17 @@ public class OAuth2WebSecurityConfigurationTests {
clientRegistrationRepository);
}
}
@Configuration
@Import(ClientRepositoryConfiguration.class)
static class OAuth2AuthorizedClientRepositoryConfiguration {
@Bean
@ConditionalOnMissingBean
public OAuth2AuthorizedClientRepository testAuthorizedClientRepository(
OAuth2AuthorizedClientService authorizedClientService) {
return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(authorizedClientService);
return new AuthenticatedPrincipalOAuth2AuthorizedClientRepository(
authorizedClientService);
}
}