Register a bean for OAuth2AuthorizedClientService

Closes gh-10837

Author: mbhave

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

@@ -18,9 +18,12 @@
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 
 /**
@@ -35,21 +38,19 @@
 @ConditionalOnBean(ClientRegistrationRepository.class)
 class OAuth2WebSecurityConfiguration {
 
+	@Bean
+	@ConditionalOnMissingBean
+	public OAuth2AuthorizedClientService authorizedClientService(ClientRegistrationRepository clientRegistrationRepository) {
+		return new InMemoryOAuth2AuthorizedClientService(clientRegistrationRepository);
+	}
+
 	@Configuration
 	static class OAuth2WebSecurityConfigurationAdapter
 			extends WebSecurityConfigurerAdapter {
 
-		private final ClientRegistrationRepository clientRegistrationRepository;
-
-		OAuth2WebSecurityConfigurationAdapter(
-				ClientRegistrationRepository clientRegistrationRepository) {
-			this.clientRegistrationRepository = clientRegistrationRepository;
-		}
-
 		@Override
 		protected void configure(HttpSecurity http) throws Exception {
-			http.authorizeRequests().anyRequest().authenticated().and().oauth2Login()
-					.clientRegistrationRepository(this.clientRegistrationRepository);
+			http.authorizeRequests().anyRequest().authenticated().and().oauth2Login();
 		}
 
 	}

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

@@ -32,6 +32,8 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.oauth2.client.InMemoryOAuth2AuthorizedClientService;
+import org.springframework.security.oauth2.client.OAuth2AuthorizedClientService;
 import org.springframework.security.oauth2.client.registration.ClientRegistration;
 import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
 import org.springframework.security.oauth2.client.registration.InMemoryClientRegistrationRepository;
@@ -55,7 +57,7 @@ public class OAuth2WebSecurityConfigurationTests {
 	private final ApplicationContextRunner contextRunner = new ApplicationContextRunner();
 
 	@Test
-	public void securityConfigurerRegistersClientRegistrations() throws Exception {
+	public void securityConfigurerConfiguresOAuth2Login() throws Exception {
 		this.contextRunner.withUserConfiguration(ClientRepositoryConfiguration.class,
 				OAuth2WebSecurityConfiguration.class).run((context) -> {
 					ClientRegistrationRepository expected = context
@@ -88,6 +90,34 @@ public void securityConfigurerBacksOffWhenOtherWebSecurityAdapterPresent()
 				.run((context) -> assertThat(getAuthCodeFilters(context)).isEmpty());
 	}
 
+	@Test
+	public void configurationRegistersAuthorizedClientServiceBean() throws Exception {
+		this.contextRunner
+				.withUserConfiguration(ClientRepositoryConfiguration.class,
+						OAuth2WebSecurityConfiguration.class)
+				.run(context -> {
+					OAuth2AuthorizedClientService bean = context.getBean(OAuth2AuthorizedClientService.class);
+					OAuth2AuthorizedClientService authorizedClientService = (OAuth2AuthorizedClientService) ReflectionTestUtils
+							.getField(getAuthCodeFilters(context).get(0),
+									"authorizedClientService");
+					assertThat(authorizedClientService).isEqualTo(bean);
+				});
+	}
+
+	@Test
+	public void authorizedClientServiceBeanIsConditionalOnMissingBean() throws Exception {
+		this.contextRunner
+				.withUserConfiguration(OAuth2AuthorizedClientServiceConfiguration.class,
+						OAuth2WebSecurityConfiguration.class)
+				.run(context -> {
+					OAuth2AuthorizedClientService bean = context.getBean(OAuth2AuthorizedClientService.class);
+					OAuth2AuthorizedClientService authorizedClientService = (OAuth2AuthorizedClientService) ReflectionTestUtils
+							.getField(getAuthCodeFilters(context).get(0),
+									"authorizedClientService");
+					assertThat(authorizedClientService).isEqualTo(bean);
+				});
+	}
+
 	@SuppressWarnings("unchecked")
 	private List<Filter> getAuthCodeFilters(AssertableApplicationContext context) {
 		FilterChainProxy filterChain = (FilterChainProxy) context
@@ -176,4 +206,15 @@ static class TestWebSecurityConfigurerConfig extends WebSecurityConfigurerAdapte
 
 	}
 
+	@Configuration
+	@Import({ ClientRepositoryConfiguration.class })
+	static class OAuth2AuthorizedClientServiceConfiguration {
+
+		@Bean
+		public OAuth2AuthorizedClientService testAuthorizedClientService(ClientRegistrationRepository clientRegistrationRepository) {
+			return new InMemoryOAuth2AuthorizedClientService(clientRegistrationRepository);
+		}
+
+	}
+
 }