Fixed cookie rewrite

samie · Jul 25, 2024 · d84ba55 · d84ba55
1 parent f6d01e4
commit d84ba55
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/main/java/com/example/application/CORSFilter.java b/src/main/java/com/example/application/CORSFilter.java
@@ -39,13 +39,13 @@ public void doFilter(HttpServletRequest request, HttpServletResponse response, F
         filterChain.doFilter(request, response);
 
         Collection<String> cookieHeaders = response.getHeaders("Set-Cookie");
-        cookieHeaders.forEach(c -> {
-            if (c.startsWith("JSESSIONID")) {
-                response.setHeader("Set-Cookie", makeSameSite(c));
-            } else {
-                response.addHeader("Set-Cookie", c);
-            }
-        });
+        cookieHeaders.stream()
+                .filter(c -> c.startsWith("JSESSIONID"))
+                .findFirst()
+                .ifPresent(sessionIdCookie -> response.setHeader("Set-Cookie", makeSameSite(sessionIdCookie)));
+        cookieHeaders.stream()
+              .filter(c -> !c.startsWith("JSESSIONID"))
+              .forEach(c -> response.addHeader("Set-Cookie", c));
 
     }