NFC-82 Improve auth code, remove ThymeleafWebAppConfiguration.java

Signed-off-by: Sander Kondratjev <[email protected]>

Author: SanderKondratjevNortal

example/src/main/java/eu/webeid/example/config/ApplicationConfiguration.java

@@ -40,7 +40,6 @@
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
 import org.springframework.security.web.authentication.logout.HttpStatusReturningLogoutSuccessHandler;
 import org.thymeleaf.ITemplateEngine;
-import org.thymeleaf.web.servlet.JakartaServletWebApplication;
 
 @Configuration
 @ConfigurationPropertiesScan
@@ -55,7 +54,6 @@ public SecurityFilterChain filterChain(
         AuthenticationConfiguration authConfig,
         ChallengeNonceGenerator challengeNonceGenerator,
         ITemplateEngine templateEngine,
-        JakartaServletWebApplication webApp,
         WebEidMobileProperties webEidMobileProperties
     ) throws Exception {
         return http
@@ -67,7 +65,7 @@ public SecurityFilterChain filterChain(
             .authenticationProvider(webEidAuthenticationProvider)
             .addFilterBefore(new WebEidMobileAuthInitFilter("/auth/mobile/init", "/auth/mobile/login", challengeNonceGenerator, webEidMobileProperties), UsernamePasswordAuthenticationFilter.class)
             .addFilterBefore(new WebEidChallengeNonceFilter("/auth/challenge", challengeNonceGenerator), UsernamePasswordAuthenticationFilter.class)
-            .addFilterBefore(new WebEidLoginPageGeneratingFilter("/auth/mobile/login", "/auth/login", templateEngine, webApp), UsernamePasswordAuthenticationFilter.class)
+            .addFilterBefore(new WebEidLoginPageGeneratingFilter("/auth/mobile/login", "/auth/login", templateEngine), UsernamePasswordAuthenticationFilter.class)
             .addFilterBefore(new WebEidAjaxLoginProcessingFilter("/auth/login", authConfig.getAuthenticationManager()), UsernamePasswordAuthenticationFilter.class)
             .logout(l -> l.logoutSuccessHandler(new HttpStatusReturningLogoutSuccessHandler()))
             .headers(h -> h.frameOptions(HeadersConfigurer.FrameOptionsConfig::sameOrigin))

example/src/main/java/eu/webeid/example/config/ThymeleafWebAppConfiguration.java

@@ -33,11 +33,7 @@
 import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher;
 import org.springframework.security.web.util.matcher.RequestMatcher;
 import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.servlet.support.RequestContextUtils;
 import org.thymeleaf.ITemplateEngine;
-import org.thymeleaf.context.WebContext;
-import org.thymeleaf.web.IWebExchange;
-import org.thymeleaf.web.servlet.JakartaServletWebApplication;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -47,18 +43,15 @@ public final class WebEidLoginPageGeneratingFilter extends OncePerRequestFilter
     private final RequestMatcher requestMatcher;
     private final String loginProcessingPath;
     private final ITemplateEngine templateEngine;
-    private final JakartaServletWebApplication webApp;
 
     public WebEidLoginPageGeneratingFilter(
         String path,
         String loginProcessingPath,
-        ITemplateEngine templateEngine,
-        JakartaServletWebApplication webApp
+        ITemplateEngine templateEngine
     ) {
         this.requestMatcher = PathPatternRequestMatcher.withDefaults().matcher(HttpMethod.GET, path);
         this.loginProcessingPath = loginProcessingPath;
         this.templateEngine = templateEngine;
-        this.webApp = webApp;
     }
 
     @Override
@@ -74,16 +67,14 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht
             csrf = (CsrfToken) request.getAttribute("_csrf");
         }
 
-        String html = renderTemplate(request, response, csrf);
+        String html = renderTemplate(csrf);
         response.setCharacterEncoding(StandardCharsets.UTF_8.name());
         response.setContentType(MediaType.TEXT_HTML_VALUE);
         response.getWriter().write(html);
     }
 
-    private String renderTemplate(HttpServletRequest request, HttpServletResponse response, CsrfToken csrf) {
-        IWebExchange exchange = webApp.buildExchange(request, response);
-        var locale = RequestContextUtils.getLocale(request);
-        var ctx = new WebContext(exchange, locale);
+    private String renderTemplate(CsrfToken csrf) {
+        var ctx = new org.thymeleaf.context.Context();
         ctx.setVariable("loginProcessingPath", loginProcessingPath);
         ctx.setVariable("csrfHeaderName", csrf != null ? csrf.getHeaderName() : "X-CSRF-TOKEN");
         ctx.setVariable("csrfToken", csrf != null ? csrf.getToken() : "");