PSMRI · vanitha1822 · Aug 22, 2025 · Aug 7, 2025 · Aug 22, 2025 · Aug 22, 2025
diff --git a/pom.xml b/pom.xml
@@ -220,6 +220,26 @@
 			<artifactId>spring-web</artifactId>
 			<version>6.1.12</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 NEW DEPENDENCIES ADDED-->
 	</dependencies>
 	<profiles>

diff --git a/src/main/environment/1097_ci.properties b/src/main/environment/1097_ci.properties
@@ -11,13 +11,15 @@ logging.file.name=@env.IDENTITY_API_1097_LOGGING_FILE_NAME@
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
 springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 
-jwt.secret=@JWT_SECRET_KEY@
+jwt.secret=@env.JWT_SECRET_KEY@
 
  # TM Config
-tm-url=@TM_API@
+tm-url=@env.TM_API@
 
 # FHIR Config
-fhir-url=@FHIR_API@
+fhir-url=@env.FHIR_API@
 
 # Redis Config
-spring.redis.host=@env.REDIS_HOST@
+spring.redis.host=@env.REDIS_HOST@
+
+cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
diff --git a/src/main/environment/1097_docker.properties b/src/main/environment/1097_docker.properties
@@ -19,4 +19,6 @@ tm-url=${TM_API}
 fhir-url=${FHIR_API}
 
 # Redis Config
-spring.redis.host=${REDIS_HOST}
+spring.redis.host=${REDIS_HOST}
+
+cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
diff --git a/src/main/environment/1097_example.properties b/src/main/environment/1097_example.properties
@@ -17,4 +17,5 @@ tm-url=http://localhost:8089/
 fhir-url=http://localhost:8093/
 
 # Redis Config
-spring.redis.host=localhost
+spring.redis.host=localhost
+cors.allowed-origins=http://localhost:*
diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties
@@ -11,13 +11,15 @@ logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@
 springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
 springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
 
-jwt.secret=@JWT_SECRET_KEY@
+jwt.secret=@env.JWT_SECRET_KEY@
 
  # TM Config
-tm-url=@TM_API@
+tm-url=@env.TM_API@
 
 # FHIR Config
-fhir-url=@FHIR_API@
+fhir-url=@env.FHIR_API@
 
 # Redis Config
-spring.redis.host=@env.REDIS_HOST@
+spring.redis.host=@env.REDIS_HOST@
+
+cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
diff --git a/src/main/environment/common_docker.properties b/src/main/environment/common_docker.properties
@@ -20,4 +20,6 @@ tm-url=${TM_API}
 fhir-url=${FHIR_API}
 
 # Redis Config
-spring.redis.host=${REDIS_HOST}
+spring.redis.host=${REDIS_HOST}
+
+cors.allowed-origins=${CORS_ALLOWED_ORIGINS}
diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties
@@ -16,4 +16,5 @@ tm-url=http://localhost:8089/
 fhir-url=http://localhost:8093/
 
 # Redis Config
