middleware added through FilterConfig for JWT Token Validation.

pom.xml

@@ -218,6 +218,40 @@
 			<artifactId>spring-web</artifactId>
 			<version>6.1.12</version>
 		</dependency>
+
+		<!-- Jersey JSON Processing -->
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-processing</artifactId>
+			<version>2.30.1</version>
+		</dependency>
+
+		<!-- JAXB Runtime Implementation -->
+		<dependency>
+			<groupId>org.glassfish.jaxb</groupId>
+			<artifactId>jaxb-runtime</artifactId>
+			<version>2.3.1</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>

src/main/environment/1097_ci.properties

@@ -5,4 +5,6 @@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 #ELK logging file name
-logging.file.name=@env.IDENTITY_API_1097_LOGGING_FILE_NAME@
+logging.file.name=@env.IDENTITY_API_1097_LOGGING_FILE_NAME@
+
+cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS

src/main/environment/1097_dev.properties

@@ -6,3 +6,4 @@ spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 
+cors.allowed-origins==

src/main/environment/1097_example.properties

@@ -5,3 +5,4 @@ spring.datasource.url=jdbc:mysql://localhost:3306/db_identity
 spring.datasource.username=root
 spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+cors.allowed-origins=

src/main/environment/1097_test.properties

@@ -5,4 +5,4 @@ spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
-
+cors.allowed-origins=

src/main/environment/1097_uat.properties

@@ -5,3 +5,4 @@ spring.datasource.url=<Enter AMRIT DB_1097_IDENTITY URL here>
 spring.datasource.username=<Enter your AMRIT DB_1097_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_1097_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+cors.allowed-origins=

src/main/environment/common_ci.properties

@@ -5,4 +5,6 @@ spring.datasource.password=@env.DATABASE_IDENTITY_PASSWORD@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
 #ELK logging file name
-logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@
+logging.file.name=@env.IDENTITY_API_LOGGING_FILE_NAME@
+
+cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS

src/main/environment/common_dev.properties

@@ -4,4 +4,4 @@ spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
-
+cors.allowed-origins=

src/main/environment/common_example.properties

@@ -4,3 +4,5 @@ spring.datasource.url=jdbc:mysql://localhost:3306/db_iemr
 spring.datasource.username=root
 spring.datasource.password=1234
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+
+cors.allowed-origins=

src/main/environment/common_test.properties

@@ -3,3 +3,4 @@ spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
 spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+cors.allowed-origins=

src/main/environment/common_uat.properties

@@ -5,3 +5,4 @@ spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 
+cors.allowed-origins=

src/main/java/com/iemr/common/identity/config/CorsConfig.java

@@ -0,0 +1,25 @@
+package com.iemr.common.identity.config;
+
+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("/**")
+                .allowedOrigins(allowedOrigins.split(","))
+                .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
+                .allowedHeaders("*")
+                .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed
+                .allowCredentials(true)
+                .maxAge(3600)
+        ;
+    }
+}

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,7 @@ 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 +111,7 @@ 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 +136,7 @@ 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 +171,7 @@ 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 +202,7 @@ 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 +234,7 @@ 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 +266,7 @@ 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 +296,7 @@ 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 +321,7 @@ 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 +341,7 @@ 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 +375,7 @@ 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 +507,7 @@ 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 +614,7 @@ 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 +634,7 @@ 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 +660,7 @@ 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 +692,7 @@ 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 +791,7 @@ 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 +815,7 @@ 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 +829,7 @@ 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 +956,7 @@ 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 +971,7 @@ 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(

src/main/java/com/iemr/common/identity/controller/familyTagging/FamilyTaggingController.java

@@ -35,15 +35,15 @@
 
 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 +59,7 @@ 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 +75,7 @@ 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 +91,7 @@ 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 +107,7 @@ 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 +123,7 @@ 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) {