Use Oauth2UserService bean in OidcReactiveOAuth2UserService

kse-music · jzheaux · commit 60587f83fead · 2024-09-30T16:58:56.000-06:00
Closes gh-15846
diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
@@ -4506,7 +4506,9 @@ private ReactiveOAuth2UserService<OidcUserRequest, OidcUser> getOidcUserService(
 			if (bean != null) {
 				return bean;
 			}
-			return new OidcReactiveOAuth2UserService();
+			OidcReactiveOAuth2UserService reactiveOAuth2UserService = new OidcReactiveOAuth2UserService();
+			reactiveOAuth2UserService.setOauth2UserService(getOauth2UserService());
+			return reactiveOAuth2UserService;
 		}
 
 		private ReactiveOAuth2UserService<OAuth2UserRequest, OAuth2User> getOauth2UserService() {

Original file line number	Diff line number	Diff line change
`@@ -4506,7 +4506,9 @@ private ReactiveOAuth2UserService<OidcUserRequest, OidcUser> getOidcUserService(`
`4506`	`4506`	`if (bean != null) {`
`4507`	`4507`	`return bean;`
`4508`	`4508`	`}`
`4509`		`- return new OidcReactiveOAuth2UserService();`
	`4509`	`+ OidcReactiveOAuth2UserService reactiveOAuth2UserService = new OidcReactiveOAuth2UserService();`
	`4510`	`+ reactiveOAuth2UserService.setOauth2UserService(getOauth2UserService());`
	`4511`	`+ return reactiveOAuth2UserService;`
`4510`	`4512`	`}`
`4511`	`4513`
`4512`	`4514`	`private ReactiveOAuth2UserService<OAuth2UserRequest, OAuth2User> getOauth2UserService() {`