diff --git a/pom.xml b/pom.xml
index 265e7053..0d042853 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,6 +252,13 @@
0.12.6
runtime
+
+
+ io.jsonwebtoken
+ jjwt-jackson
+ 0.12.6
+ runtime
+
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 redisTemplate(RedisConnectionFactory connectionFactory) {
- RedisTemplate template = new RedisTemplate<>();
- template.setConnectionFactory(connectionFactory);
- return template;
- }
+ public RedisTemplate redisTemplate(RedisConnectionFactory factory) {
+ RedisTemplate template = new RedisTemplate<>();
+ template.setConnectionFactory(factory);
+ template.setKeySerializer(new StringRedisSerializer());
+ Jackson2JsonRedisSerializer serializer = new Jackson2JsonRedisSerializer<>(M_User.class);
+ template.setValueSerializer(serializer);
+ return template;
+ }
}