From e958ff2d4aa488513262b593bd0d17c344e5f3c8 Mon Sep 17 00:00:00 2001 From: Daniel Garnier-Moiroux Date: Mon, 2 Sep 2024 14:34:10 +0200 Subject: [PATCH] Use static CSS in reactive default UI --- .../ui/LoginPageGeneratingWebFilter.java | 5 +- .../ui/LogoutPageGeneratingWebFilter.java | 4 +- .../ui/LoginPageGeneratingWebFilterTests.java | 126 +----------------- .../LogoutPageGeneratingWebFilterTests.java | 126 +----------------- 4 files changed, 5 insertions(+), 256 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java b/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java index 3a18738448..93321c275d 100644 --- a/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilter.java @@ -32,7 +32,6 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.security.web.server.csrf.CsrfToken; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers; -import org.springframework.security.web.util.CssUtils; import org.springframework.util.Assert; import org.springframework.util.MultiValueMap; import org.springframework.web.server.ServerWebExchange; @@ -91,7 +90,7 @@ public class LoginPageGeneratingWebFilter implements WebFilter { String contextPath = exchange.getRequest().getPath().contextPath().value(); return HtmlTemplates.fromTemplate(LOGIN_PAGE_TEMPLATE) - .withRawHtml("cssStyle", CssUtils.getCssStyleBlock().indent(4)) + .withRawHtml("contextPath", contextPath) .withRawHtml("formLogin", formLogin(queryParams, contextPath, csrfTokenHtmlInput)) .withRawHtml("oauth2Login", oauth2Login(queryParams, contextPath, this.oauth2AuthenticationUrlToClientName)) .render() @@ -164,7 +163,7 @@ public class LoginPageGeneratingWebFilter implements WebFilter { Please sign in - {{cssStyle}} +
diff --git a/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java b/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java index 34e850f80b..7482cf6283 100644 --- a/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java +++ b/web/src/main/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilter.java @@ -29,7 +29,6 @@ import org.springframework.http.server.reactive.ServerHttpResponse; import org.springframework.security.web.server.csrf.CsrfToken; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatcher; import org.springframework.security.web.server.util.matcher.ServerWebExchangeMatchers; -import org.springframework.security.web.util.CssUtils; import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.WebFilter; import org.springframework.web.server.WebFilterChain; @@ -71,7 +70,6 @@ public class LogoutPageGeneratingWebFilter implements WebFilter { private static byte[] createPage(String csrfTokenHtmlInput, String contextPath) { return HtmlTemplates.fromTemplate(LOGOUT_PAGE_TEMPLATE) - .withRawHtml("cssStyle", CssUtils.getCssStyleBlock().indent(4)) .withValue("contextPath", contextPath) .withRawHtml("csrf", csrfTokenHtmlInput.indent(8)) .render() @@ -94,7 +92,7 @@ public class LogoutPageGeneratingWebFilter implements WebFilter { Confirm Log Out? - {{cssStyle}} +
diff --git a/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java index 6bbbc307e0..04596e8caa 100644 --- a/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/ui/LoginPageGeneratingWebFilterTests.java @@ -66,131 +66,7 @@ public class LoginPageGeneratingWebFilterTests { Please sign in - +
diff --git a/web/src/test/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilterTests.java b/web/src/test/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilterTests.java index fc5547767e..46f0ba7e45 100644 --- a/web/src/test/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilterTests.java +++ b/web/src/test/java/org/springframework/security/web/server/ui/LogoutPageGeneratingWebFilterTests.java @@ -58,131 +58,7 @@ public class LogoutPageGeneratingWebFilterTests { Confirm Log Out? - +