jwt implementation changes (#53)

* jwt implementation changes * fixed issues * fixed issue * user fetch from redis concept * user fetch concept modify * Update build-on-pull-request.yml * Update package.yml * Update build-on-pull-request.yml * Update package.yml * Update sast.yml * error fixed * minor error fix --------- Co-authored-by: IN40068837 <[email protected]> Co-authored-by: sandipkarmakar3 <[email protected]> Co-authored-by: sandipkarmakar3 <[email protected]>
PSMRI · Feb 10, 2025 · 5e16b7d · 5e16b7d
1 parent 7fe11c4
commit 5e16b7d
Show file tree

Hide file tree

Showing 18 changed files with 567 additions and 37 deletions.
diff --git a/.github/workflows/build-on-pull-request.yml b/.github/workflows/build-on-pull-request.yml
@@ -17,6 +17,7 @@ jobs:
         uses: actions/setup-java@v2
         with:
           java-version: 17
-          distribution: 'adopt'
+          distribution: 'zulu'
+
       - name: Build with Maven  
         run: mvn clean install
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -26,7 +26,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         java-version: 17
-        distribution: 'adopt'
+        distribution: 'zulu'
 
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}
@@ -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: FHIR-API
         path: target/fhirapi-v1.0.war
diff --git a/.github/workflows/sast.yml b/.github/workflows/sast.yml
@@ -41,10 +41,10 @@ jobs:
       uses: actions/setup-java@v2
       with:
           java-version: 17
-          distribution: 'adopt'
+          distribution: 'zulu'
 
     - name: Build with Maven
-      run: mvn clean install -DENV_VAR=test
+      run: mvn clean install
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2

diff --git a/pom.xml b/pom.xml
@@ -58,10 +58,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter</artifactId>
 		</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>
@@ -189,17 +189,15 @@
 			<artifactId>spring-boot-starter-mail</artifactId>
 		</dependency>
 
-		<!--
-		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
+		<!-- https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/hapi-fhir-structures-r4 -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-structures-r4</artifactId>
 			<version>7.0.2</version>
 		</dependency>
 
 
-		<!--
-		https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/org.hl7.fhir.utilities -->
+		<!-- https://mvnrepository.com/artifact/ca.uhn.hapi.fhir/org.hl7.fhir.utilities -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>org.hl7.fhir.utilities</artifactId>
@@ -235,6 +233,27 @@
 			<artifactId>json-path</artifactId>
 			<version>2.9.0</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>
+
 
 	</dependencies>
 
@@ -250,7 +269,7 @@
 					<format>HTML</format>
 					<nvdApiServerId>nvd</nvdApiServerId>
 				</configuration>
-				
+
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -329,8 +348,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>

diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
@@ -106,4 +106,5 @@ logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
 
 #ELK logging file name
-logging.file.name=@env.FHIR_API_LOGGING_FILE_NAME@
+logging.file.name=@env.FHIR_API_LOGGING_FILE_NAME@
+jwt.secret=@env.JWT_SECRET_KEY@
diff --git a/src/main/environment/common_dev.properties b/src/main/environment/common_dev.properties
@@ -103,3 +103,4 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
+jwt.secret=
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
@@ -104,3 +104,4 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
+jwt.secret=
diff --git a/src/main/environment/common_test.properties b/src/main/environment/common_test.properties
@@ -103,3 +103,4 @@ logging.level.org.springframework.web=INFO
 logging.level.org.hibernate=INFO
 logging.level.com.iemr=DEBUG
 logging.level.org.springframework=INFO
+jwt.secret=
diff --git a/src/main/java/com/wipro/fhir/FhirApiApplication.java b/src/main/java/com/wipro/fhir/FhirApiApplication.java
@@ -26,11 +26,32 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+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.wipro.fhir.data.users.User;
 
 @SpringBootApplication
 public class FhirApiApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(FhirApiApplication.class, args);
 	}
+
+	@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<User> serializer = new Jackson2JsonRedisSerializer<>(User.class);
+		template.setValueSerializer(serializer);
+
+		return template;
+	}
 }
diff --git a/src/main/java/com/wipro/fhir/config/RedisConfig.java b/src/main/java/com/wipro/fhir/config/RedisConfig.java
@@ -0,0 +1,40 @@
+package com.wipro.fhir.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.wipro.fhir.data.users.User;
+
+@Configuration
+@EnableCaching
+public class RedisConfig {
+
+	@Bean
+	public ConfigureRedisAction configureRedisAction() {
+		return ConfigureRedisAction.NO_OP;
+	}
+
+	@Bean
+	public RedisTemplate<String, User> redisTemplate(RedisConnectionFactory factory) {
+		RedisTemplate<String, User> template = new RedisTemplate<>();
+		template.setConnectionFactory(factory);
+
+		// Use StringRedisSerializer for keys (userId)
+		template.setKeySerializer(new StringRedisSerializer());
+
+		// Use Jackson2JsonRedisSerializer for values (Users objects)
+		Jackson2JsonRedisSerializer<User> serializer = new Jackson2JsonRedisSerializer<>(User.class);
+		template.setValueSerializer(serializer);
+
+		return template;
+	}
+
+}
+
+
diff --git a/src/main/java/com/wipro/fhir/data/users/User.java b/src/main/java/com/wipro/fhir/data/users/User.java
@@ -0,0 +1,28 @@
+package com.wipro.fhir.data.users;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import lombok.Data;
+
+@Entity
+@Table(name = "m_user")
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class User implements Serializable {
+	@Id
+	@GeneratedValue(strategy = GenerationType.IDENTITY)
+	@Column(name = "UserID")
+	private Long userID;
+	@Column(name = "userName")
+	private String userName;
+	@Column(name = "Deleted", insertable = false, updatable = true)
+	private Boolean deleted;
+}
diff --git a/src/main/java/com/wipro/fhir/repo/user/UserLoginRepo.java b/src/main/java/com/wipro/fhir/repo/user/UserLoginRepo.java
@@ -0,0 +1,16 @@
+package com.wipro.fhir.repo.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.wipro.fhir.data.users.User;
+
+@Repository
+public interface UserLoginRepo extends CrudRepository<User, Long> {
+
+	@Query(" SELECT u FROM User u WHERE u.userID = :userID AND u.deleted = false ")
+	public User getUserByUserID(@Param("userID") Long userID);
+
+}