Skip to content

Commit d817029

Browse files
jzheauxsnicoll
authored andcommitted
Harmonize @ConditionalOnMissingBean definition
See gh-28532
1 parent e7d62ff commit d817029

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
@ConditionalOnMissingBean(
5959
value = { AuthenticationManager.class, AuthenticationProvider.class, UserDetailsService.class },
6060
type = { "org.springframework.security.oauth2.jwt.JwtDecoder",
61-
"org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector" })
61+
"org.springframework.security.oauth2.server.resource.introspection.OpaqueTokenIntrospector",
62+
"org.springframework.security.oauth2.client.registration.ClientRegistrationRepository" })
6263
public class UserDetailsServiceAutoConfiguration {
6364

6465
private static final String NOOP_PASSWORD_PREFIX = "{noop}";
@@ -68,8 +69,6 @@ public class UserDetailsServiceAutoConfiguration {
6869
private static final Log logger = LogFactory.getLog(UserDetailsServiceAutoConfiguration.class);
6970

7071
@Bean
71-
@ConditionalOnMissingBean(
72-
type = "org.springframework.security.oauth2.client.registration.ClientRegistrationRepository")
7372
@Lazy
7473
public InMemoryUserDetailsManager inMemoryUserDetailsManager(SecurityProperties properties,
7574
ObjectProvider<PasswordEncoder> passwordEncoder) {

0 commit comments

Comments
 (0)