From ab40eebf9518225e4f596e324d67804178131aef Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Mon, 14 Apr 2025 19:46:53 +0530 Subject: [PATCH 1/5] fix(cors): global cors config added --- src/main/environment/104_ci.properties | 2 ++ src/main/environment/104_example.properties | 3 ++- .../iemr/helpline104/config/CorsConfig.java | 25 +++++++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/iemr/helpline104/config/CorsConfig.java diff --git a/src/main/environment/104_ci.properties b/src/main/environment/104_ci.properties index 2443c86..e2ef30d 100644 --- a/src/main/environment/104_ci.properties +++ b/src/main/environment/104_ci.properties @@ -26,3 +26,5 @@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ sendSMSUrl= @env.COMMON_API_BASE_URL@sms/sendSMS sendEmailGeneralUrl = @env.COMMON_API_BASE_URL@emailController/sendEmailGeneral + +cors.allowed-origins= diff --git a/src/main/environment/104_example.properties b/src/main/environment/104_example.properties index a86b2c7..d09b78a 100644 --- a/src/main/environment/104_example.properties +++ b/src/main/environment/104_example.properties @@ -21,4 +21,5 @@ spring.redis.host=localhost jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret #If both properties are set, only logging.file.name takes effect. logging.path=logs/ -logging.file.name=logs/helpline104-api.log \ No newline at end of file +logging.file.name=logs/helpline104-api.log +cors.allowed-origins=http://localhost:*,http://127.0.0.1:* diff --git a/src/main/java/com/iemr/helpline104/config/CorsConfig.java b/src/main/java/com/iemr/helpline104/config/CorsConfig.java new file mode 100644 index 0000000..3dfd351 --- /dev/null +++ b/src/main/java/com/iemr/helpline104/config/CorsConfig.java @@ -0,0 +1,25 @@ +package com.iemr.helpline104.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("/**") + .allowedOriginPatterns(allowedOrigins.split(",")) + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") + .allowedHeaders("*") + .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed + .allowCredentials(true) + .maxAge(3600) + ; + } +} \ No newline at end of file From 5338601a2957afbd3bd8f0f04b7cd2a1b122ecf2 Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Thu, 17 Apr 2025 22:23:29 +0530 Subject: [PATCH 2/5] fix(cors): controller level cors config removed --- .../controller/IMRMMR/IMRMMRController.java | 8 ++--- .../balVivha/BalVivahController.java | 6 ++-- .../BeneficiaryCallController.java | 8 ++--- .../BloodComponentController.java | 4 +-- .../bloodRequest/BloodRequestController.java | 12 +++---- .../CallQAMappingController.java | 4 +-- ...lpline104BeneficiaryHistoryController.java | 6 ++-- .../ClinicalDecisionSupportController.java | 8 ++--- .../covidMaster/CovidMasterController.java | 4 +-- .../DirectoryServicesController.java | 4 +-- .../controller/disease/DiseaseController.java | 12 +++---- .../DiseaseScreeningController.java | 4 +-- .../drugGroup/DrugGroupController.java | 10 +++--- .../EpidemicOutbreakController.java | 6 ++-- .../feedback/FeedbackController.java | 8 ++--- .../feedbackType/FeedbackTypeController.java | 2 +- .../FoodSafetyComplaintController.java | 4 +-- .../HealthCareWorkerTypeController.java | 1 - .../controller/hihl/HIHLController.java | 2 +- .../location/CountryCityController.java | 4 +-- .../location/LocationController.java | 12 +++---- .../OrganDonationController.java | 6 ---- .../prescription/PrescriptionController.java | 8 ++--- .../controller/scheme/SchemeController.java | 4 +-- .../SecondaryCRMReports.java | 36 +++++++++---------- .../ServiceImprovementOfficerController.java | 2 +- .../controller/snomedct/SnomedController.java | 4 +-- .../controller/users/IEMRAdminController.java | 16 ++++----- .../controller/version/VersionController.java | 2 +- 29 files changed, 100 insertions(+), 107 deletions(-) diff --git a/src/main/java/com/iemr/helpline104/controller/IMRMMR/IMRMMRController.java b/src/main/java/com/iemr/helpline104/controller/IMRMMR/IMRMMRController.java index f7334ca..fcad581 100644 --- a/src/main/java/com/iemr/helpline104/controller/IMRMMR/IMRMMRController.java +++ b/src/main/java/com/iemr/helpline104/controller/IMRMMR/IMRMMRController.java @@ -54,7 +54,7 @@ public class IMRMMRController { @Autowired private IMRMMRService imrmmrService; - @CrossOrigin() + @Operation(summary = "Save IMR MMR") @PostMapping(value = "/saveIMRMMR", headers = "Authorization", produces = { "application/json" }) @@ -78,7 +78,7 @@ public String saveIMRMMR(@RequestBody String request, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Fetch support services") @GetMapping(value = "/fetchimrmmrmasters", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String fetchSupportServices() { @@ -105,7 +105,7 @@ public String fetchSupportServices() { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Feedback request") @PostMapping(value = "/getIMRMMRList", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String feedbackReuest(@RequestBody String request) { @@ -123,7 +123,7 @@ public String feedbackReuest(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Update IMR MMR complaint") @PostMapping(value = "/update/ImrMmrComplaint", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateImrMmrComplaint(@RequestBody String request) { diff --git a/src/main/java/com/iemr/helpline104/controller/balVivha/BalVivahController.java b/src/main/java/com/iemr/helpline104/controller/balVivha/BalVivahController.java index e2e0df1..cea91b2 100644 --- a/src/main/java/com/iemr/helpline104/controller/balVivha/BalVivahController.java +++ b/src/main/java/com/iemr/helpline104/controller/balVivha/BalVivahController.java @@ -45,7 +45,7 @@ public class BalVivahController { @Autowired private BalVivahComplaintService balVivahComplaintService; - @CrossOrigin() + @Operation(summary = "Save bal vivah complaint") @PostMapping(value = "/saveBalVivahComplaint", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String balVivahComplaint(@RequestBody String request, HttpServletRequest httpRequest) { @@ -60,7 +60,7 @@ public String balVivahComplaint(@RequestBody String request, HttpServletRequest return output.toString(); } - @CrossOrigin() + @Operation(summary = "Get bal vivah list") @PostMapping(value = "/getBalVivahList", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String feedbackReuest(@RequestBody String request) { @@ -79,7 +79,7 @@ public String feedbackReuest(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Update bal vivah complaint") @PostMapping(value = "/update/BalVivahComplaint", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateBalVivahComplaint(@RequestBody String request) { diff --git a/src/main/java/com/iemr/helpline104/controller/beneficiarycall/BeneficiaryCallController.java b/src/main/java/com/iemr/helpline104/controller/beneficiarycall/BeneficiaryCallController.java index b5bcdba..4b99f24 100644 --- a/src/main/java/com/iemr/helpline104/controller/beneficiarycall/BeneficiaryCallController.java +++ b/src/main/java/com/iemr/helpline104/controller/beneficiarycall/BeneficiaryCallController.java @@ -64,7 +64,7 @@ public void setBeneficiaryCallService(BeneficiaryCallService beneficiaryCallServ this.beneficiaryCallService = beneficiaryCallService; } - @CrossOrigin() + @Operation(summary = "Stores callerID to the specific beneficiary who are on call") @PostMapping(value = "/startCall", headers = "Authorization") public String startCall( @@ -85,7 +85,7 @@ public String startCall( return output.toString(); } - @CrossOrigin() + @Operation(summary = "Update beneficiary reg id to the caller id") @PostMapping(value = "update/beneficiaryCallID", headers = "Authorization") public String updateBeneficiaryIDInCall( @@ -115,7 +115,7 @@ public String updateBeneficiaryIDInCall( } - @CrossOrigin + @Operation(summary = "Fetch services available in the 104 helpline") @PostMapping(value = "/get/services", headers = "Authorization") public String getServices( @@ -138,7 +138,7 @@ public String getServices( return output.toString(); } - @CrossOrigin() + @Operation(summary = "Set service history") @PostMapping(value = "set/callHistory", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String setServiceHistory(@RequestBody String request) { diff --git a/src/main/java/com/iemr/helpline104/controller/bloodComponent/BloodComponentController.java b/src/main/java/com/iemr/helpline104/controller/bloodComponent/BloodComponentController.java index d972349..2883219 100644 --- a/src/main/java/com/iemr/helpline104/controller/bloodComponent/BloodComponentController.java +++ b/src/main/java/com/iemr/helpline104/controller/bloodComponent/BloodComponentController.java @@ -47,7 +47,7 @@ public class BloodComponentController { @Autowired private BloodComponentService bloodComponentService; - @CrossOrigin + @Operation(summary = "Save blood component details") @PostMapping(value = "/save/bloodComponentDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveBloodComponentDetails( @@ -67,7 +67,7 @@ public String saveBloodComponentDetails( return output.toString(); } - @CrossOrigin + @Operation(summary = "Fetch blood component details") @PostMapping(value = "/get/bloodComponentDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getBloodComponentDetails( diff --git a/src/main/java/com/iemr/helpline104/controller/bloodRequest/BloodRequestController.java b/src/main/java/com/iemr/helpline104/controller/bloodRequest/BloodRequestController.java index 68530fd..4fd8acb 100644 --- a/src/main/java/com/iemr/helpline104/controller/bloodRequest/BloodRequestController.java +++ b/src/main/java/com/iemr/helpline104/controller/bloodRequest/BloodRequestController.java @@ -55,7 +55,7 @@ public class BloodRequestController { @Autowired private BloodComponentTypeService componentTypeService; - @CrossOrigin + @Operation(summary = "Save blood request details") @PostMapping(value = "/save/bloodRequestDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveBloodRequestDetails(@RequestBody String request) { @@ -77,7 +77,7 @@ public String saveBloodRequestDetails(@RequestBody String request) { return output.toString(); } - @CrossOrigin + @Operation(summary = "Get blood request details") @PostMapping(value = "/get/bloodRequestDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getbloodRequestDetails( @@ -102,7 +102,7 @@ public String getbloodRequestDetails( return output.toString(); } - @CrossOrigin + @Operation(summary = "Get blood component types") @PostMapping(value = "/get/bloodComponentTypes", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getBloodComponentTypes() { @@ -120,7 +120,7 @@ public String getBloodComponentTypes() { return output.toString(); } - @CrossOrigin + @Operation(summary = "Get blood groups") @PostMapping(value = "/get/bloodGroups", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getBloodGroups() { @@ -138,7 +138,7 @@ public String getBloodGroups() { return output.toString(); } - @CrossOrigin + @Operation(summary = "Get blood bank URL") @PostMapping(value = "/get/bloodBankURL", headers = "Authorization") public String getBloodBankURL( @@ -163,7 +163,7 @@ public String getBloodBankURL( return output.toString(); } - @CrossOrigin + @Operation(summary = "Save blood bank URL") @PostMapping(value = "/save/bloodBankURL", headers = "Authorization") public String saveBloodBankURL( diff --git a/src/main/java/com/iemr/helpline104/controller/callqamapping/CallQAMappingController.java b/src/main/java/com/iemr/helpline104/controller/callqamapping/CallQAMappingController.java index e15721b..2110629 100644 --- a/src/main/java/com/iemr/helpline104/controller/callqamapping/CallQAMappingController.java +++ b/src/main/java/com/iemr/helpline104/controller/callqamapping/CallQAMappingController.java @@ -48,7 +48,7 @@ public class CallQAMappingController { @Autowired public CallqamappingService callqamappingService; - @CrossOrigin + @Operation(summary = "Save call qa mapping") @PostMapping(value = "/save/callqamapping", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveCallqamapping(@RequestBody String request) { @@ -69,7 +69,7 @@ public String saveCallqamapping(@RequestBody String request) { return output.toString(); } - @CrossOrigin + @Operation(summary = "Fetch questions and answers given by beneficiary") @PostMapping(value = "/get/CDIqamapping", headers = "Authorization") public String getCDIqamapping( diff --git a/src/main/java/com/iemr/helpline104/controller/casesheet/Helpline104BeneficiaryHistoryController.java b/src/main/java/com/iemr/helpline104/controller/casesheet/Helpline104BeneficiaryHistoryController.java index 33c6fb3..62b61a8 100644 --- a/src/main/java/com/iemr/helpline104/controller/casesheet/Helpline104BeneficiaryHistoryController.java +++ b/src/main/java/com/iemr/helpline104/controller/casesheet/Helpline104BeneficiaryHistoryController.java @@ -48,7 +48,7 @@ public class Helpline104BeneficiaryHistoryController { @Autowired private H104BenHistoryService h104BenHistoryService; - @CrossOrigin + @Operation(summary = "Retrieves case record") @PostMapping(value = "/getBenCaseSheet", headers = "Authorization") public String getBenCaseSheet( @@ -70,7 +70,7 @@ public String getBenCaseSheet( return output.toString(); } - @CrossOrigin + @Operation(summary = "Stores case record") @PostMapping(value = "/save/benCaseSheet", headers = "Authorization") public String saveBenCaseSheet( @@ -101,7 +101,7 @@ public String saveBenCaseSheet( return output.toString(); } - @CrossOrigin + @Operation(summary = "Retrieves present case record") @PostMapping(value = "/getPresentCaseSheet", headers = "Authorization") public String getPresentCaseSheet( diff --git a/src/main/java/com/iemr/helpline104/controller/cdss/ClinicalDecisionSupportController.java b/src/main/java/com/iemr/helpline104/controller/cdss/ClinicalDecisionSupportController.java index 8110cd2..0a3a1b3 100644 --- a/src/main/java/com/iemr/helpline104/controller/cdss/ClinicalDecisionSupportController.java +++ b/src/main/java/com/iemr/helpline104/controller/cdss/ClinicalDecisionSupportController.java @@ -46,7 +46,7 @@ public class ClinicalDecisionSupportController { private CDSSService cDSSService; private Logger logger = LoggerFactory.getLogger(ClinicalDecisionSupportController.class); - @CrossOrigin() + @Operation(summary = "Get symptoms") @PostMapping(value = "/Symptoms", produces = "application/json", headers = "Authorization") public String getSymptomsPost(@RequestBody SymptomsWrapper symptomsDetails) { @@ -73,7 +73,7 @@ public String getSymptomsPost(@RequestBody SymptomsWrapper symptomsDetails) { } - @CrossOrigin() + @Operation(summary = "Get questions by symptom, age and gender") @PostMapping(value = "/getQuestions", produces = "application/json", headers = "Authorization") public String getQuestion(@RequestBody SymptomsWrapper symptomsDetails) { @@ -99,7 +99,7 @@ public String getQuestion(@RequestBody SymptomsWrapper symptomsDetails) { } - @CrossOrigin() + @Operation(summary = "Get result based on compliant id") @PostMapping(value = "/getResult", produces = "application/json", headers = "Authorization") public String getResult(@RequestBody String userAnswer) { @@ -125,7 +125,7 @@ public String getResult(@RequestBody String userAnswer) { } - @CrossOrigin() + @Operation(summary = "Save symptom") @PostMapping(value = "/saveSymptom", produces = "application/json", headers = "Authorization") public String saveSymptom(@RequestBody String inputData) { diff --git a/src/main/java/com/iemr/helpline104/controller/covidMaster/CovidMasterController.java b/src/main/java/com/iemr/helpline104/controller/covidMaster/CovidMasterController.java index e1b5882..482a0bf 100644 --- a/src/main/java/com/iemr/helpline104/controller/covidMaster/CovidMasterController.java +++ b/src/main/java/com/iemr/helpline104/controller/covidMaster/CovidMasterController.java @@ -34,7 +34,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/master", headers = "Authorization") @@ -56,7 +56,7 @@ public String patientAppMasterData(@PathVariable("providerServiceMapID") Integer return response.toString(); } - @CrossOrigin + @Operation(summary= "Save COVID data") @PostMapping({ "/save/covidScreeningData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/helpline104/controller/directory/DirectoryServicesController.java b/src/main/java/com/iemr/helpline104/controller/directory/DirectoryServicesController.java index e1bea8a..510b2c1 100644 --- a/src/main/java/com/iemr/helpline104/controller/directory/DirectoryServicesController.java +++ b/src/main/java/com/iemr/helpline104/controller/directory/DirectoryServicesController.java @@ -50,7 +50,7 @@ public class DirectoryServicesController { @Autowired private DirectoryServiceService directoryServiceService; - @CrossOrigin + @Operation(summary = "Retrieve directory search history") @RequestMapping(value = "/getdirectorySearchHistory", method = RequestMethod.POST, headers = "Authorization") public String getBenDirectoryHistory( @@ -72,7 +72,7 @@ public String getBenDirectoryHistory( return output.toString(); } - @CrossOrigin + @Operation(summary = "Store directory serach history") @RequestMapping(value = "/save/directorySearchHistory", method = RequestMethod.POST, headers = "Authorization") public String directorySearchHistory( diff --git a/src/main/java/com/iemr/helpline104/controller/disease/DiseaseController.java b/src/main/java/com/iemr/helpline104/controller/disease/DiseaseController.java index 5f0f08f..0d80ab4 100644 --- a/src/main/java/com/iemr/helpline104/controller/disease/DiseaseController.java +++ b/src/main/java/com/iemr/helpline104/controller/disease/DiseaseController.java @@ -39,7 +39,7 @@ public class DiseaseController { @Autowired DiseaseService diseaseService; - @CrossOrigin() + @Operation(summary = "Save disease") @PostMapping(value = "/saveDisease", headers = "Authorization", produces = { "application/json" }) @@ -57,7 +57,7 @@ public String saveDisease(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Delete disease") @PostMapping(value = "/deleteDisease", headers = "Authorization", produces = { "application/json" }) @@ -75,7 +75,7 @@ public String deleteDisease(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get diseases") @PostMapping(value = "/getDisease", headers = "Authorization", produces = { "application/json" }) @@ -93,7 +93,7 @@ public String getDisease(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Update disease") @PostMapping(value = "/updateDisease", headers = "Authorization", produces = { "application/json" }) @@ -111,7 +111,7 @@ public String updateDisease(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get available disease") @PostMapping(value = "/getAvailableDiseases", headers = "Authorization", produces = { "application/json" }) public String getAvailableDiseases() { @@ -128,7 +128,7 @@ public String getAvailableDiseases() { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get disease by id") @PostMapping(value = "/getDiseasesByID", headers = "Authorization", produces = { "application/json" }) diff --git a/src/main/java/com/iemr/helpline104/controller/diseaseScreening/DiseaseScreeningController.java b/src/main/java/com/iemr/helpline104/controller/diseaseScreening/DiseaseScreeningController.java index 40e6f5c..d0a30ca 100644 --- a/src/main/java/com/iemr/helpline104/controller/diseaseScreening/DiseaseScreeningController.java +++ b/src/main/java/com/iemr/helpline104/controller/diseaseScreening/DiseaseScreeningController.java @@ -57,7 +57,7 @@ public class DiseaseScreeningController { @Autowired private QuestionScoreService questionScoreService; - @CrossOrigin + @Operation(summary = "Fetch disease screening questions") @PostMapping(value = "/get/questions", headers = "Authorization") public String fetchQuestions( @@ -81,7 +81,7 @@ public String fetchQuestions( return output.toString(); } - @CrossOrigin + @Operation(summary = "Fetch disease screening answers") @PostMapping(value = "/get/answers", headers = "Authorization") public String fetchAnswers(@Parameter(description = "{\"questionID\":\"integer\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/helpline104/controller/drugGroup/DrugGroupController.java b/src/main/java/com/iemr/helpline104/controller/drugGroup/DrugGroupController.java index 119ea6f..7375330 100644 --- a/src/main/java/com/iemr/helpline104/controller/drugGroup/DrugGroupController.java +++ b/src/main/java/com/iemr/helpline104/controller/drugGroup/DrugGroupController.java @@ -53,7 +53,7 @@ public class DrugGroupController { @Autowired private DrugGroupService drugGroupService; - @CrossOrigin + @Operation(summary= "Fetch drug groups") @PostMapping(value = "/get/drugGroups", headers = "Authorization") public String getDrugGroups(@Parameter(description = "{\"serviceProviderID\":\"integer\"}") @RequestBody String request) { @@ -74,7 +74,7 @@ public String getDrugGroups(@Parameter(description = "{\"serviceProviderID\":\"i return output.toString(); } - @CrossOrigin + @Operation(summary= "Fetch drug list") @PostMapping(value = "/get/drugList", headers = "Authorization") public String getDrugList(@Parameter(description = "{\"providerServiceMapID\":\"integer\"}") @RequestBody String request) { @@ -99,7 +99,7 @@ public String getDrugList(@Parameter(description = "{\"providerServiceMapID\":\" return output.toString(); } - @CrossOrigin + @Operation(summary= "Fetch drug frequency details") @PostMapping(value = "/get/drugFrequency", headers = "Authorization") public String getDrugFrequency() { @@ -117,7 +117,7 @@ public String getDrugFrequency() { return output.toString(); } - @CrossOrigin + @Operation(summary= "Fetch drug strength details") @PostMapping(value = "/get/drugStrength", headers = "Authorization") public String getDrugStrength( @@ -139,7 +139,7 @@ public String getDrugStrength( return output.toString(); } - @CrossOrigin + @Operation(summary= "Fetch drug name list") @PostMapping(value = "/getDrugDetailList", headers = "Authorization") public String getDrugNameList( diff --git a/src/main/java/com/iemr/helpline104/controller/epidemicOutbreak/EpidemicOutbreakController.java b/src/main/java/com/iemr/helpline104/controller/epidemicOutbreak/EpidemicOutbreakController.java index b5bfe54..60fbb1d 100644 --- a/src/main/java/com/iemr/helpline104/controller/epidemicOutbreak/EpidemicOutbreakController.java +++ b/src/main/java/com/iemr/helpline104/controller/epidemicOutbreak/EpidemicOutbreakController.java @@ -51,7 +51,7 @@ public class EpidemicOutbreakController { @Autowired private EpidemicOutbreakService epidemicOutbreakService; - @CrossOrigin + @Operation(summary = "Store epidemic outbreak complaint") @RequestMapping(value = "/save/epidemicOutbreakComplaint", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveEpidemicOutbreakComplaint( @@ -74,7 +74,7 @@ public String saveEpidemicOutbreakComplaint( return output.toString(); } - @CrossOrigin + @Operation(summary = "Fetch epidemic outbreak complaints") @RequestMapping(value = "/get/epidemicOutbreakComplaint", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getEpidemicOutbreakComplaint( @@ -101,7 +101,7 @@ public String getEpidemicOutbreakComplaint( return output.toString(); } - @CrossOrigin + @Operation(summary = "Update epidemic outbreak complaint") @RequestMapping(value = "/update/epidemicOutbreakComplaint", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String updateEpidemicOutbreakComplaint( diff --git a/src/main/java/com/iemr/helpline104/controller/feedback/FeedbackController.java b/src/main/java/com/iemr/helpline104/controller/feedback/FeedbackController.java index 6cf0d1f..9d739b2 100644 --- a/src/main/java/com/iemr/helpline104/controller/feedback/FeedbackController.java +++ b/src/main/java/com/iemr/helpline104/controller/feedback/FeedbackController.java @@ -58,7 +58,7 @@ public void setFeedbackService(FeedbackService feedbackService) { this.feedbackService = feedbackService; } - @CrossOrigin() + @Operation(summary = "Fetch feedback request") @PostMapping(value = "/getfeedbacklist", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String feedbackReuest(@RequestBody String request) { @@ -75,7 +75,7 @@ public String feedbackReuest(@RequestBody String request) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get feedback by post") @PostMapping(value = "/getfeedback/{feedbackID}", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFeedbackByPost(@PathVariable("feedbackID") int feedbackID) { @@ -91,7 +91,7 @@ public String getFeedbackByPost(@PathVariable("feedbackID") int feedbackID) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Update feedback") @PostMapping(value = "/updatefeedback", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateFeedback(@RequestBody String feedbackDetailsOBJ) { @@ -114,7 +114,7 @@ public String updateFeedback(@RequestBody String feedbackDetailsOBJ) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Save beneficiary feedback") @PostMapping(value = "/saveBenFeedback", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String saveBenFeedback(@RequestBody String feedbackRequest, HttpServletRequest request) { diff --git a/src/main/java/com/iemr/helpline104/controller/feedbackType/FeedbackTypeController.java b/src/main/java/com/iemr/helpline104/controller/feedbackType/FeedbackTypeController.java index 1ea5150..0c4db0b 100644 --- a/src/main/java/com/iemr/helpline104/controller/feedbackType/FeedbackTypeController.java +++ b/src/main/java/com/iemr/helpline104/controller/feedbackType/FeedbackTypeController.java @@ -46,7 +46,7 @@ public class FeedbackTypeController { @Autowired private FeedbackTypeService feedbackTypeService; - @CrossOrigin + @Operation(summary = "Provides nature of complaints") @PostMapping(value = "/get/natureOfComplaintTypes", headers = "Authorization") public String getNatureOfComplaintTypes( diff --git a/src/main/java/com/iemr/helpline104/controller/foodSafetyComplaint/FoodSafetyComplaintController.java b/src/main/java/com/iemr/helpline104/controller/foodSafetyComplaint/FoodSafetyComplaintController.java index 226311f..5af908d 100644 --- a/src/main/java/com/iemr/helpline104/controller/foodSafetyComplaint/FoodSafetyComplaintController.java +++ b/src/main/java/com/iemr/helpline104/controller/foodSafetyComplaint/FoodSafetyComplaintController.java @@ -50,7 +50,7 @@ public class FoodSafetyComplaintController { @Autowired private FoodSafetyCopmlaintService foodSafetyCopmlaintService; - @CrossOrigin + @Operation(summary = "Stores food safety complaint details") @PostMapping(value = "/save/foodComplaintDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveFoodComplaintDetails( @@ -80,7 +80,7 @@ public String saveFoodComplaintDetails( return output.toString(); } - @CrossOrigin + @Operation(summary = "Provides food safety complaints history") @PostMapping(value = "/get/foodComplaintDetails", headers = "Authorization") public String getFoodComplaintDetails( diff --git a/src/main/java/com/iemr/helpline104/controller/healthCareWorkerType/HealthCareWorkerTypeController.java b/src/main/java/com/iemr/helpline104/controller/healthCareWorkerType/HealthCareWorkerTypeController.java index 4181672..3f472ae 100644 --- a/src/main/java/com/iemr/helpline104/controller/healthCareWorkerType/HealthCareWorkerTypeController.java +++ b/src/main/java/com/iemr/helpline104/controller/healthCareWorkerType/HealthCareWorkerTypeController.java @@ -49,7 +49,6 @@ public class HealthCareWorkerTypeController { @Autowired private HealthCareWorkerService healthCareWorkerService; - @CrossOrigin @Operation(summary = "Get health care worker types") @PostMapping(value = "/get/healthCareWorkerTypes", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getHealthCareWorkerTypes() { diff --git a/src/main/java/com/iemr/helpline104/controller/hihl/HIHLController.java b/src/main/java/com/iemr/helpline104/controller/hihl/HIHLController.java index c2a8b86..717e3a2 100644 --- a/src/main/java/com/iemr/helpline104/controller/hihl/HIHLController.java +++ b/src/main/java/com/iemr/helpline104/controller/hihl/HIHLController.java @@ -34,7 +34,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/hihl", headers = "Authorization") public class HIHLController { diff --git a/src/main/java/com/iemr/helpline104/controller/location/CountryCityController.java b/src/main/java/com/iemr/helpline104/controller/location/CountryCityController.java index c3687cf..e537b08 100644 --- a/src/main/java/com/iemr/helpline104/controller/location/CountryCityController.java +++ b/src/main/java/com/iemr/helpline104/controller/location/CountryCityController.java @@ -41,7 +41,7 @@ public class CountryCityController { private CountryCityService countryCityService; private Logger logger = LoggerFactory.getLogger(FeedbackController.class); - @CrossOrigin + @Operation(summary = "Get country") @GetMapping(value = { "/getCountry" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -59,7 +59,7 @@ public String getCountry() { return response.toString(); } - @CrossOrigin + @Operation(summary = "Get cities") @GetMapping(value = { "/getCities/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") diff --git a/src/main/java/com/iemr/helpline104/controller/location/LocationController.java b/src/main/java/com/iemr/helpline104/controller/location/LocationController.java index 2769b46..517bde5 100644 --- a/src/main/java/com/iemr/helpline104/controller/location/LocationController.java +++ b/src/main/java/com/iemr/helpline104/controller/location/LocationController.java @@ -39,7 +39,7 @@ public class LocationController { private LocationService locationService; - @CrossOrigin + @Operation(summary = "Get states") @GetMapping(value = { "/states/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -48,7 +48,7 @@ public String getStates(@PathVariable("id") int id) { return stateList.toString(); } - @CrossOrigin + @Operation(summary = "Get districts") @GetMapping(value = { "/districts/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -58,7 +58,7 @@ public String getDistricts(@PathVariable("id") int id) { return districtsList.toString(); } - @CrossOrigin + @Operation(summary = "Get state districts") @GetMapping(value = { "/statesDistricts/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -67,7 +67,7 @@ public String geStatetDistricts(@PathVariable("id") int id) { return districtsList.toString(); } - @CrossOrigin + @Operation(summary = "Get district blocks") @GetMapping(value = { "/taluks/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -76,7 +76,7 @@ public String getDistrictBlocks(@PathVariable("id") int id) { return districtBlockList.toString(); } - @CrossOrigin + @Operation(summary = "Get city") @GetMapping(value = { "/city/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -85,7 +85,7 @@ public String getCity(@PathVariable("id") int id) { return districtBlockList.toString(); } - @CrossOrigin + @Operation(summary = "Get villages") @GetMapping(value = { "/village/{id}" }, produces = MediaType.APPLICATION_JSON, headers = "Authorization") diff --git a/src/main/java/com/iemr/helpline104/controller/organDonation/OrganDonationController.java b/src/main/java/com/iemr/helpline104/controller/organDonation/OrganDonationController.java index 13d785f..7b37b77 100644 --- a/src/main/java/com/iemr/helpline104/controller/organDonation/OrganDonationController.java +++ b/src/main/java/com/iemr/helpline104/controller/organDonation/OrganDonationController.java @@ -48,7 +48,6 @@ public class OrganDonationController { @Autowired private OrganDonationService organDonationService; - @CrossOrigin @Operation(summary = "Save organ donation details") @PostMapping(value = "/save/organDonationRequestDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveOrganDonationDetails(@RequestBody String request) { @@ -66,7 +65,6 @@ public String saveOrganDonationDetails(@RequestBody String request) { return output.toString(); } - @CrossOrigin @Operation(summary = "Update organ donation details") @PostMapping(value = "/update/organDonationRequestDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String updateOrganDonationDetails(@RequestBody String request) { @@ -84,7 +82,6 @@ public String updateOrganDonationDetails(@RequestBody String request) { return output.toString(); } - @CrossOrigin @Operation(summary = "Save organ donation institute details") @PostMapping(value = "/save/organDonationInstituteDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveOrganDonationInstituteDetails(@RequestBody String request) { @@ -102,7 +99,6 @@ public String saveOrganDonationInstituteDetails(@RequestBody String request) { return output.toString(); } - @CrossOrigin @Operation(summary = "Get organ donation details") @PostMapping(value = "/get/organDonationRequestDetails", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getOrganDonationDetails( @@ -127,7 +123,6 @@ public String getOrganDonationDetails( return output.toString(); } - @CrossOrigin @Operation(summary = "Get organ donation types") @PostMapping(value = "/get/organDonationTypes", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getOrganDonationTypes() { @@ -145,7 +140,6 @@ public String getOrganDonationTypes() { return output.toString(); } - @CrossOrigin @Operation(summary = "Get donatable organs") @PostMapping(value = "/get/DonatableOrgans", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getDonatableOrgans() { diff --git a/src/main/java/com/iemr/helpline104/controller/prescription/PrescriptionController.java b/src/main/java/com/iemr/helpline104/controller/prescription/PrescriptionController.java index 1ec81b7..76f9deb 100644 --- a/src/main/java/com/iemr/helpline104/controller/prescription/PrescriptionController.java +++ b/src/main/java/com/iemr/helpline104/controller/prescription/PrescriptionController.java @@ -48,7 +48,7 @@ public class PrescriptionController { @Autowired private PrescriptionService prescriptionService; - @CrossOrigin + @Operation(summary = "Save prescription") @PostMapping(value = "/save/prescription", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String savePrescription(@RequestBody String createRequest) { @@ -69,7 +69,7 @@ public String savePrescription(@RequestBody String createRequest) { return output.toString(); } - @CrossOrigin + @Operation(summary = "Get prescription") @PostMapping(value = "/get/prescription", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getPrescription(@RequestBody String createRequest) { @@ -96,7 +96,7 @@ public String getPrescription(@RequestBody String createRequest) { return output.toString(); } - @CrossOrigin + @Operation(summary = "Get prescription list") @PostMapping(value = "/get/prescriptionList", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getPrescriptionList(@RequestBody String createRequest) { @@ -129,7 +129,7 @@ public String getPrescriptionList(@RequestBody String createRequest) { return output.toString(); } - @CrossOrigin + @Operation(summary = "Get latest valid pescription") @PostMapping(value = "/get/latestValidPescription", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getLatestValidPescription( diff --git a/src/main/java/com/iemr/helpline104/controller/scheme/SchemeController.java b/src/main/java/com/iemr/helpline104/controller/scheme/SchemeController.java index ae23f92..2867b12 100644 --- a/src/main/java/com/iemr/helpline104/controller/scheme/SchemeController.java +++ b/src/main/java/com/iemr/helpline104/controller/scheme/SchemeController.java @@ -48,7 +48,7 @@ public class SchemeController { InputMapper mapper = new InputMapper(); - @CrossOrigin + @Operation(summary = "Save scheme search history") @PostMapping(value = "/save/schemeSearchHistory", produces = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveSchemeSearchHistory( @@ -71,7 +71,7 @@ public String saveSchemeSearchHistory( return output.toString(); } - @CrossOrigin + @Operation(summary = "Retrieve scheme search history") @PostMapping(value = "/getSchemeSearchHistory", headers = "Authorization") public String getBenSchemeHistory( diff --git a/src/main/java/com/iemr/helpline104/controller/secondaryCrmReports/SecondaryCRMReports.java b/src/main/java/com/iemr/helpline104/controller/secondaryCrmReports/SecondaryCRMReports.java index d64f50d..e636661 100644 --- a/src/main/java/com/iemr/helpline104/controller/secondaryCrmReports/SecondaryCRMReports.java +++ b/src/main/java/com/iemr/helpline104/controller/secondaryCrmReports/SecondaryCRMReports.java @@ -44,7 +44,7 @@ import io.swagger.v3.oas.annotations.Parameter; -@CrossOrigin + @RequestMapping({ "/crmReports" }) @RestController public class SecondaryCRMReports { @@ -53,7 +53,7 @@ public class SecondaryCRMReports { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); InputMapper inputMapper = new InputMapper(); - @CrossOrigin() + @Operation(summary = "Get RO summary report by date") @PostMapping(value = "/getROSummaryReportByDate", headers = "Authorization") public ResponseEntity getROSummaryReportByDate(@RequestBody String jsonRequest) @@ -77,7 +77,7 @@ public ResponseEntity getROSummaryReportByDate(@RequestBody String jsonR } } - @CrossOrigin() + @Operation(summary = "Get HAO summary report by date") @PostMapping(value = "/getHAOSummaryReportByDate", headers = "Authorization") public ResponseEntity getHAOSummaryReportByDate( @@ -105,7 +105,7 @@ public ResponseEntity getHAOSummaryReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get MO summary report by date") @PostMapping(value = "/getMOSummaryReportByDate", headers = "Authorization") public ResponseEntity getMOSummaryReportByDate( @@ -133,7 +133,7 @@ public ResponseEntity getMOSummaryReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get medical advise report") @PostMapping(value = "/getMedicalAdviseReport", headers = "Authorization") public ResponseEntity getMedicalAdviseReport( @@ -161,7 +161,7 @@ public ResponseEntity getMedicalAdviseReport( } } - @CrossOrigin() + @Operation(summary = "Get CO summary report by date") @PostMapping(value = "/getCOSummaryReportByDate", headers = "Authorization") public ResponseEntity getCOSummaryReportByDate( @@ -189,7 +189,7 @@ public ResponseEntity getCOSummaryReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get mental health report") @PostMapping(value = "/getMentalHealthReport", headers = "Authorization") public ResponseEntity getMentalHealthReport( @@ -217,7 +217,7 @@ public ResponseEntity getMentalHealthReport( } } - @CrossOrigin() + @Operation(summary = "Get grievance report by date ") @PostMapping(value = "/getGrievanceReportByDate", headers = "Authorization") public ResponseEntity getGrievanceReportByDate( @@ -245,7 +245,7 @@ public ResponseEntity getGrievanceReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get prescription report by date") @PostMapping(value = "/getPrescriptionReportByDate", headers = "Authorization") public ResponseEntity getPrescriptionReportByDate( @@ -273,7 +273,7 @@ public ResponseEntity getPrescriptionReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get CDI response report") @PostMapping(value = "/getCDIResponseReport", headers = "Authorization") public ResponseEntity getCDIResponseReport( @@ -301,7 +301,7 @@ public ResponseEntity getCDIResponseReport( } } - @CrossOrigin() + @Operation(summary = "Get schemes report by date") @PostMapping(value = "/getSchemesReportByDate", headers = "Authorization") public ResponseEntity getSchemesReportByDate( @@ -330,7 +330,7 @@ public ResponseEntity getSchemesReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get directory service report by date") @PostMapping(value = "/getDirectoryServiceReportByDate", headers = "Authorization") public ResponseEntity getDirectoryServiceReportByDate( @@ -358,7 +358,7 @@ public ResponseEntity getDirectoryServiceReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get food safety report by date") @PostMapping(value = "/getFoodSafetyReportByDate", headers = "Authorization") public ResponseEntity getFoodSafetyReportByDate( @@ -387,7 +387,7 @@ public ResponseEntity getFoodSafetyReportByDate( } - @CrossOrigin() + @Operation(summary = "Get blood on call report by date") @PostMapping(value = "/getBloodOnCallReportByDate", headers = "Authorization") public ResponseEntity getBloodOnCallReportByDate( @@ -415,7 +415,7 @@ public ResponseEntity getBloodOnCallReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get blood on call count report by date") @PostMapping(value = "/getBloodOnCallCountReportByDate", headers = "Authorization") public ResponseEntity getBloodOnCallCountReportByDate( @@ -446,7 +446,7 @@ public ResponseEntity getBloodOnCallCountReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get epidemic report by date") @PostMapping(value = "/getEpidemicReportByDate", headers = "Authorization") public ResponseEntity getEpidemicReportByDate( @@ -472,7 +472,7 @@ public ResponseEntity getEpidemicReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get organ donation report by date") @PostMapping(value = "/getOrganDonationReportByDate", headers = "Authorization") public ResponseEntity getOrganDonationReportByDate( @@ -500,7 +500,7 @@ public ResponseEntity getOrganDonationReportByDate( } } - @CrossOrigin() + @Operation(summary = "Get PD summary report by date") @PostMapping(value = "/getPDSummaryReportByDate", headers = "Authorization") public ResponseEntity getPDSummaryReport(@Parameter(description="{\"startDateTime\":\"Date time stamp of start date\", " diff --git a/src/main/java/com/iemr/helpline104/controller/sioHistory/ServiceImprovementOfficerController.java b/src/main/java/com/iemr/helpline104/controller/sioHistory/ServiceImprovementOfficerController.java index c137dd1..336974e 100644 --- a/src/main/java/com/iemr/helpline104/controller/sioHistory/ServiceImprovementOfficerController.java +++ b/src/main/java/com/iemr/helpline104/controller/sioHistory/ServiceImprovementOfficerController.java @@ -64,7 +64,7 @@ public class ServiceImprovementOfficerController { @Autowired private FoodSafetyCopmlaintServiceImpl foodSafetyCopmlaintServiceImpl; - @CrossOrigin + @Operation(summary = "Get sio history") @PostMapping(value = "/getSioHistory", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSioHistory(@RequestBody String benificiary) { diff --git a/src/main/java/com/iemr/helpline104/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/helpline104/controller/snomedct/SnomedController.java index f6f2cb4..2057979 100644 --- a/src/main/java/com/iemr/helpline104/controller/snomedct/SnomedController.java +++ b/src/main/java/com/iemr/helpline104/controller/snomedct/SnomedController.java @@ -50,7 +50,7 @@ public void setSnomedService(SnomedService snomedService) { this.snomedService = snomedService; } - @CrossOrigin + @Operation(summary = "Retrieve Snomed CT record") @PostMapping(value = "/getSnomedCTRecord", headers = "Authorization") public String getSnomedCTRecord(@Parameter(description = "{\"term\":\"String\"}") @RequestBody String request) { @@ -84,7 +84,7 @@ public String getSnomedCTRecord(@Parameter(description = "{\"term\":\"String\"}" return output.toString(); } - @CrossOrigin + @Operation(summary = "Retrieves Snomed CT records") @PostMapping(value = "/getSnomedCTRecords", headers = "Authorization") public String getSnomedCTRecords(@Parameter(description = "{\"term\":\"String\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/helpline104/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/helpline104/controller/users/IEMRAdminController.java index bb7cff6..2f43074 100644 --- a/src/main/java/com/iemr/helpline104/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/helpline104/controller/users/IEMRAdminController.java @@ -46,7 +46,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RequestMapping(value = "/user") @RestController public class IEMRAdminController { @@ -58,7 +58,7 @@ public void setIemrAdminUserService(IEMRAdminUserServiceImpl iemrAdminUserServic this.iemrAdminUserService = iemrAdminUserService; } - @CrossOrigin() + @Operation(summary = "User authenticate") @PostMapping(value = { "/userAuthenticate" }, produces = { "application/json" }) public String userAuthenticate(@RequestBody M_User m_User) { @@ -99,7 +99,7 @@ public String userAuthenticate(@RequestBody M_User m_User) { return new Gson().toJson(resMap); } - @CrossOrigin() + @Operation(summary = "Forget password") @PostMapping(value = { "/forgetPassword" }, produces = { "application/json" }) public String forgetPassword(@RequestBody M_User m_User) { @@ -127,7 +127,7 @@ public String forgetPassword(@RequestBody M_User m_User) { return new Gson().toJson(resMap); } - @CrossOrigin() + @Operation(summary = "Set forget password") @PostMapping(value = { "/setForgetPassword" }, produces = { "application/json" }) public String setPassword(@RequestBody M_User m_user) { @@ -149,7 +149,7 @@ public String setPassword(@RequestBody M_User m_user) { return new Gson().toJson(setStatus); } - @CrossOrigin() + @Operation(summary = "Change password") @PostMapping(value = { "/changePassword" }, produces = { "application/json" }) public String changePassword(@RequestBody M_User m_User) { @@ -172,7 +172,7 @@ public String changePassword(@RequestBody M_User m_User) { return new Gson().toJson(changeReqResult); } - @CrossOrigin() + @Operation(summary = "Save user security question answers") @PostMapping(value = "/saveUserSecurityQuesAns", produces = "application/json") public String saveUserSecurityQuesAns(@RequestBody Iterable m_UserSecurityQMapping) { @@ -194,7 +194,7 @@ public String saveUserSecurityQuesAns(@RequestBody Iterable Date: Tue, 15 Apr 2025 22:19:09 +0530 Subject: [PATCH 3/5] fix(cors): pdate 104 ci properties value assign:- @CORS_ALLOWED_ORIGINS@ --- src/main/environment/104_ci.properties | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/environment/104_ci.properties b/src/main/environment/104_ci.properties index e2ef30d..b27d17f 100644 --- a/src/main/environment/104_ci.properties +++ b/src/main/environment/104_ci.properties @@ -24,7 +24,11 @@ jwt.secret=@env.JWT_SECRET_KEY@ springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ +<<<<<<< HEAD sendSMSUrl= @env.COMMON_API_BASE_URL@sms/sendSMS sendEmailGeneralUrl = @env.COMMON_API_BASE_URL@emailController/sendEmailGeneral cors.allowed-origins= +======= +cors.allowed-origins=@CORS_ALLOWED_ORIGINS@ +>>>>>>> 85c86f9 (Update 104_ci.properties) From 88ffd0e128c8bf8a44f536ca939098f0705cd10f Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Sat, 17 May 2025 09:37:25 +0530 Subject: [PATCH 4/5] fix(cors): dynamic cors filter added --- .../iemr/helpline104/config/CorsConfig.java | 2 +- .../helpline104/utils/DynamicCorsFilter.java | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/iemr/helpline104/utils/DynamicCorsFilter.java diff --git a/src/main/java/com/iemr/helpline104/config/CorsConfig.java b/src/main/java/com/iemr/helpline104/config/CorsConfig.java index 3dfd351..4687be0 100644 --- a/src/main/java/com/iemr/helpline104/config/CorsConfig.java +++ b/src/main/java/com/iemr/helpline104/config/CorsConfig.java @@ -14,7 +14,7 @@ public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOriginPatterns(allowedOrigins.split(",")) + .allowedOrigins(allowedOrigins.split(",")) .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") .allowedHeaders("*") .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed diff --git a/src/main/java/com/iemr/helpline104/utils/DynamicCorsFilter.java b/src/main/java/com/iemr/helpline104/utils/DynamicCorsFilter.java new file mode 100644 index 0000000..1e5120b --- /dev/null +++ b/src/main/java/com/iemr/helpline104/utils/DynamicCorsFilter.java @@ -0,0 +1,37 @@ +package com.iemr.helpline104.utils; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.Arrays; + +@Component +public class DynamicCorsFilter extends OncePerRequestFilter { + + @Value("${cors.allowed-origins}") + private String[] allowedOrigins; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + String origin = request.getHeader("Origin"); + if (origin != null && Arrays.asList(allowedOrigins).contains(origin)) { + response.setHeader("Access-Control-Allow-Origin", origin); + } + + if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { + response.setStatus(HttpServletResponse.SC_OK); + } else { + filterChain.doFilter(request, response); + } + } +} From 552198b3a1e3af7de7f67aaacb22c619c3788118 Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Fri, 23 May 2025 21:41:32 +0530 Subject: [PATCH 5/5] fix(cors): added the cors --- src/main/environment/104_ci.properties | 5 --- src/main/environment/104_example.properties | 2 +- .../iemr/helpline104/config/CorsConfig.java | 2 +- .../iemr/helpline104/utils/FilterConfig.java | 19 +++++++--- .../utils/JwtUserIdValidationFilter.java | 37 +++++++++++++++++-- 5 files changed, 49 insertions(+), 16 deletions(-) diff --git a/src/main/environment/104_ci.properties b/src/main/environment/104_ci.properties index b27d17f..84b991c 100644 --- a/src/main/environment/104_ci.properties +++ b/src/main/environment/104_ci.properties @@ -24,11 +24,6 @@ jwt.secret=@env.JWT_SECRET_KEY@ springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ -<<<<<<< HEAD sendSMSUrl= @env.COMMON_API_BASE_URL@sms/sendSMS sendEmailGeneralUrl = @env.COMMON_API_BASE_URL@emailController/sendEmailGeneral - -cors.allowed-origins= -======= cors.allowed-origins=@CORS_ALLOWED_ORIGINS@ ->>>>>>> 85c86f9 (Update 104_ci.properties) diff --git a/src/main/environment/104_example.properties b/src/main/environment/104_example.properties index d09b78a..67d5afb 100644 --- a/src/main/environment/104_example.properties +++ b/src/main/environment/104_example.properties @@ -22,4 +22,4 @@ jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret #If both properties are set, only logging.file.name takes effect. logging.path=logs/ logging.file.name=logs/helpline104-api.log -cors.allowed-origins=http://localhost:*,http://127.0.0.1:* +cors.allowed-origins=http://localhost:* diff --git a/src/main/java/com/iemr/helpline104/config/CorsConfig.java b/src/main/java/com/iemr/helpline104/config/CorsConfig.java index 4687be0..3dfd351 100644 --- a/src/main/java/com/iemr/helpline104/config/CorsConfig.java +++ b/src/main/java/com/iemr/helpline104/config/CorsConfig.java @@ -14,7 +14,7 @@ public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins(allowedOrigins.split(",")) + .allowedOriginPatterns(allowedOrigins.split(",")) .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") .allowedHeaders("*") .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed diff --git a/src/main/java/com/iemr/helpline104/utils/FilterConfig.java b/src/main/java/com/iemr/helpline104/utils/FilterConfig.java index 1e669b7..9043c3a 100644 --- a/src/main/java/com/iemr/helpline104/utils/FilterConfig.java +++ b/src/main/java/com/iemr/helpline104/utils/FilterConfig.java @@ -1,5 +1,6 @@ package com.iemr.helpline104.utils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,13 +8,21 @@ @Configuration public class FilterConfig { - + + @Value("${cors.allowed-origins}") + private String allowedOrigins; + @Bean - public FilterRegistrationBean jwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil) { + public FilterRegistrationBean jwtUserIdValidationFilter( + JwtAuthenticationUtil jwtAuthenticationUtil) { FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new JwtUserIdValidationFilter(jwtAuthenticationUtil)); - registrationBean.addUrlPatterns("/*"); // Apply filter to all API endpoints + + // Pass allowedOrigins explicitly to the filter constructor + JwtUserIdValidationFilter filter = new JwtUserIdValidationFilter(jwtAuthenticationUtil, allowedOrigins); + + registrationBean.setFilter(filter); + registrationBean.addUrlPatterns("/*"); // Apply filter to all API endpoints return registrationBean; } - } + diff --git a/src/main/java/com/iemr/helpline104/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/helpline104/utils/JwtUserIdValidationFilter.java index 24d49f0..fa66b50 100644 --- a/src/main/java/com/iemr/helpline104/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/helpline104/utils/JwtUserIdValidationFilter.java @@ -7,6 +7,7 @@ import org.springframework.stereotype.Component; import com.iemr.helpline104.utils.http.AuthorizationHeaderRequestWrapper; +import org.springframework.beans.factory.annotation.Value; import jakarta.servlet.Filter; import jakarta.servlet.FilterChain; @@ -16,17 +17,19 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.util.Arrays; @Component public class JwtUserIdValidationFilter implements Filter { private final JwtAuthenticationUtil jwtAuthenticationUtil; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private final String allowedOrigins; - public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil) { - this.jwtAuthenticationUtil = jwtAuthenticationUtil; - } - + public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil, @Value("${cors.allowed-origins}") String allowedOrigins) { + this.jwtAuthenticationUtil = jwtAuthenticationUtil; + this.allowedOrigins = allowedOrigins; + } @Override public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { @@ -37,6 +40,20 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo String contextPath = request.getContextPath(); logger.info("JwtUserIdValidationFilter invoked for path: " + path); + String origin = request.getHeader("Origin"); + if (origin != null && isOriginAllowed(origin)) { + response.setHeader("Access-Control-Allow-Origin", origin); + response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS"); + response.setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type, Accept, Jwttoken"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + } + + if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { + logger.info("OPTIONS request - skipping JWT validation"); + response.setStatus(HttpServletResponse.SC_OK); + return; + } + // Log cookies for debugging Cookie[] cookies = request.getCookies(); if (cookies != null) { @@ -110,6 +127,18 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Authorization error: " + e.getMessage()); } } + + private boolean isOriginAllowed(String origin) { + if (origin == null || allowedOrigins == null || allowedOrigins.trim().isEmpty()) { + logger.warn("No allowed origins configured or origin is null"); + return false; + } + + return Arrays.stream(allowedOrigins.split(",")) + .map(String::trim) + .anyMatch(pattern -> origin.matches(pattern.replace(".", "\\.").replace("*", ".*"))); + } + private boolean isMobileClient(String userAgent) { if (userAgent == null) return false;