From 914f0de59f95aad74917417b2d528c15c0a51c08 Mon Sep 17 00:00:00 2001
From: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>
Date: Mon, 21 Jul 2025 19:45:33 +0530
Subject: [PATCH 1/3] 401 issue and empty check

---
 pom.xml                                         |  7 +++++++
 .../flw/utils/JwtUserIdValidationFilter.java    |  2 +-
 .../flw/utils/http/HTTPRequestInterceptor.java  |  2 +-
 .../com/iemr/flw/utils/redis/RedisConfig.java   | 17 ++++++++++++-----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 265e7053..0d042853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,6 +252,13 @@
 			<version>0.12.6</version>
 			<scope>runtime</scope>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-jackson -->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId>
+			<version>0.12.6</version>
+			<scope>runtime</scope>
+		</dependency>
 	</dependencies>
 
     <profiles>
diff --git a/src/main/java/com/iemr/flw/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/flw/utils/JwtUserIdValidationFilter.java
index 7cc17200..fcefd712 100644
--- a/src/main/java/com/iemr/flw/utils/JwtUserIdValidationFilter.java
+++ b/src/main/java/com/iemr/flw/utils/JwtUserIdValidationFilter.java
@@ -89,7 +89,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
 
 			if (jwtToken != null) {
 				logger.info("Validating JWT token from cookie");
-				if (jwtAuthenticationUtil.validateUserIdAndJwtToken(jwtFromCookie)) {
+				if (jwtAuthenticationUtil.validateUserIdAndJwtToken(jwtToken)) {
 
 					AuthorizationHeaderRequestWrapper authorizationHeaderRequestWrapper = new AuthorizationHeaderRequestWrapper(
 							request, "");
diff --git a/src/main/java/com/iemr/flw/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/flw/utils/http/HTTPRequestInterceptor.java
index f847c2e1..8b0fd52e 100644
--- a/src/main/java/com/iemr/flw/utils/http/HTTPRequestInterceptor.java
+++ b/src/main/java/com/iemr/flw/utils/http/HTTPRequestInterceptor.java
@@ -115,7 +115,7 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response,
 			logger.debug("In postHandle we are Intercepting the Request");
 			String authorization = request.getHeader("Authorization");
 			logger.debug("RequestURI::" + request.getRequestURI() + " || Authorization ::" + authorization);
-			if (authorization != null) {
+			if (authorization != null && !authorization.equals("")) {
 				sessionObject.updateSessionObject(authorization, sessionObject.getSessionObject(authorization));
 			}
 		} catch (Exception e) {
diff --git a/src/main/java/com/iemr/flw/utils/redis/RedisConfig.java b/src/main/java/com/iemr/flw/utils/redis/RedisConfig.java
index 873a6fc9..9eb4574d 100644
--- a/src/main/java/com/iemr/flw/utils/redis/RedisConfig.java
+++ b/src/main/java/com/iemr/flw/utils/redis/RedisConfig.java
@@ -4,13 +4,20 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import com.iemr.flw.domain.iemr.M_User;
 
 @Configuration
 public class RedisConfig {
 	@Bean
-    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory connectionFactory) {
-        RedisTemplate<String, Object> template = new RedisTemplate<>();
-        template.setConnectionFactory(connectionFactory);
-        return template;
-    }
+	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+		RedisTemplate<String, Object> template = new RedisTemplate<>();
+		template.setConnectionFactory(factory);
+		template.setKeySerializer(new StringRedisSerializer());
+		Jackson2JsonRedisSerializer<M_User> serializer = new Jackson2JsonRedisSerializer<>(M_User.class);
+		template.setValueSerializer(serializer);
+		return template;
+	}
 }

From 3902343693c6a356df5365c3b6bb5f28a9315472 Mon Sep 17 00:00:00 2001
From: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>
Date: Tue, 22 Jul 2025 15:03:39 +0530
Subject: [PATCH 2/3] deployment failed

---
 pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0d042853..d5e548ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,12 @@
 			<version>0.12.6</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+  			<groupId>org.jboss.weld.se</groupId>
+  			<artifactId>weld-se-core</artifactId>
+  			<version>4.0.3.Final</version> <!-- or latest -->
+		</dependency>
+
 	</dependencies>
 
     <profiles>

From e4b64b9c7d237954737db4d0e6fbd288837ce9e3 Mon Sep 17 00:00:00 2001
From: Ravi Shanigarapu <ravi.shanigarapu@wipro.com>
Date: Tue, 22 Jul 2025 15:22:49 +0530
Subject: [PATCH 3/3] Changes in pom.xml

---
 pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5e548ec..0d042853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,12 +259,6 @@
 			<version>0.12.6</version>
 			<scope>runtime</scope>
 		</dependency>
-		<dependency>
-  			<groupId>org.jboss.weld.se</groupId>
-  			<artifactId>weld-se-core</artifactId>
-  			<version>4.0.3.Final</version> <!-- or latest -->
-		</dependency>
-
 	</dependencies>
 
     <profiles>