diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 8a1cca17..6ef73976 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -1091,7 +1091,9 @@ public ResponseEntity getJwtTokenFromCookie(HttpServletRequest httpReque if (cookies != null) { for (Cookie cookie : cookies) { - if ("Jwttoken".equals(cookie.getName())) { + + if ("Jwttoken".equalsIgnoreCase(cookie.getName())) { + String jwtToken = cookie.getValue(); // Return the JWT token in the response return ResponseEntity.ok(jwtToken); diff --git a/src/main/java/com/iemr/common/utils/CookieUtil.java b/src/main/java/com/iemr/common/utils/CookieUtil.java index 85abf4e9..12da4137 100644 --- a/src/main/java/com/iemr/common/utils/CookieUtil.java +++ b/src/main/java/com/iemr/common/utils/CookieUtil.java @@ -69,7 +69,7 @@ public static 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())) + return Arrays.stream(request.getCookies()).filter(cookie -> "Jwttoken".equalsIgnoreCase(cookie.getName())) .map(Cookie::getValue).findFirst().orElse(null); } } diff --git a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java index 2dff1792..6bbf29bb 100644 --- a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java @@ -41,7 +41,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo Cookie[] cookies = request.getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { - if ("userId".equals(cookie.getName())) { + if ("userId".equalsIgnoreCase(cookie.getName())) { logger.warn("userId found in cookies! Clearing it..."); clearUserIdCookie(response); // Explicitly remove userId cookie } @@ -133,7 +133,7 @@ private String getJwtTokenFromCookies(HttpServletRequest request) { Cookie[] cookies = request.getCookies(); if (cookies != null) { for (Cookie cookie : cookies) { - if (cookie.getName().equals("Jwttoken")) { + if (cookie.getName().equalsIgnoreCase("Jwttoken")) { return cookie.getValue(); } }