From 9468e8741f3ed2d4c225adc8cef6c6145a8b48a9 Mon Sep 17 00:00:00 2001 From: John Niang Date: Sat, 12 Oct 2024 12:21:09 +0800 Subject: [PATCH] Add globalInfo into logout page (#6831) #### What type of PR is this? /kind improvement /area core /milestone 2.20.x #### What this PR does / why we need it: This PR adds globalInfo data into logout template model. #### Which issue(s) this PR fixes: Fixes https://github.com/halo-dev/halo/issues/6821 #### Does this PR introduce a user-facing change? ```release-note None ``` --- .../run/halo/app/security/LogoutSecurityConfigurer.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/run/halo/app/security/LogoutSecurityConfigurer.java b/application/src/main/java/run/halo/app/security/LogoutSecurityConfigurer.java index 7406322b3..f7b116087 100644 --- a/application/src/main/java/run/halo/app/security/LogoutSecurityConfigurer.java +++ b/application/src/main/java/run/halo/app/security/LogoutSecurityConfigurer.java @@ -24,6 +24,7 @@ import org.springframework.web.reactive.function.server.RouterFunctions; import org.springframework.web.reactive.function.server.ServerResponse; import reactor.core.publisher.Mono; import run.halo.app.core.user.service.UserService; +import run.halo.app.infra.actuator.GlobalInfoService; import run.halo.app.security.authentication.SecurityConfigurer; import run.halo.app.security.authentication.rememberme.RememberMeServices; import run.halo.app.theme.router.ModelConst; @@ -59,7 +60,10 @@ public class LogoutSecurityConfigurer implements SecurityConfigurer { } @Bean - RouterFunction logoutPage(UserService userService) { + RouterFunction logoutPage( + UserService userService, + GlobalInfoService globalInfoService + ) { return RouterFunctions.route() .GET("/logout", request -> { var user = ReactiveSecurityContextHolder.getContext() @@ -69,6 +73,7 @@ public class LogoutSecurityConfigurer implements SecurityConfigurer { var exchange = request.exchange(); var contextPath = exchange.getRequest().getPath().contextPath().value(); return ServerResponse.ok().render("logout", Map.of( + "globalInfo", globalInfoService.getGlobalInfo(), "action", contextPath + "/logout", "user", user ));