From 038ab1a35a62747644d8221ea27d383f06f41d8d Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Mon, 14 Apr 2025 19:07:13 +0530 Subject: [PATCH 1/5] fix(cors): global cors config added. --- src/main/environment/common_ci.properties | 2 ++ .../environment/common_example.properties | 2 +- .../java/com/iemr/mmu/config/CorsConfig.java | 25 +++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/iemr/mmu/config/CorsConfig.java diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index b6caef4c..69422ee8 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -85,3 +85,5 @@ logging.file.name=@env.MMU_API_LOGGING_FILE_NAME@ springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ +cors.allowed-origins=@CORS_ALLOWED_ORIGINS@ + diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index d6636354..146ca00c 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -99,4 +99,4 @@ getServerCredentialURL=http://10.208.122.34:1040/mmuapi-v1.0/fileSyncController/ spring.redis.host=localhost jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret logging.path=logs/ -logging.file.name=logs/mmu-api.log \ No newline at end of file +logging.file.name=logs/mmu-api.log diff --git a/src/main/java/com/iemr/mmu/config/CorsConfig.java b/src/main/java/com/iemr/mmu/config/CorsConfig.java new file mode 100644 index 00000000..2f3af15d --- /dev/null +++ b/src/main/java/com/iemr/mmu/config/CorsConfig.java @@ -0,0 +1,25 @@ +package com.iemr.mmu.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 ca045b84291ecd891d0e37bfeea215473b5a97e4 Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Mon, 14 Apr 2025 19:23:25 +0530 Subject: [PATCH 2/5] fix(cors): controller specific cors config removed --- .../mmu/controller/anc/ANCController.java | 25 ++---- .../CancerScreeningController.java | 34 ++++---- .../common/main/CommonController.java | 78 +++++++++---------- .../common/main/InsertCommonController.java | 3 +- .../common/master/CommonMasterController.java | 2 +- .../controller/covid19/CovidController.java | 20 ++--- .../dataSyncActivity/StartSyncActivity.java | 16 ++-- .../MMUDataSyncVanToServer.java | 10 +-- .../fileSync/FileSyncController.java | 4 +- .../generalOPD/GeneralOPDController.java | 26 +++---- .../LabTechnicianController.java | 8 +- .../location/LocationController.java | 6 +- .../login/IemrMmuLoginController.java | 8 +- .../controller/ncdCare/NCDCareController.java | 20 ++--- .../ncdscreening/NCDController.java | 30 +++---- .../vitals/AnthropometryVitalsController.java | 4 +- .../pnc/PostnatalCareController.java | 28 +++---- .../quickconsult/QuickConsultController.java | 14 ++-- .../registrar/main/RegistrarController.java | 30 +++---- .../mmu/controller/reports/ReportGateway.java | 8 +- .../controller/snomedct/SnomedController.java | 4 +- .../TeleConsultationController.java | 10 +-- 22 files changed, 189 insertions(+), 199 deletions(-) diff --git a/src/main/java/com/iemr/mmu/controller/anc/ANCController.java b/src/main/java/com/iemr/mmu/controller/anc/ANCController.java index a36d5bcb..7f0ff864 100644 --- a/src/main/java/com/iemr/mmu/controller/anc/ANCController.java +++ b/src/main/java/com/iemr/mmu/controller/anc/ANCController.java @@ -47,7 +47,7 @@ * @Objective Saving ANC data for Nurse and Doctor. */ -@CrossOrigin + @RestController @RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class ANCController { @@ -62,8 +62,6 @@ public class ANCController { * @param JSON requestObj * @return success or failure response */ - - @CrossOrigin @Operation(summary = "Save ANC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenANCNurseData(@RequestBody String requestObj) { @@ -96,7 +94,6 @@ public String saveBenANCNurseData(@RequestBody String requestObj) { * @param JSON requestObj * @return success or failure response */ - @CrossOrigin @Operation(summary = "Save ANC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenANCDoctorData(@RequestBody String requestObj, @@ -122,7 +119,6 @@ public String saveBenANCDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary visit details from nurse ANC") @PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -153,7 +149,6 @@ public String getBenVisitDetailsFrmNurseANC( * @param benRegID and benVisitID * @return anc care details in JSON format */ - @CrossOrigin() @Operation(summary = "Get beneficiary ANC care details from nurse ANC") @PostMapping(value = { "/getBenANCDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -186,10 +181,8 @@ public String getBenANCDetailsFrmNurseANC( * @param benRegID and benVisitID * @return history details in JSON format */ - @CrossOrigin() @Operation(summary = "Get beneficiary ANC history details from nurse to doctor ") @PostMapping(value = { "/getBenANCHistoryDetails" }) - public String getBenANCHistoryDetails( @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { OutputResponse response = new OutputResponse(); @@ -218,7 +211,6 @@ public String getBenANCHistoryDetails( * @param benRegID and benVisitID * @return vital details in JSON format */ - @CrossOrigin() @Operation(summary = "Get beneficiary ANC vital details from nurse ANC") @PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" }) public String getBenANCVitalDetailsFrmNurseANC( @@ -250,7 +242,6 @@ public String getBenANCVitalDetailsFrmNurseANC( * @param benRegID and benVisitID * @return examination details in JSON format */ - @CrossOrigin() @Operation(summary = "Get beneficiary ANC examination details from nurse to doctor ") @PostMapping(value = { "/getBenExaminationDetailsANC" }) @@ -282,7 +273,7 @@ public String getBenExaminationDetailsANC( * @param benRegID and benVisitID * @return doctor entered details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorANC" }) @Transactional(rollbackFor = Exception.class) @@ -309,7 +300,7 @@ public String getBenCaseRecordFromDoctorANC( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Check high risk pregnancy status for ANC beneficiary") @PostMapping(value = { "/getHRPStatus" }) @Transactional(rollbackFor = Exception.class) @@ -339,7 +330,7 @@ public String getHRPStatus( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update ANC care data in doctor screen") @PostMapping(value = { "/update/ANCScreen" }) public String updateANCCareNurse(@RequestBody String requestObj) { @@ -371,7 +362,7 @@ public String updateANCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC history data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateANCHistoryNurse(@RequestBody String requestObj) { @@ -402,7 +393,7 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateANCVitalNurse(@RequestBody String requestObj) { @@ -434,7 +425,7 @@ public String updateANCVitalNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC examination data in doctor screen") @PostMapping(value = { "/update/examinationScreen" }) public String updateANCExaminationNurse(@RequestBody String requestObj) { @@ -465,7 +456,7 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) { * @objective Replace ANC doctor data for the doctor next visit * */ - @CrossOrigin + @Operation(summary = "Update ANC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateANCDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java b/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java index 0f3f6d71..7d6755c9 100644 --- a/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java @@ -50,7 +50,7 @@ /** * @Objective Saving Cancer screening data for Nurse and Doctor both. */ -@CrossOrigin + @RestController @RequestMapping(value = "/CS-cancerScreening", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CancerScreeningController { @@ -68,7 +68,7 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save cancer screening nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, @@ -109,7 +109,7 @@ else if (nurseDataSaveSuccessFlag == 2) * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save cancer screening doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, @@ -136,7 +136,7 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary visit details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -167,7 +167,7 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary cancer history details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" }) public String getBenDataFrmNurseScrnToDocScrnHistory( @@ -197,7 +197,7 @@ public String getBenDataFrmNurseScrnToDocScrnHistory( * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary vital details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" }) public String getBenDataFrmNurseScrnToDocScrnVital( @@ -228,7 +228,7 @@ public String getBenDataFrmNurseScrnToDocScrnVital( * @return examination details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary examination details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" }) public String getBenDataFrmNurseScrnToDocScrnExamination( @@ -259,7 +259,7 @@ public String getBenDataFrmNurseScrnToDocScrnExamination( * @return previous family history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary cancer family history") @PostMapping(value = { "/getBenCancerFamilyHistory" }) public String getBenCancerFamilyHistory( @@ -292,7 +292,7 @@ public String getBenCancerFamilyHistory( * @return previous personal history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary cancer personal history") @PostMapping(value = { "/getBenCancerPersonalHistory" }) public String getBenCancerPersonalHistory( @@ -325,7 +325,7 @@ public String getBenCancerPersonalHistory( * @return previous personal history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary cancer personal diet history") @PostMapping(value = { "/getBenCancerPersonalDietHistory" }) public String getBenCancerPersonalDietHistory( @@ -358,7 +358,7 @@ public String getBenCancerPersonalDietHistory( * @return previous obstetric history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary cancer obstetric history") @PostMapping(value = { "/getBenCancerObstetricHistory" }) public String getBenCancerObstetricHistory( @@ -390,7 +390,7 @@ public String getBenCancerObstetricHistory( * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCS" }) @Transactional(rollbackFor = Exception.class) @@ -417,7 +417,7 @@ public String getBenCaseRecordFromDoctorCS( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update cancer screening history nurse data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateCSHistoryNurse( @@ -463,7 +463,7 @@ public String updateCSHistoryNurse( * details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update beneficiary vital detail") @PostMapping(value = { "/update/vitalScreen" }) public String upodateBenVitalDetail( @@ -501,7 +501,7 @@ public String upodateBenVitalDetail( * the details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update beneficiary examination detail") @PostMapping(value = { "/update/examinationScreen" }) public String upodateBenExaminationDetail(@RequestBody String requestObj) { @@ -532,7 +532,7 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) { * */ - @CrossOrigin + @Operation(summary = "Update cancer diagnosis details by oncologist") @PostMapping(value = { "/update/examinationScreen/diagnosis" }) public String updateCancerDiagnosisDetailsByOncologist( @@ -565,7 +565,7 @@ public String updateCancerDiagnosisDetailsByOncologist( * */ - @CrossOrigin + @Operation(summary = "Update cancer screening doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java b/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java index c3a750b3..a65881d7 100644 --- a/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java +++ b/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java @@ -57,7 +57,7 @@ import jakarta.servlet.http.HttpServletRequest; -@CrossOrigin + @RestController @RequestMapping(value = "/common", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CommonController { @@ -89,7 +89,7 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI } private static final String BENEFICIARY_REG_ID = "beneficiaryRegID"; - @CrossOrigin() + @Operation(summary = "Provides doctor worklist") @GetMapping(value = { "/getDocWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -113,7 +113,7 @@ public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer pr return response.toString(); } - @CrossOrigin() + @Operation(summary = "Provides doctor worklist future scheduled for TM") @GetMapping(value = { "/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}" }) public String getDocWorkListNewFutureScheduledForTM( @@ -139,7 +139,7 @@ public String getDocWorkListNewFutureScheduledForTM( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get nurse worklist new") @GetMapping(value = { "/getNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -163,7 +163,7 @@ public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer * @ApiParam vanID * @return */ - @CrossOrigin() + @Operation(summary = "Get nurse worklist TM referred") @GetMapping(value = { "/getNurseWorklistTMreferred/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorklistTMreferred(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -182,7 +182,7 @@ public String getNurseWorklistTMreferred(@PathVariable("providerServiceMapID") I return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get doctor entered previous significant Ffindings") @PostMapping(value = { "/getDoctorPreviousSignificantFindings" }) public String getDoctorPreviousSignificantFindings( @@ -207,7 +207,7 @@ public String getDoctorPreviousSignificantFindings( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get lab technician worklist new") @GetMapping(value = { "/getLabWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -226,7 +226,7 @@ public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer pr return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get radiologist worklist new") @GetMapping(value = { "/getRadiologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -245,7 +245,7 @@ public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") In return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get oncologist worklist new") @GetMapping(value = { "/getOncologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -264,7 +264,7 @@ public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Int return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get pharma worklist new") @GetMapping(value = { "/getPharma-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -283,7 +283,7 @@ public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get case-sheet print data for beneficiary.") @PostMapping(value = { "/get/Case-sheet/printData" }) public String getCasesheetPrintData(@RequestBody String comingReq, @@ -303,7 +303,7 @@ public String getCasesheetPrintData(@RequestBody String comingReq, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary past history") @PostMapping(value = { "/getBenPastHistory" }) public String getBenPastHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -328,7 +328,7 @@ public String getBenPastHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary tobacco history") @PostMapping(value = { "/getBenTobaccoHistory" }) public String getBenTobaccoHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -353,7 +353,7 @@ public String getBenTobaccoHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary alcohol history") @PostMapping(value = { "/getBenAlcoholHistory" }) public String getBenAlcoholHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -378,7 +378,7 @@ public String getBenAlcoholHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary allergy history") @PostMapping(value = { "/getBenAllergyHistory" }) public String getBenANCAllergyHistory( @@ -404,7 +404,7 @@ public String getBenANCAllergyHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary medication history") @PostMapping(value = { "/getBenMedicationHistory" }) public String getBenMedicationHistory( @@ -430,7 +430,7 @@ public String getBenMedicationHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenFamilyHistory" }) public String getBenFamilyHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -455,7 +455,7 @@ public String getBenFamilyHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @ return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary menstrual history") @PostMapping(value = { "/getBenMenstrualHistory" }) public String getBenMenstrualHistory( @@ -481,7 +481,7 @@ public String getBenMenstrualHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary past obstetric history") @PostMapping(value = { "/getBenPastObstetricHistory" }) public String getBenPastObstetricHistory( @@ -507,7 +507,7 @@ public String getBenPastObstetricHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary comorbidity condition details") @PostMapping(value = { "/getBenComorbidityConditionHistory" }) public String getBenANCComorbidityConditionHistory( @@ -533,7 +533,7 @@ public String getBenANCComorbidityConditionHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary optional vaccine details") @PostMapping(value = { "/getBenOptionalVaccineHistory" }) public String getBenOptionalVaccineHistory( @@ -559,7 +559,7 @@ public String getBenOptionalVaccineHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary child vaccine(Immunization) details") @PostMapping(value = { "/getBenChildVaccineHistory" }) public String getBenImmunizationHistory( @@ -585,7 +585,7 @@ public String getBenImmunizationHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary perinatal history details") @PostMapping(value = { "/getBenPerinatalHistory" }) public String getBenPerinatalHistory( @@ -611,7 +611,7 @@ public String getBenPerinatalHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary child feeding history details") @PostMapping(value = { "/getBenFeedingHistory" }) public String getBenFeedingHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -636,7 +636,7 @@ public String getBenFeedingHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary child development history details") @PostMapping(value = { "/getBenDevelopmentHistory" }) public String getBenDevelopmentHistory( @@ -665,7 +665,7 @@ public String getBenDevelopmentHistory( /*** * fetch ben previous visit details for history case-record(Platform). */ - @CrossOrigin() + @Operation(summary = "Get casesheet history of beneficiary") @PostMapping(value = { "/getBeneficiaryCaseSheetHistory" }) public String getBeneficiaryCaseSheetHistory( @@ -684,7 +684,7 @@ public String getBeneficiaryCaseSheetHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "TC specialist") @GetMapping(value = { "/getTCSpecialistWorklist/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -709,7 +709,7 @@ public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") I return response.toString(); } - @CrossOrigin() + @Operation(summary = "TC specialist future scheduled") @GetMapping(value = { "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) @@ -736,7 +736,7 @@ public String getTCSpecialistWorklistFutureScheduled( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Download file from file system") @PostMapping(value = { "/downloadFile" }) public ResponseEntity downloadFile(@RequestBody String requestOBJ, HttpServletRequest request) @@ -767,7 +767,7 @@ public ResponseEntity downloadFile(@RequestBody String requ } - @CrossOrigin() + @Operation(summary = "Get beneficiary physical history") @PostMapping(value = { "/getBenPhysicalHistory" }) public String getBenPhysicalHistory( @@ -793,7 +793,7 @@ public String getBenPhysicalHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary symptomatic questionnaire answer details") @PostMapping(value = { "/getBenSymptomaticQuestionnaireDetails" }) public String getBenSymptomaticQuestionnaireDetails( @@ -819,7 +819,7 @@ public String getBenSymptomaticQuestionnaireDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary previous diabetes history") @PostMapping(value = { "/getBenPreviousDiabetesHistoryDetails" }) public String getBenPreviousDiabetesHistoryDetails( @@ -850,7 +850,7 @@ public String getBenPreviousDiabetesHistoryDetails( * @ApiParam Authorization * @return */ - @CrossOrigin() + @Operation(summary = "Get beneficiary TM case record") @PostMapping(value = { "/get/Case-sheet/TMReferredprintData" }) public String getTMReferredPrintData(@RequestBody String comingRequest, @@ -888,7 +888,7 @@ public String getTMReferredPrintData(@RequestBody String comingRequest, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary previous referral history") @PostMapping(value = { "/getBenPreviousReferralHistoryDetails" }) public String getBenPreviousReferralHistoryDetails( @@ -915,7 +915,7 @@ public String getBenPreviousReferralHistoryDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary TM case record") @PostMapping(value = { "/get/Case-sheet/centralServerTMCaseSheet" }) public String getTMCaseSheetFromCentralServer(@RequestBody String comingRequest, @@ -953,7 +953,7 @@ public String getTMCaseSheetFromCentralServer(@RequestBody String comingRequest, * @ApiParam comingRequest * @return ProviderSpecificMasterData */ - @CrossOrigin() + @Operation(summary = "Calculate beneficiary BMI status") @PostMapping(value = { "/calculateBMIStatus" }) public String calculateBMIStatus( @@ -971,7 +971,7 @@ public String calculateBMIStatus( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update beneficiary status flag") @PostMapping(value = { "/update/benDetailsAndSubmitToNurse" }) public String saveBeneficiaryVisitDetail( @@ -1006,7 +1006,7 @@ public String saveBeneficiaryVisitDetail( return response.toString(); } - @CrossOrigin + @Operation(summary = "Extend redis session for 30 minutes") @PostMapping(value = { "/extend/redisSession" }) public String extendRedisSession() { @@ -1019,7 +1019,7 @@ public String extendRedisSession() { return response.toString(); } - @CrossOrigin + @Operation(summary = "Soft delete prescribed medicine") @PostMapping(value = { "/doctor/delete/prescribedMedicine" }) public String deletePrescribedMedicine(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/mmu/controller/common/main/InsertCommonController.java b/src/main/java/com/iemr/mmu/controller/common/main/InsertCommonController.java index 5c4544c1..4b4d9396 100644 --- a/src/main/java/com/iemr/mmu/controller/common/main/InsertCommonController.java +++ b/src/main/java/com/iemr/mmu/controller/common/main/InsertCommonController.java @@ -40,7 +40,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/commonInsert", headers = "Authorization") public class InsertCommonController { @@ -48,7 +48,6 @@ public class InsertCommonController { @Autowired private CommonServiceImpl commonServiceImpl; - @CrossOrigin() @Operation(summary = "Save beneficairy documents locally") @PostMapping(value = { "/saveFiles" }, consumes = "application/json", produces = "application/json") public String saveFiles(@RequestBody String request) { diff --git a/src/main/java/com/iemr/mmu/controller/common/master/CommonMasterController.java b/src/main/java/com/iemr/mmu/controller/common/master/CommonMasterController.java index fd388f96..11440215 100644 --- a/src/main/java/com/iemr/mmu/controller/common/master/CommonMasterController.java +++ b/src/main/java/com/iemr/mmu/controller/common/master/CommonMasterController.java @@ -36,7 +36,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/master", headers = "Authorization") /** Objective: provides master data based on given visitCategory */ diff --git a/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java b/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java index 7e769264..88a80530 100644 --- a/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java @@ -54,7 +54,7 @@ * @Date : 25/06/2020 * */ -@CrossOrigin + @RestController @RequestMapping(value = "pandemic/covid", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CovidController { @@ -64,7 +64,7 @@ public class CovidController { private Covid19Service covid19Service; @Autowired private Covid19ServiceImpl covid19ServiceImpl; - @CrossOrigin + @Operation(summary = "Save covid nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenCovid19NurseData(@RequestBody String requestObj, @@ -100,7 +100,7 @@ public String saveBenCovid19NurseData(@RequestBody String requestObj, * @ApiParam Authorization * @return */ - @CrossOrigin + @Operation(summary = "Save covid doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, @@ -126,7 +126,7 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, } return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary visit details from nurse covid 19") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) @@ -159,7 +159,7 @@ public String getBenVisitDetailsFrmNurseCovid19( * @ApiParam comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary covid 19 history details from nurse to doctor ") @PostMapping(value = { "/getBenCovid19HistoryDetails" }) @@ -192,7 +192,7 @@ public String getBenCovid19HistoryDetails( * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary covid 19 vital details from nurse NCD care") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -220,7 +220,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( } - @CrossOrigin() + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCovid" }) @Transactional(rollbackFor = Exception.class) @@ -247,7 +247,7 @@ public String getBenCaseRecordFromDoctorCovid19( } return response.toString(); } - @CrossOrigin + @Operation(summary = "Update history data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -281,7 +281,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update covid vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -311,7 +311,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace covid 19 doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update covid 19 doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateCovid19DoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java index e89f199e..01369222 100644 --- a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java +++ b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java @@ -44,7 +44,7 @@ /*** * @purpose Class used for data sync from van-to-server & server-to-van */ -@CrossOrigin + @RestController @RequestMapping(value = "/dataSyncActivity", headers = "Authorization", consumes = "application/json", produces = "application/json") public class StartSyncActivity { @@ -59,7 +59,7 @@ public class StartSyncActivity { private static final String GROUP_ID = "groupID"; private static final String PROVIDER_SERVICE_MAP_ID = "providerServiceMapID"; - @CrossOrigin() + @Operation(summary = "Start data sync from van to Server") @PostMapping(value = { "/van-to-server" }) public String dataSyncToServer(@RequestBody String requestOBJ, @@ -85,7 +85,7 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toStringWithSerialization(); } - @CrossOrigin() + @Operation(summary = "Get data sync group details") @GetMapping(value = { "/getSyncGroupDetails" }) public String getSyncGroupDetails() { @@ -106,7 +106,7 @@ public String getSyncGroupDetails() { /** * @return Masters download in van from central server */ - @CrossOrigin() + @Operation(summary = "Data sync master download") @PostMapping(value = { "/startMasterDownload" }) public String startMasterDownload(@RequestBody String requestOBJ, @@ -139,7 +139,7 @@ public String startMasterDownload(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Data sync master download progress check") @GetMapping(value = { "/checkMastersDownloadProgress" }) public String checkMastersDownloadProgress() { @@ -153,7 +153,7 @@ public String checkMastersDownloadProgress() { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get van details for master download") @GetMapping(value = { "/getVanDetailsForMasterDownload" }) public String getVanDetailsForMasterDownload() { @@ -171,7 +171,7 @@ public String getVanDetailsForMasterDownload() { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Call central API to generate beneficiary id and import to local") @PostMapping(value = { "/callCentralAPIToGenerateBenIDAndimportToLocal" }) public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String requestOBJ, @@ -196,7 +196,7 @@ public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String return response.toString(); } - @CrossOrigin() + @Operation(summary = "Call central API to download transaction data to local") @PostMapping(value = { "/downloadTransactionToLocal" }) public String downloadTransactionToLocal(@RequestBody String requestOBJ, diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java b/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java index f98c5b85..80db124a 100644 --- a/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java +++ b/src/main/java/com/iemr/mmu/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java @@ -44,7 +44,7 @@ /*** * @operation Class used for data sync from van-to-server & server-to-van */ -@CrossOrigin + @RestController @RequestMapping(value = "/dataSync", headers = "Authorization") public class MMUDataSyncVanToServer { @@ -57,7 +57,7 @@ public class MMUDataSyncVanToServer { @Autowired private FetchDownloadDataImpl fetchDownloadDataImpl; - @CrossOrigin() + @Operation(summary = "Sync data from van-to-server") @PostMapping(value = { "/van-to-server" }, consumes = "application/json", produces = "application/json") public String dataSyncToServer(@RequestBody String requestOBJ, @@ -76,7 +76,7 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Download data from server-to-van") @PostMapping(value = { "/server-to-van" }, consumes = "application/json", produces = "application/json") public String dataDownloadFromServer(@RequestBody SyncDownloadMaster syncDownloadMaster, @@ -99,7 +99,7 @@ public String dataDownloadFromServer(@RequestBody SyncDownloadMaster syncDownloa return response.toStringWithSerialization(); } - @CrossOrigin() + @Operation(summary = "Download data from server-to-van transactional") @PostMapping(value = { "/server-to-van-transactional" }, consumes = "application/json", produces = "application/json") public String dataDownloadFromServerTransactional(@RequestBody SyncUploadDataDigester syncUploadDataDigester, @@ -126,7 +126,7 @@ public String dataDownloadFromServerTransactional(@RequestBody SyncUploadDataDig return response.toStringWithSerialization(); } - @CrossOrigin() + @Operation(summary = "Update processed flag at central post successfull download") @PostMapping(value = { "/updateProcessedFlagPostDownload" }, consumes = "application/json", produces = "application/json") public String updateProcessedFlagPostDownload(@RequestBody SyncUploadDataDigester syncUploadDataDigester, diff --git a/src/main/java/com/iemr/mmu/controller/fileSync/FileSyncController.java b/src/main/java/com/iemr/mmu/controller/fileSync/FileSyncController.java index 8438c222..19ade228 100644 --- a/src/main/java/com/iemr/mmu/controller/fileSync/FileSyncController.java +++ b/src/main/java/com/iemr/mmu/controller/fileSync/FileSyncController.java @@ -45,7 +45,7 @@ public class FileSyncController { @Autowired FileSyncService fileSyncService; - @CrossOrigin() + @Operation(summary = "Get server credential") @GetMapping(value = "/getServerCredential", headers = "Authorization", consumes = "application/json", produces = "application/json") public String getServerCredential() { @@ -65,7 +65,7 @@ public String getServerCredential() { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Sync files") @GetMapping(value = "/syncFiles", headers = "Authorization", consumes = "application/json", produces = "application/json") public String syncFiles(@RequestHeader(value = "ServerAuthorization") String ServerAuthorization) { diff --git a/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java b/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java index c83ce6f6..354b835b 100644 --- a/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java @@ -48,7 +48,7 @@ */ @RestController -@CrossOrigin + @RequestMapping(value = "/generalOPD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class GeneralOPDController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @@ -64,7 +64,7 @@ public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl * @ApiParam requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save general OPD nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenGenOPDNurseData(@RequestBody String requestObj) { @@ -97,7 +97,7 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj) { * @ApiParam requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save general OPD doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenGenOPDDoctorData(@RequestBody String requestObj, @@ -123,7 +123,7 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary visit details from nurse general OPD") @PostMapping(value = { "/getBenVisitDetailsFrmNurseGOPD" }) @Transactional(rollbackFor = Exception.class) @@ -156,7 +156,7 @@ public String getBenVisitDetailsFrmNurseGOPD( * @ApiParam comingRequest * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary general OPD history details from nurse to doctor ") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -188,7 +188,7 @@ public String getBenHistoryDetails( * @ApiParam comingRequest * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary vital details from nurse general OPD") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -220,7 +220,7 @@ public String getBenVitalDetailsFrmNurse( * @ApiParam comingRequest * @return examination details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary general OPD examination details from nurse to doctor ") @PostMapping(value = { "/getBenExaminationDetails" }) @@ -252,7 +252,7 @@ public String getBenExaminationDetails( * @ApiParam comingRequest * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorGeneralOPD" }) @Transactional(rollbackFor = Exception.class) @@ -280,7 +280,7 @@ public String getBenCaseRecordFromDoctorGeneralOPD( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update general OPD visit screen nurse data in doctor screen") @PostMapping(value = { "/update/visitDetailsScreen" }) public String updateVisitNurse(@RequestBody String requestObj) { @@ -312,7 +312,7 @@ public String updateVisitNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update history data in doctor Screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -344,7 +344,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update general OPD vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -376,7 +376,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update general OPD examination data in doctor screen") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -406,7 +406,7 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace General OPD doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update general OPD doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java b/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java index d24a1599..7ef2956d 100644 --- a/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java +++ b/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java @@ -44,7 +44,7 @@ */ @RestController -@CrossOrigin + @RequestMapping(value = "/labTechnician", headers = "Authorization", consumes = "application/json", produces = "application/json") public class LabTechnicianController { @@ -62,7 +62,7 @@ public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianSe * @param JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save lab test result entered by lab technician") @PostMapping(value = { "/save/LabTestResult" }) public String saveLabTestResult(@RequestBody String requestObj) { @@ -87,7 +87,7 @@ public String saveLabTestResult(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Get beneficiary prescribed procedure") @PostMapping(value = { "/get/prescribedProceduresList" }) public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) { @@ -114,7 +114,7 @@ public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get lab test result for a visitcode.") @PostMapping(value = { "/get/labResultForVisitcode" }) public String getLabResultForVisitCode(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/mmu/controller/location/LocationController.java b/src/main/java/com/iemr/mmu/controller/location/LocationController.java index 2f5e0872..a8500372 100644 --- a/src/main/java/com/iemr/mmu/controller/location/LocationController.java +++ b/src/main/java/com/iemr/mmu/controller/location/LocationController.java @@ -40,7 +40,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/location", headers = "Authorization") public class LocationController { @@ -136,7 +136,7 @@ public String getVillageMaster(@PathVariable("blockID") Integer blockID) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get location details based on SP id and PSM id") @PostMapping(value = "/getLocDetailsBasedOnSpIDAndPsmID", consumes = "application/json", produces = "application/json") public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequest) { @@ -162,7 +162,7 @@ public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequ return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get district taluk master") @GetMapping(value = "/get/DistrictTalukMaster/{districtBranchID}", consumes = "application/json", produces = "application/json") public String getDistrictTalukMaster(@PathVariable("districtBranchID") Integer districtBranchID) { diff --git a/src/main/java/com/iemr/mmu/controller/login/IemrMmuLoginController.java b/src/main/java/com/iemr/mmu/controller/login/IemrMmuLoginController.java index 527cee59..392c3539 100644 --- a/src/main/java/com/iemr/mmu/controller/login/IemrMmuLoginController.java +++ b/src/main/java/com/iemr/mmu/controller/login/IemrMmuLoginController.java @@ -55,7 +55,7 @@ public void setIemrMmuLoginServiceImpl(IemrMmuLoginServiceImpl iemrMmuLoginServi this.iemrMmuLoginServiceImpl = iemrMmuLoginServiceImpl; } - @CrossOrigin() + @Operation(summary = "Get user service point van details") @GetMapping(value = "/getUserServicePointVanDetails", consumes = "application/json", produces = "application/json") public String getUserServicePointVanDetails(@RequestBody String comingRequest) { @@ -75,7 +75,7 @@ public String getUserServicePointVanDetails(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get service point villages") @PostMapping(value = "/getServicepointVillages", consumes = "application/json", produces = "application/json") public String getServicepointVillages(@RequestBody String comingRequest) { @@ -95,7 +95,7 @@ public String getServicepointVillages(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get user van details") @PostMapping(value = "/getUserVanSpDetails", consumes = "application/json", produces = "application/json") public String getUserVanSpDetails(@RequestBody String comingRequest) { @@ -120,7 +120,7 @@ public String getUserVanSpDetails(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get van master data") @GetMapping(value = "/getVanMaster/{psmID}", consumes = "application/json", produces = "application/json") public String getVanMaster(@PathVariable("psmID") Integer psmID) { diff --git a/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java b/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java index 60b57152..9ca2c004 100644 --- a/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java @@ -49,7 +49,7 @@ /** * @Objective Saving NCD Care data for Nurse and Doctor. */ -@CrossOrigin + @RestController @RequestMapping(value = "/NCDCare", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDCareController { @@ -66,7 +66,7 @@ public void setNcdCareServiceImpl(NCDCareServiceImpl ncdCareServiceImpl) { * @ApiParam JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save NCD care data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj) { @@ -100,7 +100,7 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj) { * @ApiParam JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save NCD care beneficiary case record and referral") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDCareDoctorData(@RequestBody String requestObj, @@ -127,7 +127,7 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD care beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -160,7 +160,7 @@ public String getBenVisitDetailsFrmNurseNCDCare( * @ApiParam comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get NCD care beneficiary history") @PostMapping(value = { "/getBenNCDCareHistoryDetails" }) @@ -193,7 +193,7 @@ public String getBenNCDCareHistoryDetails( * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get NCD care beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseNCDCare" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -225,7 +225,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @ApiParam comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get NCD care beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -253,7 +253,7 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update NCD care beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -287,7 +287,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update NCD care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -317,7 +317,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace NCD Care doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update NCD care beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateNCDCareDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java b/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java index 49f40e34..9580a793 100644 --- a/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java +++ b/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java @@ -50,7 +50,7 @@ /** * @Objective Saving NCD Screening nurse data. */ -@CrossOrigin + @RestController @RequestMapping(value = "/NCD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDController { @@ -74,7 +74,7 @@ public void setNcdScreeningServiceImpl(NCDScreeningServiceImpl ncdScreeningServi * @ApiParam JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save beneficiary NCD screening details") @PostMapping(value = { "/save/nurseData" }) @@ -110,7 +110,7 @@ public String saveBeneficiaryNCDScreeningDetails(@RequestBody String requestObj, * @ApiParam JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save NCD screening doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, @@ -138,7 +138,7 @@ public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening visit details") @PostMapping(value = { "/get/nurseData" }) @@ -165,7 +165,7 @@ public String getNCDScreenigDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening visit count for beneficiary registration id") @GetMapping(value = { "/getNcdScreeningVisitCount/{beneficiaryRegID}" }) public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long beneficiaryRegID) { @@ -188,7 +188,7 @@ public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long b return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary visit details from nurse NCD screening") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -216,7 +216,7 @@ public String getBenVisitDetailsFrmNurseGOPD( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary general OPD history details from nurse to doctor ") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -243,7 +243,7 @@ public String getBenHistoryDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary vital details from nurse general OPD") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -270,7 +270,7 @@ public String getBenVitalDetailsFrmNurse( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary vital details from nurse general OPD") @PostMapping(value = { "/getBenIdrsDetailsFrmNurse" }) public String getBenIdrsDetailsFrmNurse( @@ -302,7 +302,7 @@ public String getBenIdrsDetailsFrmNurse( * @ApiParam comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -330,7 +330,7 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update beneficiary NCD screening details") @PostMapping(value = { "/update/nurseData" }) public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestObj) { @@ -358,7 +358,7 @@ public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestOb return response.toString(); } - @CrossOrigin + @Operation(summary = "Update history data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -383,7 +383,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update NCD screening vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -407,7 +407,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update history data in doctor screen") @PostMapping(value = { "/update/idrsScreen" }) public String updateIDRSScreen(@RequestBody String requestObj) { @@ -431,7 +431,7 @@ public String updateIDRSScreen(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateDoctorData(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/mmu/controller/nurse/vitals/AnthropometryVitalsController.java b/src/main/java/com/iemr/mmu/controller/nurse/vitals/AnthropometryVitalsController.java index 116c2262..cbd33847 100644 --- a/src/main/java/com/iemr/mmu/controller/nurse/vitals/AnthropometryVitalsController.java +++ b/src/main/java/com/iemr/mmu/controller/nurse/vitals/AnthropometryVitalsController.java @@ -18,7 +18,7 @@ import io.swagger.v3.oas.annotations.Operation; @RestController -@CrossOrigin + @RequestMapping(value = "/anthropometryVitals", headers = "Authorization", consumes = "application/json", produces = "application/json") public class AnthropometryVitalsController { @@ -28,7 +28,7 @@ public class AnthropometryVitalsController { private AnthropometryVitalsService anthropometryVitalsService; //Auto-patching height in anthropometry details - @CrossOrigin() + @Operation(summary = "Get beneficiary height details") @PostMapping(value = { "/getBenHeightDetailsFrmNurse" }) public String getBenHeightDetailsFrmNurse( diff --git a/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java b/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java index b6d721b8..e00d9319 100644 --- a/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java @@ -46,7 +46,7 @@ /** * @Objective Saving PNC nurse and doctor data */ -@CrossOrigin + @RestController @RequestMapping(value = "/PNC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class PostnatalCareController { @@ -64,7 +64,7 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save PNC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenPNCNurseData(@RequestBody String requestObj) { @@ -99,7 +99,7 @@ public String saveBenPNCNurseData(@RequestBody String requestObj) { * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save PNC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenPNCDoctorData(@RequestBody String requestObj, @@ -125,7 +125,7 @@ public String saveBenPNCDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get PNC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -158,7 +158,7 @@ public String getBenVisitDetailsFrmNursePNC( * @ApiParam comingRequest * @return PNC Care data in JSON format */ - @CrossOrigin() + @Operation(summary = "Get PNC beneficiary care details from nurse") @PostMapping(value = { "/getBenPNCDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -191,7 +191,7 @@ public String getBenPNCDetailsFrmNursePNC( * @ApiParam comingRequest * @return history data in JSON format */ - @CrossOrigin() + @Operation(summary = "Get PNC beneficiary history details from nurse to doctor ") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -223,7 +223,7 @@ public String getBenHistoryDetails( * @ApiParam comingRequest * @return vital data in JSON format */ - @CrossOrigin() + @Operation(summary = "Get PNC beneficiary vital details from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -255,7 +255,7 @@ public String getBenVitalDetailsFrmNurse( * @ApiParam comingRequest * @return examination data in JSON format */ - @CrossOrigin() + @Operation(summary = "Get PNC beneficiary examination details from nurse to doctor ") @PostMapping(value = { "/getBenExaminationDetailsPNC" }) @@ -287,7 +287,7 @@ public String getBenExaminationDetailsPNC( * @ApiParam comingRequest * @return doctor data in JSON format */ - @CrossOrigin() + @Operation(summary = "Get PNC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorPNC" }) @Transactional(rollbackFor = Exception.class) @@ -315,7 +315,7 @@ public String getBenCaseRecordFromDoctorPNC( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update PNC care data in doctor screen") @PostMapping(value = { "/update/PNCScreen" }) public String updatePNCCareNurse(@RequestBody String requestObj) { @@ -347,7 +347,7 @@ public String updatePNCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC beneficiary history in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -379,7 +379,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC beneficiary vitals in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -411,7 +411,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC beneficiary examination data in doctor screen") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -435,7 +435,7 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updatePNCDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java b/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java index 34aaad0a..ccd821c3 100644 --- a/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java @@ -48,7 +48,7 @@ /** * @Objective Saving general OPD quick consult data for Nurse and Doctor both. */ -@CrossOrigin + @RestController @RequestMapping(value = "/genOPD-QC-quickConsult", headers = "Authorization", consumes = "application/json", produces = "application/json") public class QuickConsultController { @@ -70,7 +70,7 @@ public void setQuickConsultationServiceImpl(QuickConsultationServiceImpl quickCo * Beneficiary Vital and Anthropometry Detail Object and pushed to * Database table */ - @CrossOrigin + @Operation(summary = "Save quick consult nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenQuickConsultDataNurse(@RequestBody String requestObj) { @@ -104,7 +104,7 @@ public String saveBenQuickConsultDataNurse(@RequestBody String requestObj) { * @objective Save beneficiary data for doctor quick consult - QC. */ - @CrossOrigin + @Operation(summary = "Save quick consultation detail for doctor") @PostMapping(value = { "/save/doctorData" }) public String saveQuickConsultationDetail( @@ -142,7 +142,7 @@ public String saveQuickConsultationDetail( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get quick consult beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -174,7 +174,7 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get quick consult beneficiary vital details") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -206,7 +206,7 @@ public String getBenVitalDetailsFrmNurse( * @ApiParam benRegID and benVisitID * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get quick consult beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorQuickConsult" }) @Transactional(rollbackFor = Exception.class) @@ -234,7 +234,7 @@ public String getBenCaseRecordFromDoctorQuickConsult( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update quick consult doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDQCDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java b/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java index 7a0c3de1..007c0e31 100644 --- a/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java +++ b/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java @@ -51,7 +51,7 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json") /** @@ -81,7 +81,7 @@ public void setNurseServiceImpl(NurseServiceImpl nurseServiceImpl) { this.nurseServiceImpl = nurseServiceImpl; } - @CrossOrigin() + @Operation(summary = "Get registrar worklist data") @PostMapping(value = { "/registrarWorkListData" }) public String getRegistrarWorkList(@ApiParam(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) @@ -100,7 +100,7 @@ public String getRegistrarWorkList(@ApiParam(value = "{\"spID\": \"Integer\"}") return response.toString(); } - @CrossOrigin() + @Operation(summary = "Search for the beneficiary by beneficiary id") @PostMapping(value = { "/quickSearch" }) public String quickSearchBeneficiary( @@ -119,7 +119,7 @@ public String quickSearchBeneficiary( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Search for the beneficiary based on provided data") @PostMapping(value = { "/advanceSearch" }) public String advanceSearch( @@ -140,7 +140,7 @@ public String advanceSearch( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary details of given beneficiary registration id") @PostMapping(value = { "/get/benDetailsByRegID" }) public String getBenDetailsByRegID( @@ -170,7 +170,7 @@ public String getBenDetailsByRegID( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary details") @PostMapping(value = { "/get/beneficiaryDetails" }) public String getBeneficiaryDetails( @@ -205,7 +205,7 @@ public String getBeneficiaryDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/get/beneficiaryImage" }) public String getBeneficiaryImage( @@ -231,7 +231,7 @@ public String getBeneficiaryImage( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Search beneficiary for beneficiary id or beneficiary phone no") @PostMapping(value = { "/quickSearchNew" }) public String quickSearchNew(@RequestBody String requestObj, @@ -254,7 +254,7 @@ public String quickSearchNew(@RequestBody String requestObj, } - @CrossOrigin() + @Operation(summary = "Search beneficiary advance search new") @PostMapping(value = { "/advanceSearchNew" }) public String advanceSearchNew(@RequestBody String requestObj, @@ -277,7 +277,7 @@ public String advanceSearchNew(@RequestBody String requestObj, } - @CrossOrigin() + @Operation(summary = "Get beneficiary details for left side panel of given beneficiary registration id") @PostMapping(value = { "/get/benDetailsByRegIDForLeftPanelNew" }) public String getBenDetailsForLeftSidePanelByRegID( @@ -308,7 +308,7 @@ public String getBenDetailsForLeftSidePanelByRegID( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/getBenImage" }) public String getBenImage(@RequestBody String requestObj, @@ -324,7 +324,7 @@ public String getBenImage(@RequestBody String requestObj, } - @CrossOrigin() + @Operation(summary = "Register a new beneficiary") @PostMapping(value = { "/registrarBeneficaryRegistration" }) public String createBeneficiary( @@ -387,7 +387,7 @@ public String createBeneficiary( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Register a new beneficiary API") @PostMapping(value = { "/registrarBeneficaryRegistrationNew" }) public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, @@ -405,7 +405,7 @@ public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, } - @CrossOrigin() + @Operation(summary = "Update registered beneficiary data") @PostMapping(value = { "/update/BeneficiaryDetails" }) public String updateBeneficiary( @@ -508,7 +508,7 @@ public String beneficiaryUpdate(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get master data for registrar") @PostMapping(value = { "/registrarMasterData" }) public String masterDataForRegistration( diff --git a/src/main/java/com/iemr/mmu/controller/reports/ReportGateway.java b/src/main/java/com/iemr/mmu/controller/reports/ReportGateway.java index ad8e32df..00b3bd88 100644 --- a/src/main/java/com/iemr/mmu/controller/reports/ReportGateway.java +++ b/src/main/java/com/iemr/mmu/controller/reports/ReportGateway.java @@ -40,7 +40,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/report", headers = "Authorization") public class ReportGateway { @@ -49,7 +49,7 @@ public class ReportGateway { @Autowired private ReportCheckPostImpl reportCheckPostImpl; - @CrossOrigin() + @Operation(summary = "Get report") @PostMapping(value = { "/getReport" }, consumes = "application/json", produces = "application/json") public String getReportByReportID(@RequestBody String requestOBJ) { @@ -71,7 +71,7 @@ public String getReportByReportID(@RequestBody String requestOBJ) { @Autowired private ReportCheckPostImplNew reportCheckPostImplNew; - @CrossOrigin() + @Operation(summary = "Get report by report id") @PostMapping(value = { "/getReportNew" }, consumes = "application/json", produces = "application/json") public String getReportByReportID1(@RequestBody String requestOBJ) { @@ -90,7 +90,7 @@ public String getReportByReportID1(@RequestBody String requestOBJ) { return response.toStringWithSerialization(); } - @CrossOrigin() + @Operation(summary = "Get report master") @GetMapping(value = { "/getReportMaster/{serviceID}" }, consumes = "application/json", produces = "application/json") public String getReportMaster(@PathVariable("serviceID") Integer serviceID) { diff --git a/src/main/java/com/iemr/mmu/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/mmu/controller/snomedct/SnomedController.java index 91f690a6..6d24d7fc 100644 --- a/src/main/java/com/iemr/mmu/controller/snomedct/SnomedController.java +++ b/src/main/java/com/iemr/mmu/controller/snomedct/SnomedController.java @@ -52,7 +52,7 @@ public void setSnomedService(SnomedService snomedService) { this.snomedService = snomedService; } - @CrossOrigin + @Operation(summary = "Retrives Snomed CT record") @PostMapping(value = "/getSnomedCTRecord", consumes = "application/json", produces = "application/json", headers = "Authorization") public String getSnomedCTRecord(@ApiParam(value = "{\"term\":\"String\"}") @RequestBody String request) { @@ -78,7 +78,7 @@ public String getSnomedCTRecord(@ApiParam(value = "{\"term\":\"String\"}") @Requ return output.toString(); } - @CrossOrigin + @Operation(summary = "Retrives Snomed CT record list") @PostMapping(value = "/getSnomedCTRecordList", consumes = "application/json", produces = "application/json", headers = "Authorization") public String getSnomedCTRecordList(@ApiParam(value = "{\"term\":\"String\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java b/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java index c2bad771..8fba8a9c 100644 --- a/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java +++ b/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java @@ -47,7 +47,7 @@ public class TeleConsultationController { @Autowired private TeleConsultationServiceImpl teleConsultationServiceImpl; - @CrossOrigin + @Operation(summary = "Update beneficiary arrival status based on request") @PostMapping(value = { "/update/benArrivalStatus" }) public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { @@ -68,7 +68,7 @@ public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update beneficiary status based on request") @PostMapping(value = { "/cancel/benTCRequest" }) public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String requestOBJ, @@ -91,7 +91,7 @@ public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String reque return response.toString(); } - @CrossOrigin + @Operation(summary = "Check if specialist can proceed with beneficiary") @PostMapping(value = { "/check/benTCRequestStatus" }) public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String requestOBJ) { @@ -112,7 +112,7 @@ public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String return response.toString(); } - @CrossOrigin + @Operation(summary = "Create TC request for beneficiary whose visit is created") @PostMapping(value = { "/create/benTCRequestWithVisitCode" }) public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @RequestHeader String Authorization) { @@ -135,7 +135,7 @@ public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @Req return response.toString(); } - @CrossOrigin + @Operation(summary = "Get TC request list for a specialist") @PostMapping(value = { "/getTCRequestList" }) public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { From 7da3653c0ef0f1715063af9a410df1b941546e0b Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Sat, 17 May 2025 09:40:31 +0530 Subject: [PATCH 3/5] fix(cors): dynamic cors filter added --- .../environment/common_example.properties | 1 + .../java/com/iemr/mmu/config/CorsConfig.java | 2 +- .../com/iemr/mmu/utils/DynamicCorsFilter.java | 37 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/iemr/mmu/utils/DynamicCorsFilter.java diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 146ca00c..2dd0142c 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -100,3 +100,4 @@ spring.redis.host=localhost jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret logging.path=logs/ logging.file.name=logs/mmu-api.log +cors.allowed-origins=http://localhost:* diff --git a/src/main/java/com/iemr/mmu/config/CorsConfig.java b/src/main/java/com/iemr/mmu/config/CorsConfig.java index 2f3af15d..412ce185 100644 --- a/src/main/java/com/iemr/mmu/config/CorsConfig.java +++ b/src/main/java/com/iemr/mmu/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/mmu/utils/DynamicCorsFilter.java b/src/main/java/com/iemr/mmu/utils/DynamicCorsFilter.java new file mode 100644 index 00000000..d34da5b1 --- /dev/null +++ b/src/main/java/com/iemr/mmu/utils/DynamicCorsFilter.java @@ -0,0 +1,37 @@ +package com.iemr.mmu.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 5c88662a39436df2b390f3b2079099432ba1e741 Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Fri, 23 May 2025 17:52:02 +0530 Subject: [PATCH 4/5] fix(cors): remove space and cors error --- .../java/com/iemr/mmu/config/CorsConfig.java | 3 +- .../mmu/controller/anc/ANCController.java | 19 ++----- .../common/main/CommonController.java | 51 +++---------------- .../controller/covid19/CovidController.java | 24 ++++----- .../dataSyncActivity/StartSyncActivity.java | 11 +--- .../generalOPD/GeneralOPDController.java | 28 ++++------ .../LabTechnicianController.java | 17 +++---- .../controller/ncdCare/NCDCareController.java | 23 ++++----- .../ncdscreening/NCDController.java | 30 ++++------- .../pnc/PostnatalCareController.java | 27 ++++------ .../quickconsult/QuickConsultController.java | 21 +++----- .../registrar/main/RegistrarController.java | 18 +------ .../TeleConsultationController.java | 15 ++---- .../java/com/iemr/mmu/utils/FilterConfig.java | 13 +++-- .../mmu/utils/JwtUserIdValidationFilter.java | 32 +++++++++++- 15 files changed, 127 insertions(+), 205 deletions(-) diff --git a/src/main/java/com/iemr/mmu/config/CorsConfig.java b/src/main/java/com/iemr/mmu/config/CorsConfig.java index 412ce185..47d081f9 100644 --- a/src/main/java/com/iemr/mmu/config/CorsConfig.java +++ b/src/main/java/com/iemr/mmu/config/CorsConfig.java @@ -13,8 +13,9 @@ public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { + System.out.print(allowedOrigins); 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/mmu/controller/anc/ANCController.java b/src/main/java/com/iemr/mmu/controller/anc/ANCController.java index 7f0ff864..260e9dd6 100644 --- a/src/main/java/com/iemr/mmu/controller/anc/ANCController.java +++ b/src/main/java/com/iemr/mmu/controller/anc/ANCController.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -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; @@ -42,12 +41,10 @@ import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving ANC data for Nurse and Doctor. */ - @RestController @RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class ANCController { @@ -55,8 +52,6 @@ public class ANCController { @Autowired private ANCService ancService; - - /** * @Objective Save ANC data for nurse. * @param JSON requestObj @@ -300,7 +295,6 @@ public String getBenCaseRecordFromDoctorANC( return response.toString(); } - @Operation(summary = "Check high risk pregnancy status for ANC beneficiary") @PostMapping(value = { "/getHRPStatus" }) @Transactional(rollbackFor = Exception.class) @@ -330,7 +324,6 @@ public String getHRPStatus( return response.toString(); } - @Operation(summary = "Update ANC care data in doctor screen") @PostMapping(value = { "/update/ANCScreen" }) public String updateANCCareNurse(@RequestBody String requestObj) { @@ -362,7 +355,6 @@ public String updateANCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update ANC history data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateANCHistoryNurse(@RequestBody String requestObj) { @@ -393,7 +385,6 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update ANC vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateANCVitalNurse(@RequestBody String requestObj) { @@ -425,7 +416,6 @@ public String updateANCVitalNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update ANC examination data in doctor screen") @PostMapping(value = { "/update/examinationScreen" }) public String updateANCExaminationNurse(@RequestBody String requestObj) { @@ -456,7 +446,7 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) { * @objective Replace ANC doctor data for the doctor next visit * */ - + @Operation(summary = "Update ANC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateANCDoctorData(@RequestBody String requestObj, @@ -480,8 +470,9 @@ public String updateANCDoctorData(@RequestBody String requestObj, return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java b/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java index a65881d7..fa69f797 100644 --- a/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java +++ b/src/main/java/com/iemr/mmu/controller/common/main/CommonController.java @@ -32,7 +32,6 @@ import org.springframework.http.HttpHeaders; 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; @@ -56,8 +55,6 @@ import jakarta.servlet.ServletContext; import jakarta.servlet.http.HttpServletRequest; - - @RestController @RequestMapping(value = "/common", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CommonController { @@ -87,9 +84,9 @@ public void setCommonDoctorServiceImpl(CommonDoctorServiceImpl commonDoctorServi public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceImpl) { this.commonNurseServiceImpl = commonNurseServiceImpl; } + private static final String BENEFICIARY_REG_ID = "beneficiaryRegID"; - - + @Operation(summary = "Provides doctor worklist") @GetMapping(value = { "/getDocWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -113,7 +110,6 @@ public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer pr return response.toString(); } - @Operation(summary = "Provides doctor worklist future scheduled for TM") @GetMapping(value = { "/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}" }) public String getDocWorkListNewFutureScheduledForTM( @@ -139,7 +135,6 @@ public String getDocWorkListNewFutureScheduledForTM( return response.toString(); } - @Operation(summary = "Get nurse worklist new") @GetMapping(value = { "/getNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -163,7 +158,7 @@ public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer * @ApiParam vanID * @return */ - + @Operation(summary = "Get nurse worklist TM referred") @GetMapping(value = { "/getNurseWorklistTMreferred/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorklistTMreferred(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -182,7 +177,6 @@ public String getNurseWorklistTMreferred(@PathVariable("providerServiceMapID") I return response.toString(); } - @Operation(summary = "Get doctor entered previous significant Ffindings") @PostMapping(value = { "/getDoctorPreviousSignificantFindings" }) public String getDoctorPreviousSignificantFindings( @@ -207,7 +201,6 @@ public String getDoctorPreviousSignificantFindings( return response.toString(); } - @Operation(summary = "Get lab technician worklist new") @GetMapping(value = { "/getLabWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -226,7 +219,6 @@ public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer pr return response.toString(); } - @Operation(summary = "Get radiologist worklist new") @GetMapping(value = { "/getRadiologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -245,7 +237,6 @@ public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") In return response.toString(); } - @Operation(summary = "Get oncologist worklist new") @GetMapping(value = { "/getOncologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -264,7 +255,6 @@ public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Int return response.toString(); } - @Operation(summary = "Get pharma worklist new") @GetMapping(value = { "/getPharma-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -283,7 +273,6 @@ public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer return response.toString(); } - @Operation(summary = "Get case-sheet print data for beneficiary.") @PostMapping(value = { "/get/Case-sheet/printData" }) public String getCasesheetPrintData(@RequestBody String comingReq, @@ -303,7 +292,6 @@ public String getCasesheetPrintData(@RequestBody String comingReq, return response.toString(); } - @Operation(summary = "Get beneficiary past history") @PostMapping(value = { "/getBenPastHistory" }) public String getBenPastHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -328,7 +316,6 @@ public String getBenPastHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @Operation(summary = "Get beneficiary tobacco history") @PostMapping(value = { "/getBenTobaccoHistory" }) public String getBenTobaccoHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -353,7 +340,6 @@ public String getBenTobaccoHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @Operation(summary = "Get beneficiary alcohol history") @PostMapping(value = { "/getBenAlcoholHistory" }) public String getBenAlcoholHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -378,7 +364,6 @@ public String getBenAlcoholHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @Operation(summary = "Get beneficiary allergy history") @PostMapping(value = { "/getBenAllergyHistory" }) public String getBenANCAllergyHistory( @@ -404,7 +389,6 @@ public String getBenANCAllergyHistory( return response.toString(); } - @Operation(summary = "Get beneficiary medication history") @PostMapping(value = { "/getBenMedicationHistory" }) public String getBenMedicationHistory( @@ -430,7 +414,6 @@ public String getBenMedicationHistory( return response.toString(); } - @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenFamilyHistory" }) public String getBenFamilyHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -455,7 +438,6 @@ public String getBenFamilyHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @ return response.toString(); } - @Operation(summary = "Get beneficiary menstrual history") @PostMapping(value = { "/getBenMenstrualHistory" }) public String getBenMenstrualHistory( @@ -481,7 +463,6 @@ public String getBenMenstrualHistory( return response.toString(); } - @Operation(summary = "Get beneficiary past obstetric history") @PostMapping(value = { "/getBenPastObstetricHistory" }) public String getBenPastObstetricHistory( @@ -507,7 +488,6 @@ public String getBenPastObstetricHistory( return response.toString(); } - @Operation(summary = "Get beneficiary comorbidity condition details") @PostMapping(value = { "/getBenComorbidityConditionHistory" }) public String getBenANCComorbidityConditionHistory( @@ -533,7 +513,6 @@ public String getBenANCComorbidityConditionHistory( return response.toString(); } - @Operation(summary = "Get beneficiary optional vaccine details") @PostMapping(value = { "/getBenOptionalVaccineHistory" }) public String getBenOptionalVaccineHistory( @@ -559,7 +538,6 @@ public String getBenOptionalVaccineHistory( return response.toString(); } - @Operation(summary = "Get beneficiary child vaccine(Immunization) details") @PostMapping(value = { "/getBenChildVaccineHistory" }) public String getBenImmunizationHistory( @@ -585,7 +563,6 @@ public String getBenImmunizationHistory( return response.toString(); } - @Operation(summary = "Get beneficiary perinatal history details") @PostMapping(value = { "/getBenPerinatalHistory" }) public String getBenPerinatalHistory( @@ -611,7 +588,6 @@ public String getBenPerinatalHistory( return response.toString(); } - @Operation(summary = "Get beneficiary child feeding history details") @PostMapping(value = { "/getBenFeedingHistory" }) public String getBenFeedingHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -636,7 +612,6 @@ public String getBenFeedingHistory(@ApiParam(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @Operation(summary = "Get beneficiary child development history details") @PostMapping(value = { "/getBenDevelopmentHistory" }) public String getBenDevelopmentHistory( @@ -665,7 +640,7 @@ public String getBenDevelopmentHistory( /*** * fetch ben previous visit details for history case-record(Platform). */ - + @Operation(summary = "Get casesheet history of beneficiary") @PostMapping(value = { "/getBeneficiaryCaseSheetHistory" }) public String getBeneficiaryCaseSheetHistory( @@ -684,7 +659,6 @@ public String getBeneficiaryCaseSheetHistory( return response.toString(); } - @Operation(summary = "TC specialist") @GetMapping(value = { "/getTCSpecialistWorklist/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -709,10 +683,8 @@ public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") I return response.toString(); } - @Operation(summary = "TC specialist future scheduled") - @GetMapping(value = { - "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) + @GetMapping(value = { "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorklistFutureScheduled( @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("userID") Integer userID, @PathVariable("serviceID") Integer serviceID) { @@ -736,7 +708,6 @@ public String getTCSpecialistWorklistFutureScheduled( return response.toString(); } - @Operation(summary = "Download file from file system") @PostMapping(value = { "/downloadFile" }) public ResponseEntity downloadFile(@RequestBody String requestOBJ, HttpServletRequest request) @@ -767,7 +738,6 @@ public ResponseEntity downloadFile(@RequestBody String requ } - @Operation(summary = "Get beneficiary physical history") @PostMapping(value = { "/getBenPhysicalHistory" }) public String getBenPhysicalHistory( @@ -793,7 +763,6 @@ public String getBenPhysicalHistory( return response.toString(); } - @Operation(summary = "Get beneficiary symptomatic questionnaire answer details") @PostMapping(value = { "/getBenSymptomaticQuestionnaireDetails" }) public String getBenSymptomaticQuestionnaireDetails( @@ -819,7 +788,6 @@ public String getBenSymptomaticQuestionnaireDetails( return response.toString(); } - @Operation(summary = "Get beneficiary previous diabetes history") @PostMapping(value = { "/getBenPreviousDiabetesHistoryDetails" }) public String getBenPreviousDiabetesHistoryDetails( @@ -850,7 +818,7 @@ public String getBenPreviousDiabetesHistoryDetails( * @ApiParam Authorization * @return */ - + @Operation(summary = "Get beneficiary TM case record") @PostMapping(value = { "/get/Case-sheet/TMReferredprintData" }) public String getTMReferredPrintData(@RequestBody String comingRequest, @@ -888,7 +856,6 @@ public String getTMReferredPrintData(@RequestBody String comingRequest, return response.toString(); } - @Operation(summary = "Get beneficiary previous referral history") @PostMapping(value = { "/getBenPreviousReferralHistoryDetails" }) public String getBenPreviousReferralHistoryDetails( @@ -915,7 +882,6 @@ public String getBenPreviousReferralHistoryDetails( return response.toString(); } - @Operation(summary = "Get beneficiary TM case record") @PostMapping(value = { "/get/Case-sheet/centralServerTMCaseSheet" }) public String getTMCaseSheetFromCentralServer(@RequestBody String comingRequest, @@ -953,7 +919,7 @@ public String getTMCaseSheetFromCentralServer(@RequestBody String comingRequest, * @ApiParam comingRequest * @return ProviderSpecificMasterData */ - + @Operation(summary = "Calculate beneficiary BMI status") @PostMapping(value = { "/calculateBMIStatus" }) public String calculateBMIStatus( @@ -971,7 +937,6 @@ public String calculateBMIStatus( return response.toString(); } - @Operation(summary = "Update beneficiary status flag") @PostMapping(value = { "/update/benDetailsAndSubmitToNurse" }) public String saveBeneficiaryVisitDetail( @@ -1006,7 +971,6 @@ public String saveBeneficiaryVisitDetail( return response.toString(); } - @Operation(summary = "Extend redis session for 30 minutes") @PostMapping(value = { "/extend/redisSession" }) public String extendRedisSession() { @@ -1019,7 +983,6 @@ public String extendRedisSession() { return response.toString(); } - @Operation(summary = "Soft delete prescribed medicine") @PostMapping(value = { "/doctor/delete/prescribedMedicine" }) public String deletePrescribedMedicine(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java b/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java index 88a80530..c4aababb 100644 --- a/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -46,7 +45,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /** * * @author DU20091017 @@ -64,7 +62,7 @@ public class CovidController { private Covid19Service covid19Service; @Autowired private Covid19ServiceImpl covid19ServiceImpl; - + @Operation(summary = "Save covid nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenCovid19NurseData(@RequestBody String requestObj, @@ -100,7 +98,7 @@ public String saveBenCovid19NurseData(@RequestBody String requestObj, * @ApiParam Authorization * @return */ - + @Operation(summary = "Save covid doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, @@ -126,7 +124,7 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, } return response.toString(); } - + @Operation(summary = "Get beneficiary visit details from nurse covid 19") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) @@ -159,7 +157,7 @@ public String getBenVisitDetailsFrmNurseCovid19( * @ApiParam comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get beneficiary covid 19 history details from nurse to doctor ") @PostMapping(value = { "/getBenCovid19HistoryDetails" }) @@ -192,7 +190,6 @@ public String getBenCovid19HistoryDetails( * @return visit details in JSON format */ - @Operation(summary = "Get beneficiary covid 19 vital details from nurse NCD care") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -220,7 +217,6 @@ public String getBenVitalDetailsFrmNurseNCDCare( } - @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCovid" }) @Transactional(rollbackFor = Exception.class) @@ -247,7 +243,7 @@ public String getBenCaseRecordFromDoctorCovid19( } return response.toString(); } - + @Operation(summary = "Update history data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -281,7 +277,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update covid vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -311,7 +306,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace covid 19 doctor data for the doctor next visit */ - + @Operation(summary = "Update covid 19 doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateCovid19DoctorData(@RequestBody String requestObj, @@ -335,8 +330,9 @@ public String updateCovid19DoctorData(@RequestBody String requestObj, return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java index 01369222..70a335c0 100644 --- a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java +++ b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java @@ -25,7 +25,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; @@ -59,7 +58,6 @@ public class StartSyncActivity { private static final String GROUP_ID = "groupID"; private static final String PROVIDER_SERVICE_MAP_ID = "providerServiceMapID"; - @Operation(summary = "Start data sync from van to Server") @PostMapping(value = { "/van-to-server" }) public String dataSyncToServer(@RequestBody String requestOBJ, @@ -72,7 +70,7 @@ public String dataSyncToServer(@RequestBody String requestOBJ, String s = uploadDataToServerImpl.getDataToSyncToServer(obj.getInt("vanID"), obj.getString("user"), serverAuthorization); // if (s != null) - response.setResponse(s); + response.setResponse(s); // else // response.setError(5000, "Error in data sync"); } else { @@ -85,7 +83,6 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toStringWithSerialization(); } - @Operation(summary = "Get data sync group details") @GetMapping(value = { "/getSyncGroupDetails" }) public String getSyncGroupDetails() { @@ -106,7 +103,7 @@ public String getSyncGroupDetails() { /** * @return Masters download in van from central server */ - + @Operation(summary = "Data sync master download") @PostMapping(value = { "/startMasterDownload" }) public String startMasterDownload(@RequestBody String requestOBJ, @@ -139,7 +136,6 @@ public String startMasterDownload(@RequestBody String requestOBJ, return response.toString(); } - @Operation(summary = "Data sync master download progress check") @GetMapping(value = { "/checkMastersDownloadProgress" }) public String checkMastersDownloadProgress() { @@ -153,7 +149,6 @@ public String checkMastersDownloadProgress() { return response.toString(); } - @Operation(summary = "Get van details for master download") @GetMapping(value = { "/getVanDetailsForMasterDownload" }) public String getVanDetailsForMasterDownload() { @@ -171,7 +166,6 @@ public String getVanDetailsForMasterDownload() { return response.toString(); } - @Operation(summary = "Call central API to generate beneficiary id and import to local") @PostMapping(value = { "/callCentralAPIToGenerateBenIDAndimportToLocal" }) public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String requestOBJ, @@ -196,7 +190,6 @@ public String callCentralAPIToGenerateBenIDAndimportToLocal(@RequestBody String return response.toString(); } - @Operation(summary = "Call central API to download transaction data to local") @PostMapping(value = { "/downloadTransactionToLocal" }) public String downloadTransactionToLocal(@RequestBody String requestOBJ, diff --git a/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java b/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java index 354b835b..ced37d1a 100644 --- a/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/mmu/controller/generalOPD/GeneralOPDController.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -42,7 +41,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /*** * @Objective Saving General OPD data for Nurse and Doctor. */ @@ -64,7 +62,7 @@ public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl * @ApiParam requestObj * @return success or failure response */ - + @Operation(summary = "Save general OPD nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenGenOPDNurseData(@RequestBody String requestObj) { @@ -97,7 +95,7 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj) { * @ApiParam requestObj * @return success or failure response */ - + @Operation(summary = "Save general OPD doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenGenOPDDoctorData(@RequestBody String requestObj, @@ -123,7 +121,6 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get beneficiary visit details from nurse general OPD") @PostMapping(value = { "/getBenVisitDetailsFrmNurseGOPD" }) @Transactional(rollbackFor = Exception.class) @@ -156,7 +153,7 @@ public String getBenVisitDetailsFrmNurseGOPD( * @ApiParam comingRequest * @return history details in JSON format */ - + @Operation(summary = "Get beneficiary general OPD history details from nurse to doctor ") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -188,7 +185,7 @@ public String getBenHistoryDetails( * @ApiParam comingRequest * @return vital details in JSON format */ - + @Operation(summary = "Get beneficiary vital details from nurse general OPD") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -220,7 +217,7 @@ public String getBenVitalDetailsFrmNurse( * @ApiParam comingRequest * @return examination details in JSON format */ - + @Operation(summary = "Get beneficiary general OPD examination details from nurse to doctor ") @PostMapping(value = { "/getBenExaminationDetails" }) @@ -252,7 +249,7 @@ public String getBenExaminationDetails( * @ApiParam comingRequest * @return doctor details in JSON format */ - + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorGeneralOPD" }) @Transactional(rollbackFor = Exception.class) @@ -280,7 +277,6 @@ public String getBenCaseRecordFromDoctorGeneralOPD( return response.toString(); } - @Operation(summary = "Update general OPD visit screen nurse data in doctor screen") @PostMapping(value = { "/update/visitDetailsScreen" }) public String updateVisitNurse(@RequestBody String requestObj) { @@ -312,7 +308,6 @@ public String updateVisitNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update history data in doctor Screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -344,7 +339,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update general OPD vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -376,7 +370,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { * details entered by Doctor */ - @Operation(summary = "Update general OPD examination data in doctor screen") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -406,7 +399,7 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace General OPD doctor data for the doctor next visit */ - + @Operation(summary = "Update general OPD doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDDoctorData(@RequestBody String requestObj, @@ -430,8 +423,9 @@ public String updateGeneralOPDDoctorData(@RequestBody String requestObj, return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java b/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java index 7ef2956d..2ce87b1b 100644 --- a/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.java +++ b/src/main/java/com/iemr/mmu/controller/labtechnician/LabTechnicianController.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; @@ -38,7 +37,6 @@ import io.swagger.v3.oas.annotations.Operation; - /*** * @Objective Saving lab test results given by LabTechnician */ @@ -55,14 +53,16 @@ public class LabTechnicianController { public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianServiceImpl) { this.labTechnicianServiceImpl = labTechnicianServiceImpl; } + private static final String BENEFICIARY_REG_ID = "beneficiaryRegID"; private static final String VISIT_CODE = "visitCode"; + /** * @Objective Save lab test results given by LabTechnician * @param JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save lab test result entered by lab technician") @PostMapping(value = { "/save/LabTestResult" }) public String saveLabTestResult(@RequestBody String requestObj) { @@ -87,7 +87,6 @@ public String saveLabTestResult(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Get beneficiary prescribed procedure") @PostMapping(value = { "/get/prescribedProceduresList" }) public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) { @@ -114,7 +113,6 @@ public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) return response.toString(); } - @Operation(summary = "Get lab test result for a visitcode.") @PostMapping(value = { "/get/labResultForVisitcode" }) public String getLabResultForVisitCode(@RequestBody String requestOBJ) { @@ -132,13 +130,14 @@ public String getLabResultForVisitCode(@RequestBody String requestOBJ) { } else response.setError(5000, "Invalid request"); } catch (Exception e) { - logger.error("Error while getting lab result for requested data {} " , requestOBJ); + logger.error("Error while getting lab result for requested data {} ", requestOBJ); response.setError(5000, "Error while getting lab report"); } return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java b/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java index 9ca2c004..de34075c 100644 --- a/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/mmu/controller/ncdCare/NCDCareController.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -45,7 +44,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving NCD Care data for Nurse and Doctor. */ @@ -66,7 +64,7 @@ public void setNcdCareServiceImpl(NCDCareServiceImpl ncdCareServiceImpl) { * @ApiParam JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save NCD care data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj) { @@ -100,7 +98,7 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj) { * @ApiParam JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save NCD care beneficiary case record and referral") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDCareDoctorData(@RequestBody String requestObj, @@ -127,7 +125,6 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get NCD care beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -160,7 +157,7 @@ public String getBenVisitDetailsFrmNurseNCDCare( * @ApiParam comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get NCD care beneficiary history") @PostMapping(value = { "/getBenNCDCareHistoryDetails" }) @@ -193,7 +190,6 @@ public String getBenNCDCareHistoryDetails( * @return visit details in JSON format */ - @Operation(summary = "Get NCD care beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseNCDCare" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -225,7 +221,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @ApiParam comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get NCD care beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -253,7 +249,6 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @Operation(summary = "Update NCD care beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -287,7 +282,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update NCD care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -317,7 +311,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace NCD Care doctor data for the doctor next visit */ - + @Operation(summary = "Update NCD care beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateNCDCareDoctorData(@RequestBody String requestObj, @@ -341,8 +335,9 @@ public String updateNCDCareDoctorData(@RequestBody String requestObj, return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java b/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java index 9580a793..bc6f0b11 100644 --- a/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java +++ b/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -46,7 +45,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving NCD Screening nurse data. */ @@ -55,7 +53,7 @@ @RequestMapping(value = "/NCD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - + private NCDScreeningServiceImpl ncdScreeningServiceImpl; @Autowired @@ -74,7 +72,7 @@ public void setNcdScreeningServiceImpl(NCDScreeningServiceImpl ncdScreeningServi * @ApiParam JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save beneficiary NCD screening details") @PostMapping(value = { "/save/nurseData" }) @@ -110,7 +108,7 @@ public String saveBeneficiaryNCDScreeningDetails(@RequestBody String requestObj, * @ApiParam JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save NCD screening doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, @@ -138,7 +136,6 @@ public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get NCD screening visit details") @PostMapping(value = { "/get/nurseData" }) @@ -165,7 +162,6 @@ public String getNCDScreenigDetails( return response.toString(); } - @Operation(summary = "Get NCD screening visit count for beneficiary registration id") @GetMapping(value = { "/getNcdScreeningVisitCount/{beneficiaryRegID}" }) public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long beneficiaryRegID) { @@ -188,7 +184,6 @@ public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long b return response.toString(); } - @Operation(summary = "Get beneficiary visit details from nurse NCD screening") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -216,7 +211,6 @@ public String getBenVisitDetailsFrmNurseGOPD( return response.toString(); } - @Operation(summary = "Get beneficiary general OPD history details from nurse to doctor ") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -243,7 +237,6 @@ public String getBenHistoryDetails( return response.toString(); } - @Operation(summary = "Get beneficiary vital details from nurse general OPD") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -270,7 +263,6 @@ public String getBenVitalDetailsFrmNurse( return response.toString(); } - @Operation(summary = "Get beneficiary vital details from nurse general OPD") @PostMapping(value = { "/getBenIdrsDetailsFrmNurse" }) public String getBenIdrsDetailsFrmNurse( @@ -302,7 +294,7 @@ public String getBenIdrsDetailsFrmNurse( * @ApiParam comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -330,13 +322,12 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @Operation(summary = "Update beneficiary NCD screening details") @PostMapping(value = { "/update/nurseData" }) public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestObj) { OutputResponse response = new OutputResponse(); - + try { JsonObject jsnOBJ = parseJsonRequest(requestObj); @@ -358,7 +349,6 @@ public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestOb return response.toString(); } - @Operation(summary = "Update history data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -383,7 +373,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update NCD screening vital data in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -407,7 +396,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update history data in doctor screen") @PostMapping(value = { "/update/idrsScreen" }) public String updateIDRSScreen(@RequestBody String requestObj) { @@ -431,7 +419,6 @@ public String updateIDRSScreen(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateDoctorData(@RequestBody String requestObj) { @@ -453,8 +440,9 @@ public String updateDoctorData(@RequestBody String requestObj) { return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java b/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java index e00d9319..561b90d0 100644 --- a/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/mmu/controller/pnc/PostnatalCareController.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -42,7 +41,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving PNC nurse and doctor data */ @@ -64,7 +62,6 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { * @return success or failure response */ - @Operation(summary = "Save PNC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenPNCNurseData(@RequestBody String requestObj) { @@ -99,7 +96,6 @@ public String saveBenPNCNurseData(@RequestBody String requestObj) { * @return success or failure response */ - @Operation(summary = "Save PNC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenPNCDoctorData(@RequestBody String requestObj, @@ -125,7 +121,6 @@ public String saveBenPNCDoctorData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get PNC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -158,7 +153,7 @@ public String getBenVisitDetailsFrmNursePNC( * @ApiParam comingRequest * @return PNC Care data in JSON format */ - + @Operation(summary = "Get PNC beneficiary care details from nurse") @PostMapping(value = { "/getBenPNCDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -191,7 +186,7 @@ public String getBenPNCDetailsFrmNursePNC( * @ApiParam comingRequest * @return history data in JSON format */ - + @Operation(summary = "Get PNC beneficiary history details from nurse to doctor ") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -223,7 +218,7 @@ public String getBenHistoryDetails( * @ApiParam comingRequest * @return vital data in JSON format */ - + @Operation(summary = "Get PNC beneficiary vital details from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -255,7 +250,7 @@ public String getBenVitalDetailsFrmNurse( * @ApiParam comingRequest * @return examination data in JSON format */ - + @Operation(summary = "Get PNC beneficiary examination details from nurse to doctor ") @PostMapping(value = { "/getBenExaminationDetailsPNC" }) @@ -287,7 +282,7 @@ public String getBenExaminationDetailsPNC( * @ApiParam comingRequest * @return doctor data in JSON format */ - + @Operation(summary = "Get PNC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorPNC" }) @Transactional(rollbackFor = Exception.class) @@ -315,7 +310,6 @@ public String getBenCaseRecordFromDoctorPNC( return response.toString(); } - @Operation(summary = "Update PNC care data in doctor screen") @PostMapping(value = { "/update/PNCScreen" }) public String updatePNCCareNurse(@RequestBody String requestObj) { @@ -347,7 +341,6 @@ public String updatePNCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update PNC beneficiary history in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -379,7 +372,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update PNC beneficiary vitals in doctor screen") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -411,7 +403,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update PNC beneficiary examination data in doctor screen") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -435,7 +426,6 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updatePNCDoctorData(@RequestBody String requestObj, @@ -459,8 +449,9 @@ public String updatePNCDoctorData(@RequestBody String requestObj, return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java b/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java index ccd821c3..f925218c 100644 --- a/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -44,7 +43,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving general OPD quick consult data for Nurse and Doctor both. */ @@ -53,7 +51,7 @@ @RequestMapping(value = "/genOPD-QC-quickConsult", headers = "Authorization", consumes = "application/json", produces = "application/json") public class QuickConsultController { private Logger logger = LoggerFactory.getLogger(QuickConsultController.class); - + private QuickConsultationServiceImpl quickConsultationServiceImpl; @Autowired @@ -70,7 +68,7 @@ public void setQuickConsultationServiceImpl(QuickConsultationServiceImpl quickCo * Beneficiary Vital and Anthropometry Detail Object and pushed to * Database table */ - + @Operation(summary = "Save quick consult nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenQuickConsultDataNurse(@RequestBody String requestObj) { @@ -104,7 +102,6 @@ public String saveBenQuickConsultDataNurse(@RequestBody String requestObj) { * @objective Save beneficiary data for doctor quick consult - QC. */ - @Operation(summary = "Save quick consultation detail for doctor") @PostMapping(value = { "/save/doctorData" }) public String saveQuickConsultationDetail( @@ -142,7 +139,6 @@ public String saveQuickConsultationDetail( return response.toString(); } - @Operation(summary = "Get quick consult beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -174,7 +170,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return visit details in JSON format */ - @Operation(summary = "Get quick consult beneficiary vital details") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -206,7 +201,7 @@ public String getBenVitalDetailsFrmNurse( * @ApiParam benRegID and benVisitID * @return visit details in JSON format */ - + @Operation(summary = "Get quick consult beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorQuickConsult" }) @Transactional(rollbackFor = Exception.class) @@ -234,14 +229,13 @@ public String getBenCaseRecordFromDoctorQuickConsult( return response.toString(); } - @Operation(summary = "Update quick consult doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDQCDoctorData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String authorization) { OutputResponse response = new OutputResponse(); - + try { WrapperQuickConsultation wrapperQuickConsultation = InputMapper.gson().fromJson(requestObj, WrapperQuickConsultation.class); @@ -263,8 +257,9 @@ public String updateGeneralOPDQCDoctorData(@RequestBody String requestObj, return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java b/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java index 007c0e31..fa8c5bce 100644 --- a/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java +++ b/src/main/java/com/iemr/mmu/controller/registrar/main/RegistrarController.java @@ -29,7 +29,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.RequestHeader; @@ -51,7 +50,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - @RestController @RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json") /** @@ -81,7 +79,6 @@ public void setNurseServiceImpl(NurseServiceImpl nurseServiceImpl) { this.nurseServiceImpl = nurseServiceImpl; } - @Operation(summary = "Get registrar worklist data") @PostMapping(value = { "/registrarWorkListData" }) public String getRegistrarWorkList(@ApiParam(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) @@ -100,7 +97,6 @@ public String getRegistrarWorkList(@ApiParam(value = "{\"spID\": \"Integer\"}") return response.toString(); } - @Operation(summary = "Search for the beneficiary by beneficiary id") @PostMapping(value = { "/quickSearch" }) public String quickSearchBeneficiary( @@ -119,7 +115,6 @@ public String quickSearchBeneficiary( return response.toString(); } - @Operation(summary = "Search for the beneficiary based on provided data") @PostMapping(value = { "/advanceSearch" }) public String advanceSearch( @@ -140,7 +135,6 @@ public String advanceSearch( return response.toString(); } - @Operation(summary = "Get beneficiary details of given beneficiary registration id") @PostMapping(value = { "/get/benDetailsByRegID" }) public String getBenDetailsByRegID( @@ -170,7 +164,6 @@ public String getBenDetailsByRegID( return response.toString(); } - @Operation(summary = "Get beneficiary details") @PostMapping(value = { "/get/beneficiaryDetails" }) public String getBeneficiaryDetails( @@ -205,7 +198,6 @@ public String getBeneficiaryDetails( return response.toString(); } - @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/get/beneficiaryImage" }) public String getBeneficiaryImage( @@ -226,12 +218,11 @@ public String getBeneficiaryImage( } logger.info("getBeneficiaryDetails response :" + response); } catch (Exception e) { - logger.error("Error caused by {} ",e.getMessage()); + logger.error("Error caused by {} ", e.getMessage()); } return response.toString(); } - @Operation(summary = "Search beneficiary for beneficiary id or beneficiary phone no") @PostMapping(value = { "/quickSearchNew" }) public String quickSearchNew(@RequestBody String requestObj, @@ -254,7 +245,6 @@ public String quickSearchNew(@RequestBody String requestObj, } - @Operation(summary = "Search beneficiary advance search new") @PostMapping(value = { "/advanceSearchNew" }) public String advanceSearchNew(@RequestBody String requestObj, @@ -277,7 +267,6 @@ public String advanceSearchNew(@RequestBody String requestObj, } - @Operation(summary = "Get beneficiary details for left side panel of given beneficiary registration id") @PostMapping(value = { "/get/benDetailsByRegIDForLeftPanelNew" }) public String getBenDetailsForLeftSidePanelByRegID( @@ -308,7 +297,6 @@ public String getBenDetailsForLeftSidePanelByRegID( return response.toString(); } - @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/getBenImage" }) public String getBenImage(@RequestBody String requestObj, @@ -324,7 +312,6 @@ public String getBenImage(@RequestBody String requestObj, } - @Operation(summary = "Register a new beneficiary") @PostMapping(value = { "/registrarBeneficaryRegistration" }) public String createBeneficiary( @@ -387,7 +374,6 @@ public String createBeneficiary( return response.toString(); } - @Operation(summary = "Register a new beneficiary API") @PostMapping(value = { "/registrarBeneficaryRegistrationNew" }) public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, @@ -405,7 +391,6 @@ public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, } - @Operation(summary = "Update registered beneficiary data") @PostMapping(value = { "/update/BeneficiaryDetails" }) public String updateBeneficiary( @@ -508,7 +493,6 @@ public String beneficiaryUpdate(@RequestBody String requestOBJ, return response.toString(); } - @Operation(summary = "Get master data for registrar") @PostMapping(value = { "/registrarMasterData" }) public String masterDataForRegistration( diff --git a/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java b/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java index 8fba8a9c..ad03974a 100644 --- a/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.java +++ b/src/main/java/com/iemr/mmu/controller/teleconsultation/TeleConsultationController.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.RequestHeader; @@ -43,11 +42,10 @@ @RequestMapping(value = "/tc", headers = "Authorization", consumes = "application/json", produces = "application/json") public class TeleConsultationController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - + @Autowired private TeleConsultationServiceImpl teleConsultationServiceImpl; - @Operation(summary = "Update beneficiary arrival status based on request") @PostMapping(value = { "/update/benArrivalStatus" }) public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { @@ -68,7 +66,6 @@ public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { return response.toString(); } - @Operation(summary = "Update beneficiary status based on request") @PostMapping(value = { "/cancel/benTCRequest" }) public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String requestOBJ, @@ -91,7 +88,6 @@ public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String reque return response.toString(); } - @Operation(summary = "Check if specialist can proceed with beneficiary") @PostMapping(value = { "/check/benTCRequestStatus" }) public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String requestOBJ) { @@ -112,7 +108,6 @@ public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String return response.toString(); } - @Operation(summary = "Create TC request for beneficiary whose visit is created") @PostMapping(value = { "/create/benTCRequestWithVisitCode" }) public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @RequestHeader String Authorization) { @@ -135,7 +130,6 @@ public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @Req return response.toString(); } - @Operation(summary = "Get TC request list for a specialist") @PostMapping(value = { "/getTCRequestList" }) public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { @@ -161,8 +155,9 @@ public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { } return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/utils/FilterConfig.java b/src/main/java/com/iemr/mmu/utils/FilterConfig.java index a4481828..6b467b01 100644 --- a/src/main/java/com/iemr/mmu/utils/FilterConfig.java +++ b/src/main/java/com/iemr/mmu/utils/FilterConfig.java @@ -1,5 +1,6 @@ package com.iemr.mmu.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,19 @@ @Configuration public class FilterConfig { + @Value("${cors.allowed-origins}") + private String allowedOrigins; + @Bean public FilterRegistrationBean jwtUserIdValidationFilter( JwtAuthenticationUtil jwtAuthenticationUtil) { FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); - registrationBean.setFilter(new JwtUserIdValidationFilter(jwtAuthenticationUtil)); + + // 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/mmu/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java index b12307ff..5346be77 100644 --- a/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/mmu/utils/JwtUserIdValidationFilter.java @@ -1,9 +1,11 @@ package com.iemr.mmu.utils; import java.io.IOException; +import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import com.iemr.mmu.utils.http.AuthorizationHeaderRequestWrapper; @@ -22,9 +24,12 @@ 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) { + public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil, + @Value("${cors.allowed-origins}") String allowedOrigins) { this.jwtAuthenticationUtil = jwtAuthenticationUtil; + this.allowedOrigins = allowedOrigins; } @Override @@ -37,6 +42,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) { @@ -108,6 +127,17 @@ 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; From 9cba184c8cb9001d2d40c10f5bd298534b62c091 Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Fri, 23 May 2025 18:04:34 +0530 Subject: [PATCH 5/5] fix(cors): remove space and cors error --- .../CancerScreeningController.java | 25 +++---------------- .../controller/covid19/CovidController.java | 4 --- .../dataSyncActivity/StartSyncActivity.java | 1 - .../ncdscreening/NCDController.java | 2 -- .../quickconsult/QuickConsultController.java | 1 - 5 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java b/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java index 7d6755c9..259cef53 100644 --- a/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/mmu/controller/cancerscreening/CancerScreeningController.java @@ -26,7 +26,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; -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; @@ -46,7 +45,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving Cancer screening data for Nurse and Doctor both. */ @@ -68,7 +66,6 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { * @return success or failure response */ - @Operation(summary = "Save cancer screening nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, @@ -109,7 +106,6 @@ else if (nurseDataSaveSuccessFlag == 2) * @return success or failure response */ - @Operation(summary = "Save cancer screening doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, @@ -136,7 +132,6 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get beneficiary visit details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -167,7 +162,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return history details in JSON format */ - @Operation(summary = "Get beneficiary cancer history details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" }) public String getBenDataFrmNurseScrnToDocScrnHistory( @@ -197,7 +191,6 @@ public String getBenDataFrmNurseScrnToDocScrnHistory( * @return vital details in JSON format */ - @Operation(summary = "Get beneficiary vital details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" }) public String getBenDataFrmNurseScrnToDocScrnVital( @@ -228,7 +221,6 @@ public String getBenDataFrmNurseScrnToDocScrnVital( * @return examination details in JSON format */ - @Operation(summary = "Get beneficiary examination details from nurse screen") @PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" }) public String getBenDataFrmNurseScrnToDocScrnExamination( @@ -259,7 +251,6 @@ public String getBenDataFrmNurseScrnToDocScrnExamination( * @return previous family history details in JSON format */ - @Operation(summary = "Get beneficiary cancer family history") @PostMapping(value = { "/getBenCancerFamilyHistory" }) public String getBenCancerFamilyHistory( @@ -292,7 +283,6 @@ public String getBenCancerFamilyHistory( * @return previous personal history details in JSON format */ - @Operation(summary = "Get beneficiary cancer personal history") @PostMapping(value = { "/getBenCancerPersonalHistory" }) public String getBenCancerPersonalHistory( @@ -325,7 +315,6 @@ public String getBenCancerPersonalHistory( * @return previous personal history details in JSON format */ - @Operation(summary = "Get beneficiary cancer personal diet history") @PostMapping(value = { "/getBenCancerPersonalDietHistory" }) public String getBenCancerPersonalDietHistory( @@ -358,7 +347,6 @@ public String getBenCancerPersonalDietHistory( * @return previous obstetric history details in JSON format */ - @Operation(summary = "Get beneficiary cancer obstetric history") @PostMapping(value = { "/getBenCancerObstetricHistory" }) public String getBenCancerObstetricHistory( @@ -390,7 +378,6 @@ public String getBenCancerObstetricHistory( * @return doctor details in JSON format */ - @Operation(summary = "Get beneficiary doctor entered details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCS" }) @Transactional(rollbackFor = Exception.class) @@ -417,7 +404,6 @@ public String getBenCaseRecordFromDoctorCS( return response.toString(); } - @Operation(summary = "Update cancer screening history nurse data in doctor screen") @PostMapping(value = { "/update/historyScreen" }) public String updateCSHistoryNurse( @@ -463,7 +449,6 @@ public String updateCSHistoryNurse( * details entered by Doctor */ - @Operation(summary = "Update beneficiary vital detail") @PostMapping(value = { "/update/vitalScreen" }) public String upodateBenVitalDetail( @@ -501,7 +486,6 @@ public String upodateBenVitalDetail( * the details entered by Doctor */ - @Operation(summary = "Update beneficiary examination detail") @PostMapping(value = { "/update/examinationScreen" }) public String upodateBenExaminationDetail(@RequestBody String requestObj) { @@ -532,7 +516,6 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) { * */ - @Operation(summary = "Update cancer diagnosis details by oncologist") @PostMapping(value = { "/update/examinationScreen/diagnosis" }) public String updateCancerDiagnosisDetailsByOncologist( @@ -565,7 +548,6 @@ public String updateCancerDiagnosisDetailsByOncologist( * */ - @Operation(summary = "Update cancer screening doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { @@ -587,8 +569,9 @@ public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { return response.toString(); } + private JsonObject parseJsonRequest(String requestObj) { - JsonElement jsonElement = JsonParser.parseString(requestObj); - return jsonElement.getAsJsonObject(); - } + JsonElement jsonElement = JsonParser.parseString(requestObj); + return jsonElement.getAsJsonObject(); + } } diff --git a/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java b/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java index c4aababb..7139ecc5 100644 --- a/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/mmu/controller/covid19/CovidController.java @@ -52,7 +52,6 @@ * @Date : 25/06/2020 * */ - @RestController @RequestMapping(value = "pandemic/covid", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CovidController { @@ -98,7 +97,6 @@ public String saveBenCovid19NurseData(@RequestBody String requestObj, * @ApiParam Authorization * @return */ - @Operation(summary = "Save covid doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, @@ -124,7 +122,6 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, } return response.toString(); } - @Operation(summary = "Get beneficiary visit details from nurse covid 19") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) @@ -189,7 +186,6 @@ public String getBenCovid19HistoryDetails( * @ApiParam comingRequest * @return visit details in JSON format */ - @Operation(summary = "Get beneficiary covid 19 vital details from nurse NCD care") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) public String getBenVitalDetailsFrmNurseNCDCare( diff --git a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java index 70a335c0..dc33431c 100644 --- a/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java +++ b/src/main/java/com/iemr/mmu/controller/dataSyncActivity/StartSyncActivity.java @@ -43,7 +43,6 @@ /*** * @purpose Class used for data sync from van-to-server & server-to-van */ - @RestController @RequestMapping(value = "/dataSyncActivity", headers = "Authorization", consumes = "application/json", produces = "application/json") public class StartSyncActivity { diff --git a/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java b/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java index bc6f0b11..485c30e0 100644 --- a/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java +++ b/src/main/java/com/iemr/mmu/controller/ncdscreening/NCDController.java @@ -48,7 +48,6 @@ /** * @Objective Saving NCD Screening nurse data. */ - @RestController @RequestMapping(value = "/NCD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDController { @@ -72,7 +71,6 @@ public void setNcdScreeningServiceImpl(NCDScreeningServiceImpl ncdScreeningServi * @ApiParam JSON requestObj * @return success or failure response */ - @Operation(summary = "Save beneficiary NCD screening details") @PostMapping(value = { "/save/nurseData" }) diff --git a/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java b/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java index f925218c..086200c8 100644 --- a/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/mmu/controller/quickconsult/QuickConsultController.java @@ -46,7 +46,6 @@ /** * @Objective Saving general OPD quick consult data for Nurse and Doctor both. */ - @RestController @RequestMapping(value = "/genOPD-QC-quickConsult", headers = "Authorization", consumes = "application/json", produces = "application/json") public class QuickConsultController {