feat(cors): Global CORS Configuration for AMRIT API Services

src/main/environment/ecd_ci.properties

@@ -28,3 +28,5 @@ logging.file.name=@env.ECD_API_LOGGING_FILE_NAME@
 springdoc.api-docs.enabled=false
 springdoc.swagger-ui.enabled=false
 
+cors.allowed-origins=@CORS_ALLOWED_ORIGINS@
+

src/main/environment/ecd_example.properties

@@ -16,3 +16,5 @@ registerBeneficiaryUrl=https:localhost:8083/beneficiary/create
 
 ##Beneficiary Edit Url
 beneficiaryEditUrl =https:localhost:8083/beneficiary/update
+
+cors.allowed-origins=http://localhost:8084

src/main/java/com/iemr/ecd/config/CorsConfig.java

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

src/main/java/com/iemr/ecd/controller/associate/AutoPreviewDialingController.java

@@ -27,7 +27,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +46,7 @@
 
 @RestController
 @RequestMapping(value = "/autoPreviewDialing", headers = "Authorization")
-@CrossOrigin()
+
 public class AutoPreviewDialingController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/associate/BeneficiaryCallHistoryController.java

@@ -25,28 +25,25 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.iemr.ecd.dao.associate.Bencall;
 import com.iemr.ecd.dto.RequestBeneficiaryQuestionnaireResponseDTO;
 import com.iemr.ecd.service.associate.BeneficiaryCallHistoryImpl;
 import com.iemr.ecd.utils.advice.exception_handler.CustomExceptionResponse;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 @RestController
 @RequestMapping(value = "/callHistory", headers = "Authorization")
