fix: allow null response in logout

Don't throw NullPointerException in case of null VaadinServletResponse in AuthenticationContext#logout. Fixes: #20017
vaadin · Sep 25, 2024 · 177b55e · 177b55e
1 parent 69e2800
commit 177b55e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/AuthenticationContext.java b/vaadin-spring/src/main/java/com/vaadin/flow/spring/security/AuthenticationContext.java
@@ -129,8 +129,10 @@ public boolean isAuthenticated() {
     public void logout() {
         HttpServletRequest request = VaadinServletRequest.getCurrent()
                 .getHttpServletRequest();
-        HttpServletResponse response = VaadinServletResponse.getCurrent()
-                .getHttpServletResponse();
+        HttpServletResponse response = Optional
+                .ofNullable(VaadinServletResponse.getCurrent())
+                .map(VaadinServletResponse::getHttpServletResponse)
+                .orElse(null);
         Authentication auth = SecurityContextHolder.getContext()
                 .getAuthentication();