-spring.redis.host=localhost
+spring.redis.host=localhost
+cors.allowed-origins=http://localhost:*
diff --git a/src/main/java/com/iemr/common/identity/config/CorsConfig.java b/src/main/java/com/iemr/common/identity/config/CorsConfig.java
@@ -0,0 +1,23 @@
+package com.iemr.common.identity.config;
+
+import java.util.Arrays;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class CorsConfig implements WebMvcConfigurer {
+	@Value("${cors.allowed-origins}")
+	private String allowedOrigins;
+
+	@Override
+	public void addCorsMappings(CorsRegistry registry) {
+		registry.addMapping("/**").allowedOriginPatterns(
+				allowedOrigins != null && !allowedOrigins.trim().isEmpty() ? Arrays.stream(allowedOrigins.split(","))
+						.map(String::trim).filter(s -> !s.isEmpty()).toArray(String[]::new) : new String[0])
+				.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS").allowedHeaders("*")
+				.exposedHeaders("Authorization", "Jwttoken").allowCredentials(true).maxAge(3600);
+	}
+}
diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -33,7 +33,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -83,7 +82,6 @@ public class IdentityController {
 	@Autowired
 	IdentityMapper mapper;
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Get beneficiaries by advance search")
 	@PostMapping(path = "/advanceSearch", headers = "Authorization")
 	public String getBeneficiaries(
@@ -112,7 +110,6 @@ public String getBeneficiaries(
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search beneficiary based on beneficiary registration id")
 	@PostMapping(path = "/getByBenRegId", headers = "Authorization")
 	public String getBeneficiariesByBeneficiaryRegId(
@@ -137,7 +134,6 @@ public String getBeneficiariesByBeneficiaryRegId(
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search identity based on beneficiary registration id")
 	@PostMapping(path = "/getByBenId", headers = "Authorization")
 	public String getBeneficiariesByBeneficiaryId(
@@ -172,7 +168,6 @@ public String getBeneficiariesByBeneficiaryId(
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search beneficiary based on phone number")
 	@PostMapping(path = "/getByPhoneNum", headers = "Authorization")
 	public String getBeneficiariesByPhoneNum(
@@ -203,7 +198,6 @@ public String getBeneficiariesByPhoneNum(
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search beneficiary based on health ID / ABHA Address")
 	@PostMapping(path = "/getByAbhaAddress", headers = "Authorization")
 	public String searhBeneficiaryByABHAAddress(
@@ -235,7 +229,6 @@ public String searhBeneficiaryByABHAAddress(
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search beneficiary based on health ID number / ABHA ID number")
 	@PostMapping(path = "/getByAbhaIdNo", headers = "Authorization")
 	public String searhBeneficiaryByABHAIdNo(
@@ -267,7 +260,6 @@ public String searhBeneficiaryByABHAIdNo(
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search beneficiary based on family id")
 	@PostMapping(path = "/searchByFamilyId", headers = "Authorization")
 	public String searhBeneficiaryByFamilyId(
@@ -297,7 +289,6 @@ public String searhBeneficiaryByFamilyId(
 	}
 
 	// search beneficiary by lastModDate and districtID
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary ="Search beneficiary by villageId and last modified date-time")
 	@PostMapping(path = "/searchByVillageIdAndLastModifiedDate")
 	public String searchBeneficiaryByVillageIdAndLastModDate(
@@ -322,7 +313,6 @@ public String searchBeneficiaryByVillageIdAndLastModDate(
 		return response;
 	}
 	// search beneficiary by lastModDate and districtID
-		@CrossOrigin(origins = { "*commonapi*" })
 		@Operation(summary ="Get count of beneficiary by villageId and last modified date-time")
 		@PostMapping(path = "/countBenByVillageIdAndLastModifiedDate")
 		public String countBeneficiaryByVillageIdAndLastModDate(
@@ -342,7 +332,6 @@ public String countBeneficiaryByVillageIdAndLastModDate(
 			}
 			return response;
 		}
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Search beneficiary based on government identity number")
 	@PostMapping(path = "/searhByGovIdentity", headers = "Authorization")
 	public String searhBeneficiaryByGovIdentity(
@@ -376,7 +365,6 @@ public String searhBeneficiaryByGovIdentity(
 	 * @param identityEditData
 	 * @return
 	 */
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Edit identity by agent")
 	@PostMapping(path = "/edit", headers = "Authorization")
 	public String editIdentity(@Param(value = "{\r\n" + "  \"eventTypeName\": \"String\",\r\n"
@@ -508,7 +496,6 @@ public String editIdentity(@Param(value = "{\r\n" + "  \"eventTypeName\": \"Stri
 	 * @param identityData
 	 * @return
 	 */
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Create identity by agent")
 	@PostMapping(path = "/create", headers = "Authorization")
 	public String createIdentity(@Param(value = "{\r\n" + "  \"eventTypeName\": \"String\",\r\n"
@@ -615,7 +602,6 @@ public String createIdentity(@Param(value = "{\r\n" + "  \"eventTypeName\": \"St
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Reserve identity by agent")
 	@PostMapping(path = "/reserve", headers = "Authorization")
 	public String reserveIdentity(@RequestBody String reserveIdentity) {
@@ -635,7 +621,6 @@ public String reserveIdentity(@RequestBody String reserveIdentity) {
 		return response;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Unreserve identity by agent")
 	@PostMapping(path = "/unreserve", headers = "Authorization")
 	public String unreserveIdentity(@RequestBody String unreserve) {
@@ -661,7 +646,6 @@ public String unreserveIdentity(@RequestBody String unreserve) {
 	 * @param benRegIds
 	 * @return
 	 */
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Get beneficiaries partial details by beneficiary registration id list")
 	@PostMapping(path = "/getByPartialBenRegIdList", headers = "Authorization")
 	public String getPartialBeneficiariesByBenRegIds(
@@ -693,7 +677,6 @@ public String getPartialBeneficiariesByBenRegIds(
 	 * @param benRegIds
 	 * @return
 	 */
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Get beneficiaries by beneficiary registration id")
 	@PostMapping(path = "/getByBenRegIdList", headers = "Authorization")
 	public String getBeneficiariesByBenRegIds(
@@ -792,7 +775,6 @@ public String getJsonAsString(Object obj) {
 		return sb.toString();
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Get finite beneficiaries")
 	@PostMapping(path = "/finiteSearch", headers = "Authorization")
 	public String getFiniteBeneficiaries(@RequestBody String searchFilter) {
@@ -816,7 +798,6 @@ public String getFiniteBeneficiaries(@RequestBody String searchFilter) {
 	}
 
 	// New API for getting beneficiary image only.
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Get beneficiary image by beneficiary registration id")
 	@PostMapping(path = "/benImageByBenRegID", headers = "Authorization")
 	public String getBeneficiaryImageByBenRegID(@RequestBody String identityData) {
@@ -830,7 +811,6 @@ public String getBeneficiaryImageByBenRegID(@RequestBody String identityData) {
 		return benImage;
 	}
 
-	@CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Edit education or community by agent")
 	@PostMapping(path = "/editEducationOrCommunity", headers = "Authorization")
 	public String editIdentityEducationOrCommunity(@Param(value = "{\r\n"
@@ -957,7 +937,6 @@ public String editIdentityEducationOrCommunity(@Param(value = "{\r\n"
 		}
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Check available beneficary id in local server")
 	@GetMapping(path = "/checkAvailablBenIDLocalServer", headers = "Authorization")
 	public String checkAvailablBenIDLocalServer() {
@@ -972,7 +951,6 @@ public String checkAvailablBenIDLocalServer() {
 		return response.toString();
 	}
 
-	// @CrossOrigin(origins = { "*commonapi*" })
 	@Operation(summary = "Save server generated beneficiary ID & beneficiary registration ID to local server")
 	@PostMapping(path = "/saveGeneratedBenIDToLocalServer", headers = "Authorization", consumes = "application/json", produces = "application/json")
 	public String saveGeneratedBenIDToLocalServer(

diff --git a/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java b/src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java
@@ -24,7 +24,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,15 +34,13 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 
-@CrossOrigin
 @RestController
 @RequestMapping({ "/family" })
 public class FamilyTaggingController {
 	private Logger logger = LoggerFactory.getLogger(FamilyTaggingController.class);
 	@Autowired
 	private FamilyTagService familyTagService;
 
-	@CrossOrigin()
 	@Operation(summary = "Create and modify family tagging")
 	@PostMapping(value = { "/addTag" }, consumes = "application/json", produces = "application/json")
 	public String saveFamilyTagging(@RequestBody String comingReq) {
@@ -59,7 +56,6 @@ public String saveFamilyTagging(@RequestBody String comingReq) {
 		return response.toString();
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Create family")
 	@PostMapping(value = { "/createFamily" }, consumes = "application/json", produces = "application/json")
 	public String createFamily(@RequestBody String comingReq) {
@@ -75,7 +71,6 @@ public String createFamily(@RequestBody String comingReq) {
 		return response.toString();
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Search family")
 	@PostMapping(value = { "/searchFamily" }, consumes = "application/json", produces = "application/json")
 	public String searchFamily(@RequestBody String comingReq) {
@@ -91,7 +86,6 @@ public String searchFamily(@RequestBody String comingReq) {
 		return response.toString();
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Get family members details")
 	@PostMapping(value = { "/getFamilyDetails" }, consumes = "application/json", produces = "application/json")
 	public String getFamilyDatails(@RequestBody String comingReq) {
@@ -107,7 +101,6 @@ public String getFamilyDatails(@RequestBody String comingReq) {
 		return response.toString();
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Untag beneficiary from a family")
 	@PostMapping(value = { "/untag" }, consumes = "application/json", produces = "application/json")
 	public String untagFamily(@RequestBody String comingReq) {
@@ -123,7 +116,6 @@ public String untagFamily(@RequestBody String comingReq) {
 		return response.toString();
 	}
 
-	@CrossOrigin()
 	@Operation(summary = "Edit beneficiary family details")
 	@PostMapping(value = { "/editFamilyTagging" }, consumes = "application/json", produces = "application/json")
 	public String editFamilyDetails(@RequestBody String comingReq) {

diff --git a/src/main/java/com/iemr/common/identity/controller/version/VersionController.java b/src/main/java/com/iemr/common/identity/controller/version/VersionController.java
@@ -28,7 +28,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -41,7 +40,6 @@ public class VersionController {
 
 	private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
-	@CrossOrigin()
 	@Operation(summary = "Get version information")
 	@GetMapping(value = "/version",consumes = "application/json", produces = "application/json")
 	public String versionInformation() {