From a29d5e1d8f54560af2b28d0c7328d42691f6fe74 Mon Sep 17 00:00:00 2001 From: JohnNiang Date: Thu, 26 Sep 2024 11:09:40 +0800 Subject: [PATCH] Update dependencies Signed-off-by: JohnNiang --- .../halo/oauth/HaloOAuth2AuthenticationWebFilter.java | 9 +++++---- .../oauth/HaloOAuth2LoginAuthenticationWebFilter.java | 7 +++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/run/halo/oauth/HaloOAuth2AuthenticationWebFilter.java b/src/main/java/run/halo/oauth/HaloOAuth2AuthenticationWebFilter.java index 957ffdd..cddea7d 100644 --- a/src/main/java/run/halo/oauth/HaloOAuth2AuthenticationWebFilter.java +++ b/src/main/java/run/halo/oauth/HaloOAuth2AuthenticationWebFilter.java @@ -13,7 +13,7 @@ import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; import reactor.core.publisher.Mono; -import run.halo.app.core.extension.service.UserConnectionService; +import run.halo.app.core.user.service.UserConnectionService; import run.halo.app.security.AuthenticationSecurityWebFilter; @Component @@ -23,15 +23,16 @@ public class HaloOAuth2AuthenticationWebFilter implements AuthenticationSecurity public HaloOAuth2AuthenticationWebFilter(Oauth2LoginConfiguration configuration, ServerSecurityContextRepository securityContextRepository, - UserConnectionService userConnectionService, + UserConnectionService connectionService, ReactiveUserDetailsService userDetailsService) { var authManager = new OAuth2LoginReactiveAuthenticationManager( new WebClientReactiveAuthorizationCodeTokenResponseClient(), new DefaultReactiveOAuth2UserService() ); var filter = new HaloOAuth2LoginAuthenticationWebFilter( - authManager, configuration.getAuthorizedClientRepository(), - userConnectionService, + authManager, + configuration.getAuthorizedClientRepository(), + connectionService, userDetailsService ); filter.setRequiresAuthenticationMatcher(configuration.getAuthenticationMatcher()); diff --git a/src/main/java/run/halo/oauth/HaloOAuth2LoginAuthenticationWebFilter.java b/src/main/java/run/halo/oauth/HaloOAuth2LoginAuthenticationWebFilter.java index 57e6042..39e410d 100644 --- a/src/main/java/run/halo/oauth/HaloOAuth2LoginAuthenticationWebFilter.java +++ b/src/main/java/run/halo/oauth/HaloOAuth2LoginAuthenticationWebFilter.java @@ -15,15 +15,14 @@ import org.springframework.security.web.server.WebFilterExchange; import org.springframework.security.web.server.authentication.AuthenticationWebFilter; import reactor.core.publisher.Mono; -import run.halo.app.core.extension.service.UserConnectionService; +import run.halo.app.core.user.service.UserConnectionService; import run.halo.app.security.authentication.oauth2.HaloOAuth2AuthenticationToken; -class HaloOAuth2LoginAuthenticationWebFilter - extends AuthenticationWebFilter { +class HaloOAuth2LoginAuthenticationWebFilter extends AuthenticationWebFilter { private final ServerOAuth2AuthorizedClientRepository authorizedClientRepository; - private final run.halo.app.core.extension.service.UserConnectionService connectionService; + private final UserConnectionService connectionService; private final ReactiveUserDetailsService userDetailsService;