Jwt api implementation (#62)

indraniBan · IN40068837 · Indrani Bandyopadhyay · web-flow · commit 482481d7d424 · 2025-02-10T15:44:19.000+05:30
* jwt implementation

* application prop

* Formatting and dependency upgrade

* corrected coderabbit comments

* fixed issues

* userId fetch from redis concept

* user class modify

* user fetch concept modify

* Update package.yml

---------

Co-authored-by: IN40068837 &lt;IN40068837@L-156289031.wipro.com&gt;
Co-authored-by: Indrani Bandyopadhyay &lt;IN40068837@wipro.com&gt;
Co-authored-by: sandipkarmakar3 &lt;146804504+sandipkarmakar3@users.noreply.github.com&gt;
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -35,7 +35,7 @@ jobs:
       run: mvn -B package --file pom.xml
       
     - name: Upload WAR file as artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Admin-API
         path: target/adminapi-v1.0.war 
diff --git a/bin/.gitignore b/bin/.gitignore
@@ -0,0 +1,38 @@
+target/
+!.mvn/wrapper/maven-wrapper.jar
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+.nb-gradle/
+
+#Config
+config.service.ts
+config.json
+
+# Other entries
+/Piramal - Shortcut.lnk
+.tern-project
+mvnw
+mvnw.cmd
+.mvn/
+
+# Properties
+src/main/environment/admin_local.properties
diff --git a/pom.xml b/pom.xml
@@ -64,10 +64,10 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency> 
-			<groupId>co.elastic.logging</groupId> 
-			<artifactId>logback-ecs-encoder</artifactId> 
-			<version>1.3.2</version> 
+		<dependency>
+			<groupId>co.elastic.logging</groupId>
+			<artifactId>logback-ecs-encoder</artifactId>
+			<version>1.3.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -106,8 +106,7 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 			<scope>provided</scope>
 		</dependency>
-		<!--
-		https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client -->
+		<!-- https://mvnrepository.com/artifact/org.glassfish.jersey.core/jersey-client -->
 		<dependency>
 			<groupId>org.glassfish.jersey.core</groupId>
 			<artifactId>jersey-client</artifactId>
@@ -240,8 +239,7 @@
 			<artifactId>jackson-datatype-joda</artifactId>
 			<version>2.17.0</version>
 		</dependency>
-		<!--
-		https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
@@ -253,6 +251,26 @@
 			<artifactId>jackson-core</artifactId>
 			<version>2.17.0-rc1</version>
 		</dependency>
+		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-api -->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.12.6</version>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/io.jsonwebtoken/jjwt-impl -->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<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>
 		<!-- end newly added dependencies -->
 	</dependencies>
 
@@ -273,7 +291,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<version>3.0.2</version>
 			</plugin>
-			
+
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
@@ -364,8 +382,7 @@
 									${target-properties} and
 									${source-properties}
 								</echo>
-								<concat destfile="${target-properties}"
-									append="yes"
+								<concat destfile="${target-properties}" append="yes"
 									force="yes">
 									<fileset file="${source-properties}">
 									</fileset>
@@ -416,6 +433,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -444,6 +462,7 @@
 					</execution>
 				</executions>
 			</plugin>
+
 		</plugins>
 	</build>
 	<reporting>
diff --git a/src/main/environment/admin_ci.properties b/src/main/environment/admin_ci.properties
@@ -16,6 +16,7 @@ videoConsultation-base-url=@env.SWYMED_BASE_URL@
 ### Redis IP
 spring.redis.host=localhost
 spring.main.allow-bean-definition-overriding=true
+jwt.secret=@env.JWT_SECRET_KEY@
 
 #ELK logging file name
-logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@
+logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@
diff --git a/src/main/environment/admin_dev.properties b/src/main/environment/admin_dev.properties
@@ -16,4 +16,5 @@ videoConsultation-base-url=https://psmri.swymed.com:92744
 ### Redis IP
 spring.redis.host=localhost
 spring.main.allow-bean-definition-overriding=true
+jwt.secret=
 
diff --git a/src/main/environment/admin_example.properties b/src/main/environment/admin_example.properties
@@ -18,4 +18,5 @@ videoConsultation-base-url=https://psmri.swymed.com:9274
 ### Redis IP
 spring.redis.host=localhost
 spring.main.allow-bean-definition-overriding=true
+jwt.secret=
 
diff --git a/src/main/environment/admin_test.properties b/src/main/environment/admin_test.properties
@@ -15,4 +15,5 @@ videoConsultation-base-url=https://psmri.swymed.com:9274
 ### Redis IP
 spring.redis.host=localhost
 spring.main.allow-bean-definition-overriding=true
+jwt.secret=
 
diff --git a/src/main/environment/admin_uat.properties b/src/main/environment/admin_uat.properties
@@ -15,4 +15,5 @@ videoConsultation-base-url=https://psmri.swymed.com:9274
 ### Redis IP
 spring.redis.host=localhost
 spring.main.allow-bean-definition-overriding=true
+jwt.secret=
 
diff --git a/src/main/java/com/iemr/admin/RoleMasterApplication.java b/src/main/java/com/iemr/admin/RoleMasterApplication.java
@@ -26,7 +26,12 @@
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
+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.admin.data.user.M_User;
 import com.iemr.admin.utils.IEMRApplBeans;
 import com.iemr.admin.utils.config.ConfigProperties;
 
@@ -51,4 +56,19 @@ public IEMRApplBeans instantiateBeans() {
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
 		return builder.sources(new Class[] { RoleMasterApplication.class });
 	}
+
+	@Bean
+	public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+		RedisTemplate<String, Object> template = new RedisTemplate<>();
+		template.setConnectionFactory(factory);
+
+		// Use StringRedisSerializer for keys (userId)
+		template.setKeySerializer(new StringRedisSerializer());
+
+		// Use Jackson2JsonRedisSerializer for values (Users objects)
+		Jackson2JsonRedisSerializer<M_User> serializer = new Jackson2JsonRedisSerializer<>(M_User.class);
+		template.setValueSerializer(serializer);
+
+		return template;
+	}
 }
