spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '4.1.x'

Browse Source 
Closes gh-51451
This commit is contained in:
Phillip Webb
2026-08-25 12:43:08 -07:00
parent 64dd438bb8 cd5d2decf9
commit 7538153cc1
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-security-oauth2-client/src/main/java/org/springframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientConfigurations.java
+1 -1
View File
@@ -41,10 +41,10 @@ class OAuth2ClientConfigurations {
@Configuration(proxyBeanMethods = false)
@ConditionalOnOAuth2ClientRegistrationProperties
@EnableConfigurationProperties(OAuth2ClientProperties.class)
@ConditionalOnMissingBean(ClientRegistrationRepository.class)
static class ClientRegistrationRepositoryConfiguration {
@Bean
@ConditionalOnMissingBean(ClientRegistrationRepository.class)
InMemoryClientRegistrationRepository clientRegistrationRepository(OAuth2ClientProperties properties) {
List<ClientRegistration> registrations = new ArrayList<>(
new OAuth2ClientPropertiesMapper(properties).asClientRegistrations().values());
module/spring-boot-security-oauth2-client/src/test/java/org/springframework/boot/security/oauth2/client/autoconfigure/OAuth2ClientAutoConfigurationTests.java
+13
View File
@@ -82,6 +82,19 @@ class OAuth2ClientAutoConfigurationTests {
.run((context) -> assertThat(context).hasSingleBean(OAuth2AuthorizedClientService.class));
}
@Test
void propertiesBeanIsCreatedWithUserDefinedClientRegistrationRepository() {
this.contextRunner
.withPropertyValues(REGISTRATION_PREFIX + ".foo.client-id=abcd",
REGISTRATION_PREFIX + ".foo.client-secret=secret", REGISTRATION_PREFIX + ".foo.provider=github")
.withBean(ClientRegistrationRepository.class,
() -> new InMemoryClientRegistrationRepository(getClientRegistration("test", "test")))
.run((context) -> {
assertThat(context).hasSingleBean(OAuth2ClientProperties.class);
assertThat(context).hasSingleBean(OAuth2AuthorizedClientService.class);
});
}
private ClientRegistration getClientRegistration(String id, String userInfoUri) {
ClientRegistration.Builder builder = ClientRegistration.withRegistrationId(id);
builder.clientName("foo")