From 016f2a2508fa7378c0785263a31879bb7d9ef356 Mon Sep 17 00:00:00 2001 From: IN40068837 Date: Wed, 12 Mar 2025 17:04:29 +0530 Subject: [PATCH 1/2] cookieutil change --- src/main/java/com/iemr/common/utils/CookieUtil.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/utils/CookieUtil.java b/src/main/java/com/iemr/common/utils/CookieUtil.java index 55fec9f5..7a9e59a8 100644 --- a/src/main/java/com/iemr/common/utils/CookieUtil.java +++ b/src/main/java/com/iemr/common/utils/CookieUtil.java @@ -41,7 +41,7 @@ public void addJwtTokenToCookie(String Jwttoken, HttpServletResponse response, H String sameSite = "None"; // Allow cross-site cookies (can be 'Strict', 'Lax', or 'None') cookie.setSecure(true); // Add the cookie to the response - response.addCookie(cookie); + // response.addCookie(cookie); // Build the Set-Cookie header manually (to add SameSite attribute support) StringBuilder cookieHeader = new StringBuilder(); @@ -61,6 +61,9 @@ public void addJwtTokenToCookie(String Jwttoken, HttpServletResponse response, H } public String getJwtTokenFromCookie(HttpServletRequest request) { + if (request.getCookies() == null) { + return null; // If cookies are null, return null safely. + } return Arrays.stream(request.getCookies()).filter(cookie -> "Jwttoken".equals(cookie.getName())) .map(Cookie::getValue).findFirst().orElse(null); } From 74c35d98125ccaf63b31c5e273270bd347d2cd95 Mon Sep 17 00:00:00 2001 From: IN40068837 Date: Wed, 12 Mar 2025 17:10:27 +0530 Subject: [PATCH 2/2] sonarCloud checks resolved --- src/main/java/com/iemr/common/utils/CookieUtil.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/iemr/common/utils/CookieUtil.java b/src/main/java/com/iemr/common/utils/CookieUtil.java index 7a9e59a8..8c0a0b76 100644 --- a/src/main/java/com/iemr/common/utils/CookieUtil.java +++ b/src/main/java/com/iemr/common/utils/CookieUtil.java @@ -40,8 +40,6 @@ public void addJwtTokenToCookie(String Jwttoken, HttpServletResponse response, H // Set the SameSite attribute for cross-site request handling (if needed) String sameSite = "None"; // Allow cross-site cookies (can be 'Strict', 'Lax', or 'None') cookie.setSecure(true); - // Add the cookie to the response - // response.addCookie(cookie); // Build the Set-Cookie header manually (to add SameSite attribute support) StringBuilder cookieHeader = new StringBuilder();