diff --git a/src/main/java/com/iemr/admin/config/RedisConfig.java b/src/main/java/com/iemr/admin/config/RedisConfig.java
@@ -0,0 +1,40 @@
+package com.iemr.admin.config;
+
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+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 org.springframework.session.data.redis.config.ConfigureRedisAction;
+
+import com.iemr.admin.data.user.M_User;
+
+
+@Configuration
+@EnableCaching
+public class RedisConfig {
+
+	@Bean
+	public ConfigureRedisAction configureRedisAction() {
+		return ConfigureRedisAction.NO_OP;
+	}
+
+	@Bean
+	public RedisTemplate<String, M_User> redisTemplate(RedisConnectionFactory factory) {
+		RedisTemplate<String, M_User> template = new RedisTemplate<>();
+		template.setConnectionFactory(factory);
+
+		// Use StringRedisSerializer for keys (userId)
+		template.setKeySerializer(new StringRedisSerializer());
+
+		// Use Jackson2JsonRedisSerializer for values (Users objects)
+		Jackson2JsonRedisSerializer<M_User> serializer = new Jackson2JsonRedisSerializer<>(M_User.class);
+		template.setValueSerializer(serializer);
+
+		return template;
+	}
+
+}
+
diff --git a/src/main/java/com/iemr/admin/data/user/M_User.java b/src/main/java/com/iemr/admin/data/user/M_User.java
@@ -21,10 +21,12 @@
 */
 package com.iemr.admin.data.user;
 
+import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Map;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.google.gson.annotations.Expose;
 import com.iemr.admin.utils.mapper.OutputMapper;
 
@@ -38,7 +40,8 @@
 
 @Entity
 @Table(name = "M_User")
-public class M_User {
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class M_User implements Serializable {
 	
 	@Id
 	   @GeneratedValue(strategy = GenerationType.IDENTITY)
diff --git a/src/main/java/com/iemr/admin/repository/user/UserLoginRepo.java b/src/main/java/com/iemr/admin/repository/user/UserLoginRepo.java
@@ -0,0 +1,16 @@
+package com.iemr.admin.repository.user;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import com.iemr.admin.data.user.M_User;
+
+@Repository
+public interface UserLoginRepo extends CrudRepository<M_User, Long> {
+
+	@Query(" SELECT u FROM M_User u WHERE u.userID = :userID AND u.Deleted = false ")
+	public M_User getUserByUserID(@Param("userID") Long userID);
+
+}
diff --git a/src/main/java/com/iemr/admin/utils/CookieUtil.java b/src/main/java/com/iemr/admin/utils/CookieUtil.java
@@ -0,0 +1,30 @@
+package com.iemr.admin.utils;
+
+import java.util.Arrays;
+import java.util.Optional;
+
+import org.springframework.stereotype.Service;
+
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+
+@Service
+public class CookieUtil {
+
+	public Optional<String> getCookieValue(HttpServletRequest request, String cookieName) {
+		Cookie[] cookies = request.getCookies();
+		if (cookies != null) {
+			for (Cookie cookie : cookies) {
+				if (cookieName.equals(cookie.getName())) {
+					return Optional.of(cookie.getValue());
+				}
+			}
+		}
+		return Optional.empty();
+	}
+
+	public String getJwtTokenFromCookie(HttpServletRequest request) {
+		return Arrays.stream(request.getCookies()).filter(cookie -> "Jwttoken".equals(cookie.getName()))
+				.map(Cookie::getValue).findFirst().orElse(null);
+	}
+}
diff --git a/src/main/java/com/iemr/admin/utils/FilterConfig.java b/src/main/java/com/iemr/admin/utils/FilterConfig.java
@@ -0,0 +1,19 @@
+package com.iemr.admin.utils;
+
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FilterConfig {
+
+	@Bean
+	public FilterRegistrationBean<JwtUserIdValidationFilter> jwtUserIdValidationFilter(
+			JwtAuthenticationUtil jwtAuthenticationUtil) {
+		FilterRegistrationBean<JwtUserIdValidationFilter> registrationBean = new FilterRegistrationBean<>();
+		registrationBean.setFilter(new JwtUserIdValidationFilter(jwtAuthenticationUtil));
+		registrationBean.addUrlPatterns("/*"); // Apply filter to all API endpoints
+		return registrationBean;
+	}
+
+}
diff --git a/src/main/java/com/iemr/admin/utils/JwtAuthenticationUtil.java b/src/main/java/com/iemr/admin/utils/JwtAuthenticationUtil.java
diff --git a/src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/admin/utils/JwtUserIdValidationFilter.java
diff --git a/src/main/java/com/iemr/admin/utils/JwtUtil.java b/src/main/java/com/iemr/admin/utils/JwtUtil.java
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