-@CrossOrigin()
+
 public class BeneficiaryCallHistoryController {
 	@Autowired
 	private BeneficiaryCallHistoryImpl beneficiaryCallHistoryImpl;

src/main/java/com/iemr/ecd/controller/associate/BeneficiaryRegistrationController.java

@@ -25,32 +25,27 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.iemr.ecd.dto.RequestBeneficiaryRegistrationDTO;
 import com.iemr.ecd.service.associate.BeneficiaryRegistrationServiceImpl;
 import com.iemr.ecd.utils.advice.exception_handler.CustomExceptionResponse;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 @RestController
 @RequestMapping(value = "/beneficary", headers = "Authorization")
-@CrossOrigin()
-
 public class BeneficiaryRegistrationController {
 
 	@Autowired
 	private BeneficiaryRegistrationServiceImpl beneficiaryRegistrationServiceImpl;
 
-	@CrossOrigin()
+
 	@PostMapping(value = "/registration", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
 	@Operation(summary = "Create beneficiary registration", description = "Desc - Create Beneficiary registration")
 	@ApiResponses(value = {
@@ -61,13 +56,13 @@ public class BeneficiaryRegistrationController {
 			@ApiResponse(responseCode = CustomExceptionResponse.DB_EXCEPTION_SC_V, description = CustomExceptionResponse.DB_EXCEPTION_SC),
 			@ApiResponse(responseCode = CustomExceptionResponse.BAD_REQUEST_SC_V, description = CustomExceptionResponse.BAD_REQUEST_SC) })
 	public ResponseEntity<Object> beneficiaryRegistration(@RequestBody RequestBeneficiaryRegistrationDTO request,
-			@RequestHeader(value = "Authorization") String Authorization) {
+														  @RequestHeader(value = "Authorization") String Authorization) {
 
 		return new ResponseEntity<>(beneficiaryRegistrationServiceImpl.beneficiaryRegistration(request, Authorization),
 				HttpStatus.OK);
 	}
 
-	@CrossOrigin()
+
 	@PostMapping(value = "/updateBeneficiaryDetails", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
 	@Operation(summary = "Update beneficiary details", description = "Desc - Update Beneficiary details")
 	@ApiResponses(value = {

src/main/java/com/iemr/ecd/controller/associate/CallClosureController.java

@@ -25,29 +25,25 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-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;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.iemr.ecd.dto.associate.CallClosureDTO;
 import com.iemr.ecd.service.associate.CallClosureImpl;
 import com.iemr.ecd.utils.advice.exception_handler.CustomExceptionResponse;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 @RestController
 @RequestMapping(value = "/closure", headers = "Authorization")
-@CrossOrigin()
 public class CallClosureController {
 	@Autowired
 	private CallClosureImpl callClosureImpl;
 
-	@CrossOrigin()
+
 	@PostMapping(value = "/closeCall", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
 	@Operation(summary = "Call closure", description = "Desc - Call closure")
 	@ApiResponses(value = {

src/main/java/com/iemr/ecd/controller/callallocation/CallAllocationController.java

@@ -27,30 +27,26 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.iemr.ecd.dto.OutboundCallsDTO;
 import com.iemr.ecd.dto.RequestCallAllocationDTO;
 import com.iemr.ecd.dto.supervisor.ResponseEligibleCallRecordsDTO;
 import com.iemr.ecd.service.call_conf_allocation.CallAllocationImpl;
 import com.iemr.ecd.utils.advice.exception_handler.CustomExceptionResponse;
 import com.iemr.ecd.utils.advice.exception_handler.ECDException;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 @RestController
 @RequestMapping(value = "/callAllocation", headers = "Authorization")
-@CrossOrigin()
 public class CallAllocationController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/callallocation/CallConfigurationController.java

@@ -27,28 +27,24 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-
 import com.iemr.ecd.dao.CallConfiguration;
 import com.iemr.ecd.dto.CallSectionMappingDTO;
 import com.iemr.ecd.service.call_conf_allocation.CallConfigurationImpl;
 import com.iemr.ecd.utils.advice.exception_handler.CustomExceptionResponse;
-
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 @RestController
 @RequestMapping(value = "/callConfiguration", headers = "Authorization")
-@CrossOrigin()
 public class CallConfigurationController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/dataupload/DataTemplateController.java

@@ -29,7 +29,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,7 +47,6 @@
 
 @RestController
 @RequestMapping(value = "/dataTemplate", headers = "Authorization")
-@CrossOrigin()
 public class DataTemplateController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/dataupload/DataUploadController.java

@@ -25,7 +25,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-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.RequestHeader;
@@ -41,7 +40,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 
 @RestController
-@CrossOrigin()
 public class DataUploadController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/masters/MastersController.java

@@ -26,7 +26,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -60,7 +59,6 @@
 
 @RestController
 @RequestMapping(value = "/master", headers = "Authorization")
-@CrossOrigin()
 public class MastersController {
 	@Autowired
 	private MasterServiceImpl masterServiceImpl;

src/main/java/com/iemr/ecd/controller/outboundworklist/CallStatisticsController.java

@@ -25,7 +25,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,7 +41,6 @@
 
 @RestController
 @RequestMapping(value = "/agent", headers = "Authorization")
-@CrossOrigin()
 public class CallStatisticsController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/outboundworklist/OutBoundWorklistController.java

@@ -28,7 +28,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,7 +47,6 @@
 
 @RestController
 @RequestMapping(value = "/outbound-worklist", headers = "Authorization")
-@CrossOrigin()
 public class OutBoundWorklistController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/quality/AgentQualityAuditorMappingController.java

@@ -27,7 +27,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +46,6 @@
 
 @RestController
 @RequestMapping(value = "/agentQualityAuditorMap", headers = "Authorization")
-@CrossOrigin()
 public class AgentQualityAuditorMappingController {
 	@Autowired
 	private AgentQualityAuditorMappingImpl agentQualityAuditorMappingImpl;

src/main/java/com/iemr/ecd/controller/quality/ChartsController.java

@@ -27,7 +27,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,7 +43,6 @@
 
 @RestController
 @RequestMapping(value = "/charts", headers = "Authorization")
-@CrossOrigin()
 public class ChartsController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/quality/GradeConfigurationController.java

@@ -27,7 +27,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -47,7 +46,6 @@
 
 @RestController
 @RequestMapping(value = "/gradeConfiguration", headers = "Authorization")
-@CrossOrigin()
 public class GradeConfigurationController {
 
 	@Autowired

src/main/java/com/iemr/ecd/controller/quality/QualityAuditController.java

@@ -27,7 +27,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -55,7 +54,6 @@
 
 @RestController
 @RequestMapping(value = "/qualityAudit", headers = "Authorization")
-@CrossOrigin()
 public class QualityAuditController {
 	@Autowired
 	private QualityAuditImpl qualityAuditImpl;

src/main/java/com/iemr/ecd/controller/quality/QualityAuditQuestionConfigurationController.java

@@ -27,7 +27,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -48,7 +47,6 @@
 
 @RestController
 @RequestMapping(value = "/questionnaireConfiguration", headers = "Authorization")
-@CrossOrigin()
 public class QualityAuditQuestionConfigurationController {
 	@Autowired
 	private QualityAuditQuestionConfigurationImpl qualityAuditQuestionConfigurationImpl;