diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 1f9ad128..21b482a0 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -76,3 +76,5 @@ logging.file.name=@env.TM_API_LOGGING_FILE_NAME@ springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ + +cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@ diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index ebf3c364..489d2639 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -73,3 +73,6 @@ jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret logging.path=logs/ logging.file.name=logs/tm-api.log + +cors.allowed-origins=http://localhost:* + diff --git a/src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java b/src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java index f2c71314..aef00a49 100644 --- a/src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java +++ b/src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java @@ -26,7 +26,7 @@ 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; @@ -43,16 +43,11 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - - - /** * @Objective Saving ANC data for Nurse and Doctor. */ - -@CrossOrigin @RestController -@RequestMapping(value = "/ANC", headers = "Authorization",consumes = "application/json", produces = "application/json") +@RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class AntenatalCareController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @@ -69,8 +64,6 @@ public void setAncServiceImpl(ANCServiceImpl ancServiceImpl) { * @return success or failure response * @throws Exception */ - - @CrossOrigin @Operation(summary = "Save ANC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenANCNurseData(@RequestBody String requestObj, @@ -103,7 +96,6 @@ public String saveBenANCNurseData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin @Operation(summary = "Save ANC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenANCDoctorData(@RequestBody String requestObj, @@ -132,12 +124,11 @@ public String saveBenANCDoctorData(@RequestBody String requestObj, } catch (Exception e) { logger.error("Error while saving doctor data:" + e.getMessage()); response.setError(5000, e.getMessage()); - + } return response.toString(); } - @CrossOrigin() @Operation(summary = "Get ANC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -164,7 +155,6 @@ public String getBenVisitDetailsFrmNurseANC( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get ANC beneficiary details from nurse") @PostMapping(value = { "/getBenANCDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -192,7 +182,6 @@ public String getBenANCDetailsFrmNurseANC( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get ANC beneficiary history from nurse") @PostMapping(value = { "/getBenANCHistoryDetails" }) public String getBenANCHistoryDetails( @@ -218,7 +207,6 @@ public String getBenANCHistoryDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get ANC beneficiary vitals from nurse") @PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" }) public String getBenANCVitalDetailsFrmNurseANC( @@ -245,7 +233,6 @@ public String getBenANCVitalDetailsFrmNurseANC( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get ANC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsANC" }) public String getBenExaminationDetailsANC( @@ -271,7 +258,6 @@ public String getBenExaminationDetailsANC( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get ANC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorANC" }) @Transactional(rollbackFor = Exception.class) @@ -299,7 +285,6 @@ public String getBenCaseRecordFromDoctorANC( return response.toString(); } - @CrossOrigin() @Operation(summary = "Check high risk pregnancy status for ANC beneficiary") @PostMapping(value = { "/getHRPStatus" }) @Transactional(rollbackFor = Exception.class) @@ -329,7 +314,6 @@ public String getHRPStatus( return response.toString(); } - @CrossOrigin @Operation(summary = "Update ANC beneficiary data") @PostMapping(value = { "/update/ANCScreen" }) public String updateANCCareNurse(@RequestBody String requestObj) { @@ -358,7 +342,6 @@ public String updateANCCareNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update ANC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateANCHistoryNurse(@RequestBody String requestObj) { @@ -387,7 +370,6 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update ANC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateANCVitalNurse(@RequestBody String requestObj) { @@ -416,7 +398,6 @@ public String updateANCVitalNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update ANC examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateANCExaminationNurse(@RequestBody String requestObj) { @@ -445,7 +426,6 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update ANC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateANCDoctorData(@RequestBody String requestObj, @@ -470,7 +450,7 @@ public String updateANCDoctorData(@RequestBody String requestObj, } catch (Exception e) { logger.error("Unable to modify data. " + e.getMessage()); response.setError(5000, e.getMessage()); - + } return response.toString(); diff --git a/src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java b/src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java index 37bcac9c..09e217f4 100644 --- a/src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java @@ -26,7 +26,7 @@ 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; @@ -49,7 +49,6 @@ /** * @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 { @@ -69,8 +68,6 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { * @return success or failure response * @throws Exception */ - - @CrossOrigin @Operation(summary = "Save cancer screening data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, @@ -107,8 +104,6 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - - @CrossOrigin @Operation(summary = "Update cancer screening data by the doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, @@ -140,7 +135,6 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -170,8 +164,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @param benRegID and benVisitID * @return history details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary cancer history") @PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" }) public String getBenDataFrmNurseScrnToDocScrnHistory( @@ -201,8 +193,6 @@ public String getBenDataFrmNurseScrnToDocScrnHistory( * @param benRegID and benVisitID * @return vital details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary vitals") @PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" }) public String getBenDataFrmNurseScrnToDocScrnVital( @@ -232,8 +222,6 @@ public String getBenDataFrmNurseScrnToDocScrnVital( * @param benRegID and benVisitID * @return examination details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary examination details") @PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" }) public String getBenDataFrmNurseScrnToDocScrnExamination( @@ -263,8 +251,6 @@ public String getBenDataFrmNurseScrnToDocScrnExamination( * @param benRegID * @return previous family history details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenCancerFamilyHistory" }) public String getBenCancerFamilyHistory( @@ -296,8 +282,6 @@ public String getBenCancerFamilyHistory( * @param benRegID * @return previous personal history details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary personal history") @PostMapping(value = { "/getBenCancerPersonalHistory" }) public String getBenCancerPersonalHistory( @@ -329,8 +313,6 @@ public String getBenCancerPersonalHistory( * @param benRegID * @return previous personal history details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary personal diet history") @PostMapping(value = { "/getBenCancerPersonalDietHistory" }) public String getBenCancerPersonalDietHistory( @@ -362,8 +344,6 @@ public String getBenCancerPersonalDietHistory( * @param benRegID * @return previous obstetric history details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary obstetric history") @PostMapping(value = { "/getBenCancerObstetricHistory" }) public String getBenCancerObstetricHistory( @@ -394,8 +374,6 @@ public String getBenCancerObstetricHistory( * @param benRegID * @return diagnosis details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get beneficiary case record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCS" }) @Transactional(rollbackFor = Exception.class) @@ -422,7 +400,6 @@ public String getBenCaseRecordFromDoctorCS( return response.toString(); } - @CrossOrigin @Operation(summary = "Update cancer screening history") @PostMapping(value = { "/update/historyScreen" }) public String updateCSHistoryNurse( @@ -474,8 +451,6 @@ public String updateCSHistoryNurse( * @objective Replace Cancer Screening Vital Details entered by Nurse with the * details entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String upodateBenVitalDetail( @@ -514,8 +489,6 @@ public String upodateBenVitalDetail( * @objective Replace Cancer Screening examination Details entered by Nurse with * the details entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update beneficiary examination details") @PostMapping(value = { "/update/examinationScreen" }) public String upodateBenExaminationDetail(@RequestBody String requestObj) { @@ -551,8 +524,6 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) { * @objective update Cancer Diagnosis Details By Oncologist * */ - - @CrossOrigin @Operation(summary = "Update cancer diagnosis details by oncologist") @PostMapping(value = { "/update/examinationScreen/diagnosis" }) public String updateCancerDiagnosisDetailsByOncologist( @@ -587,8 +558,6 @@ public String updateCancerDiagnosisDetailsByOncologist( * @objective Replace doctor data for the doctor next visit * */ - - @CrossOrigin @Operation(summary = "Update cancer screening data") @PostMapping(value = { "/update/doctorData" }) public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/tm/controller/common/main/WorklistController.java b/src/main/java/com/iemr/tm/controller/common/main/WorklistController.java index 64ad11c9..36217a88 100644 --- a/src/main/java/com/iemr/tm/controller/common/main/WorklistController.java +++ b/src/main/java/com/iemr/tm/controller/common/main/WorklistController.java @@ -27,7 +27,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -47,9 +47,6 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - - -@CrossOrigin @RestController @RequestMapping(value = "/common", headers = "Authorization", consumes = "application/json", produces = "application/json") public class WorklistController { @@ -76,7 +73,6 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI } // doc worklist new - @CrossOrigin() @Operation(summary = "Get doctor worklist") @GetMapping(value = { "/getDocWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -99,11 +95,10 @@ public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer pr } return response.toString(); } - + // doc worklist new (TM future scheduled beneficiary) - @CrossOrigin() @Operation(summary = "Get doctor future worklist scheduled for telemedicine") - @GetMapping(value = {"/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}/{vanID}" }) + @GetMapping(value = { "/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNewFutureScheduledForTM( @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("serviceID") Integer serviceID, @PathVariable("vanID") Integer vanID) { @@ -128,7 +123,6 @@ public String getDocWorkListNewFutureScheduledForTM( } // nurse worklist new - @CrossOrigin() @Operation(summary = "Get nurse worklist") @GetMapping(value = { "/getNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -148,7 +142,6 @@ public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer } // nurse worklist TC schedule (current-date) new - @CrossOrigin() @Operation(summary = "Get worklist for teleconsultation for the current date") @GetMapping(value = { "/getNurseWorkListTcCurrentDate/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -169,7 +162,6 @@ public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMap } // nurse worklist TC schedule (future-date) new - @CrossOrigin() @Operation(summary = "Get worklist for teleconsultation for the future date") @GetMapping(value = { "/getNurseWorkListTcFutureDate/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -189,7 +181,6 @@ public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapI return response.toString(); } - @CrossOrigin() @Operation(summary = "Get previous significant findings") @PostMapping(value = { "/getDoctorPreviousSignificantFindings" }) public String getDoctorPreviousSignificantFindings( @@ -216,7 +207,6 @@ public String getDoctorPreviousSignificantFindings( } // Get Lab technician worklist new - @CrossOrigin() @Operation(summary = "Get lab technician worklist") @GetMapping(value = { "/getLabWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -237,7 +227,6 @@ public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer pr } // Get radiologist worklist new - @CrossOrigin() @Operation(summary = "Get radiologist worklist") @GetMapping(value = { "/getRadiologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -258,7 +247,6 @@ public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") In } // Get oncologist worklist new - @CrossOrigin() @Operation(summary = "Get oncologist worklist") @GetMapping(value = { "/getOncologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -278,7 +266,6 @@ public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Int } // Get pharma worklist new - @CrossOrigin() @Operation(summary = "Get pharmacist worklist") @GetMapping(value = { "/getPharma-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -298,7 +285,6 @@ public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer return response.toString(); } - @CrossOrigin() @Operation(summary = "Print case sheet of beneficiary") @PostMapping(value = { "/get/Case-sheet/printData" }) public String getCasesheetPrintData(@RequestBody String comingReq, @@ -319,7 +305,6 @@ public String getCasesheetPrintData(@RequestBody String comingReq, } // Start of Fetch Previous Medical History... - @CrossOrigin() @Operation(summary = "Get beneficiary history") @PostMapping(value = { "/getBenPastHistory" }) public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -344,7 +329,6 @@ public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Reque return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary tobacco consumption history") @PostMapping(value = { "/getBenTobaccoHistory" }) public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -369,7 +353,6 @@ public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary alcohol consumption history") @PostMapping(value = { "/getBenAlcoholHistory" }) public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -394,7 +377,6 @@ public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary allergy history") @PostMapping(value = { "/getBenAllergyHistory" }) public String getBenANCAllergyHistory( @@ -420,7 +402,6 @@ public String getBenANCAllergyHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary medication history") @PostMapping(value = { "/getBenMedicationHistory" }) public String getBenMedicationHistory( @@ -446,7 +427,6 @@ public String getBenMedicationHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenFamilyHistory" }) public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -471,7 +451,6 @@ public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Req return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary menstrual history") @PostMapping(value = { "/getBenMenstrualHistory" }) public String getBenMenstrualHistory( @@ -497,7 +476,6 @@ public String getBenMenstrualHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary obstetric history") @PostMapping(value = { "/getBenPastObstetricHistory" }) public String getBenPastObstetricHistory( @@ -523,7 +501,6 @@ public String getBenPastObstetricHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary comorbidity condition details") @PostMapping(value = { "/getBenComorbidityConditionHistory" }) public String getBenANCComorbidityConditionHistory( @@ -549,7 +526,6 @@ public String getBenANCComorbidityConditionHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary optional vaccine details") @PostMapping(value = { "/getBenOptionalVaccineHistory" }) public String getBenOptionalVaccineHistory( @@ -575,7 +551,6 @@ public String getBenOptionalVaccineHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get child beneficiary vaccine details") @PostMapping(value = { "/getBenChildVaccineHistory" }) public String getBenImmunizationHistory( @@ -601,7 +576,6 @@ public String getBenImmunizationHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary perinatal history") @PostMapping(value = { "/getBenPerinatalHistory" }) public String getBenPerinatalHistory( @@ -627,7 +601,6 @@ public String getBenPerinatalHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get child beneficiary feeding history") @PostMapping(value = { "/getBenFeedingHistory" }) public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -652,7 +625,6 @@ public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() @Operation(summary = "Get child beneficiary development history") @PostMapping(value = { "/getBenDevelopmentHistory" }) public String getBenDevelopmentHistory( @@ -684,7 +656,6 @@ public String getBenDevelopmentHistory( * fetch ben previous visit details for history case-record(Platform). * 08-08-2018 */ - @CrossOrigin() @Operation(summary = "Get beneficiary casesheet history") @PostMapping(value = { "/getBeneficiaryCaseSheetHistory" }) public String getBeneficiaryCaseSheetHistory( @@ -704,7 +675,6 @@ public String getBeneficiaryCaseSheetHistory( } // TC specialist worklist new - @CrossOrigin() @Operation(summary = "Get teleconsultation specialist worklist") @GetMapping(value = { "/getTCSpecialistWorklist/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -730,7 +700,6 @@ public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") I } // TC specialist worklist new, patient App, 14-08-2020 - @CrossOrigin() @Operation(summary = "Get teleconsultation specialist worklist for patient app") @GetMapping(value = { "/getTCSpecialistWorklistPatientApp/{providerServiceMapID}/{serviceID}/{userID}/{vanID}" }) @@ -758,7 +727,6 @@ public String getTCSpecialistWorkListNewPatientApp( } // TC specialist worklist new future scheduled - @CrossOrigin() @Operation(summary = "Get teleconsultation specialist future scheduled") @GetMapping(value = { "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) @@ -786,7 +754,6 @@ public String getTCSpecialistWorklistFutureScheduled( } // openkm file download - @CrossOrigin @Operation(summary = "Add file as string to openKM") @PostMapping(value = "/getKMFile", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getKMFile(@Param(value = "{}") @RequestBody String request, @@ -805,7 +772,6 @@ public String getKMFile(@Param(value = "{}") @RequestBody String request, return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary physical history") @PostMapping(value = { "/getBenPhysicalHistory" }) public String getBenPhysicalHistory( @@ -831,7 +797,6 @@ public String getBenPhysicalHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary symptomatic questionnaire answer details") @PostMapping(value = { "/getBenSymptomaticQuestionnaireDetails" }) public String getBenSymptomaticQuestionnaireDetails( @@ -857,7 +822,6 @@ public String getBenSymptomaticQuestionnaireDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary previous diabetes history") @PostMapping(value = { "/getBenPreviousDiabetesHistoryDetails" }) public String getBenPreviousDiabetesHistoryDetails( @@ -884,7 +848,6 @@ public String getBenPreviousDiabetesHistoryDetails( } // nurse worklist coming from MMU application - @CrossOrigin() @Operation(summary = "Get mmu nurse worklist") @GetMapping(value = { "/getMmuNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -903,7 +866,6 @@ public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integ return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary previous referral history") @PostMapping(value = { "/getBenPreviousReferralHistoryDetails" }) public String getBenPreviousReferralHistoryDetails( @@ -933,7 +895,6 @@ public String getBenPreviousReferralHistoryDetails( * @param comingRequest * @return ProviderSpecificMasterData */ - @CrossOrigin() @Operation(summary = "Get provider specific data") @PostMapping(value = { "/getProviderSpecificData" }) public String getProviderSpecificData( @@ -955,7 +916,6 @@ public String getProviderSpecificData( * @param comingRequest * @return ProviderSpecificMasterData */ - @CrossOrigin() @Operation(summary = "Calculate beneficiary BMI status") @PostMapping(value = { "/calculateBMIStatus" }) public String calculateBMIStatus( @@ -973,7 +933,6 @@ public String calculateBMIStatus( return response.toString(); } - @CrossOrigin @Operation(summary = "Update beneficiary status flag") @PostMapping(value = { "/update/benDetailsAndSubmitToNurse" }) public String saveBeneficiaryVisitDetail( @@ -1008,7 +967,6 @@ public String saveBeneficiaryVisitDetail( return response.toString(); } - @CrossOrigin @Operation(summary = "Extend redis session for 30 mins") @PostMapping(value = { "/extend/redisSession" }) public String extendRedisSession() { @@ -1022,7 +980,6 @@ 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/tm/controller/common/master/CommonMasterController.java b/src/main/java/com/iemr/tm/controller/common/master/CommonMasterController.java index 363e0ac8..009ed41b 100644 --- a/src/main/java/com/iemr/tm/controller/common/master/CommonMasterController.java +++ b/src/main/java/com/iemr/tm/controller/common/master/CommonMasterController.java @@ -26,7 +26,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -38,9 +38,6 @@ import io.swagger.v3.oas.annotations.Operation; - - -@CrossOrigin @RestController @RequestMapping(value = "/master", headers = "Authorization", consumes = "application/json", produces = "application/json") /** Objective: provides master data based on given visitCategory */ diff --git a/src/main/java/com/iemr/tm/controller/covid19/CovidController.java b/src/main/java/com/iemr/tm/controller/covid19/CovidController.java index d27fc460..93d10011 100644 --- a/src/main/java/com/iemr/tm/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/tm/controller/covid19/CovidController.java @@ -29,7 +29,7 @@ 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,13 +46,11 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - /** * * @Objective Saving NCD Care data for Nurse and Doctor. * @Date 16-04-2020 */ -@CrossOrigin @RestController @RequestMapping(value = "/pandemic/covid", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CovidController { @@ -61,7 +59,6 @@ public class CovidController { @Autowired private Covid19ServiceImpl covid19ServiceImpl; - @CrossOrigin @Operation(summary = "Save COVID nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, @@ -98,7 +95,6 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - @CrossOrigin @Operation(summary = "Save COVID doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, @@ -130,7 +126,6 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() @Operation(summary = "Get COVID beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) @@ -163,7 +158,6 @@ public String getBenVisitDetailsFrmNurseCovid19( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() @Operation(summary = "Get COVID beneficiary history") @PostMapping(value = { "/getBenCovid19HistoryDetails" }) public String getBenCovid19HistoryDetails( @@ -194,8 +188,6 @@ public String getBenCovid19HistoryDetails( * @param comingRequest * @return visit details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get COVID beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -227,7 +219,6 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() @Operation(summary = "Get COVID beneficiary case-record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCovid" }) @Transactional(rollbackFor = Exception.class) @@ -255,7 +246,6 @@ public String getBenCaseRecordFromDoctorCovid19( return response.toString(); } - @CrossOrigin @Operation(summary = "Update COVID beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -293,8 +283,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * @objective Replace NCD Care Vital Data entered by Nurse with the details * entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update COVID beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -329,7 +317,6 @@ 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 beneficiary case-record and referral details") @PostMapping(value = { "/update/doctorData" }) public String updateCovid19DoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/tm/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/tm/controller/dataSyncActivity/StartSyncActivity.java index 870e33fb..7d23c218 100644 --- a/src/main/java/com/iemr/tm/controller/dataSyncActivity/StartSyncActivity.java +++ b/src/main/java/com/iemr/tm/controller/dataSyncActivity/StartSyncActivity.java @@ -25,7 +25,7 @@ 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; @@ -43,7 +43,6 @@ /*** * * @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 { @@ -54,7 +53,6 @@ public class StartSyncActivity { @Autowired private DownloadDataFromServerImpl downloadDataFromServerImpl; - @CrossOrigin() @Operation(summary = "Initiate data sync from van to server") @RequestMapping(value = { "/van-to-server" }, method = { RequestMethod.POST }) public String dataSyncToServer(@RequestBody String requestOBJ, @@ -81,7 +79,6 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toStringWithSerialization(); } - @CrossOrigin() @Operation(summary = "Get data sync group details") @GetMapping(value = { "/getSyncGroupDetails" }) public String getSyncGroupDetails() { @@ -103,7 +100,6 @@ public String getSyncGroupDetails() { * * @return Masters download in van from central server */ - @CrossOrigin() @Operation(summary = "Data synced master data") @PostMapping(value = { "/startMasterDownload" }) public String startMasterDownload(@RequestBody String requestOBJ, @@ -136,7 +132,6 @@ public String startMasterDownload(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() @Operation(summary = "Master data sync download progress check") @GetMapping(value = { "/checkMastersDownloadProgress" }) public String checkMastersDownloadProgress() { @@ -150,7 +145,6 @@ public String checkMastersDownloadProgress() { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get van details for master sync data download") @GetMapping(value = { "/getVanDetailsForMasterDownload" }) public String getVanDetailsForMasterDownload() { diff --git a/src/main/java/com/iemr/tm/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java b/src/main/java/com/iemr/tm/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java index 4000833d..3f32247a 100644 --- a/src/main/java/com/iemr/tm/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java +++ b/src/main/java/com/iemr/tm/controller/dataSyncLayerCentral/MMUDataSyncVanToServer.java @@ -24,7 +24,7 @@ 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; @@ -39,7 +39,6 @@ import io.swagger.v3.oas.annotations.Operation; - /*** * * @author NE298657 @@ -47,7 +46,6 @@ * @operation Class used for data sync from van-to-server & server-to-van * */ -@CrossOrigin @RestController @RequestMapping(value = "/dataSync", headers = "Authorization", consumes = "application/json", produces = "application/json") public class MMUDataSyncVanToServer { @@ -58,7 +56,6 @@ public class MMUDataSyncVanToServer { @Autowired private GetMasterDataFromCentralForVanImpl getMasterDataFromCentralForVanImpl; - @CrossOrigin() @Operation(summary = "Download data from van-to-server (Mobile Medical Unit)") @PostMapping(value = { "/van-to-server" }) public String dataSyncToServer(@RequestBody String requestOBJ, @@ -77,7 +74,6 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() @Operation(summary = "Download data from server to van (Mobile Medical Unit)") @PostMapping(value = { "/server-to-van" }) public String dataDownloadFromServer(@RequestBody SyncDownloadMaster syncDownloadMaster, diff --git a/src/main/java/com/iemr/tm/controller/foetalmonitor/FoetalMonitorController.java b/src/main/java/com/iemr/tm/controller/foetalmonitor/FoetalMonitorController.java index dd30308a..e902ed02 100644 --- a/src/main/java/com/iemr/tm/controller/foetalmonitor/FoetalMonitorController.java +++ b/src/main/java/com/iemr/tm/controller/foetalmonitor/FoetalMonitorController.java @@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -47,8 +47,6 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController @RequestMapping(value = "/foetalMonitor", headers = "Authorization", consumes = "application/json", produces = "application/json") public class FoetalMonitorController { @@ -62,9 +60,7 @@ public class FoetalMonitorController { * @param JSON requestObj * @return success or failure response */ - - @CrossOrigin - @Operation(summary= "Send the mother data and prescribed test details to foetal monitor") + @Operation(summary = "Send the mother data and prescribed test details to foetal monitor") @PostMapping(value = "/sendMotherTestDetailsToFoetalMonitor", headers = "Authorization") public ResponseEntity sendANCMotherTestDetailsToFoetalMonitor( @Param("{\"beneficiaryRegID\":\"Long\",\"benFlowID\":\"Long\",\"testTime\":\"Timestamp\",\"motherLMPDate\":\"Timestamp\",\"motherName\":\"String\",\"fetosenseTestId\":\"Long\",\"testName\":\"String\",\"ProviderServiceMapID\":\"Integer\",\"createdBy\":\"String\"}") @RequestBody String requestObj, @@ -78,7 +74,8 @@ public ResponseEntity sendANCMotherTestDetailsToFoetalMonitor( FoetalMonitor foetalMonitorRequest = InputMapper.gson().fromJson(requestObj, FoetalMonitor.class); - String response = foetalMonitorService.sendFoetalMonitorTestDetails(foetalMonitorRequest, authorization); + String response = foetalMonitorService.sendFoetalMonitorTestDetails(foetalMonitorRequest, + authorization); output.setResponse(response); } else { @@ -98,8 +95,7 @@ public ResponseEntity sendANCMotherTestDetailsToFoetalMonitor( * @param authorization * @return */ - @CrossOrigin - @Operation(summary= "Foetal monitor device status check") + @Operation(summary = "Foetal monitor device status check") @PostMapping(value = "/registerMother", headers = "Authorization") public String saveMother(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String authorization) { @@ -116,10 +112,10 @@ public String saveMother(@RequestBody String requestObj, return output.toString(); } - @CrossOrigin - @Operation(summary= "Get the foetal monitor details") + @Operation(summary = "Get the foetal monitor details") @GetMapping(value = "/fetch/foetalMonitorDetails/{benFlowID}", headers = "Authorization") - public String getFoetalMonitorDetails(@Param("{\"benFlowID\":\"Long\"}") @PathVariable("benFlowID") Long benFlowID) { + public String getFoetalMonitorDetails( + @Param("{\"benFlowID\":\"Long\"}") @PathVariable("benFlowID") Long benFlowID) { logger.info("Request Object for getting foetal monitor data - " + benFlowID); OutputResponse output = new OutputResponse(); @@ -137,8 +133,7 @@ public String getFoetalMonitorDetails(@Param("{\"benFlowID\":\"Long\"}") @PathVa return output.toString(); } - @CrossOrigin - @Operation(summary= "Fetch foetal monitor pdf report (Base64 format)") + @Operation(summary = "Fetch foetal monitor pdf report (Base64 format)") @PostMapping(value = "/fetch/reportGraphBase64", headers = "Authorization") public ResponseEntity getFoetalMonitorDetails( @Param("{\"reportFilePath\":\"String\"}") @RequestBody FoetalMonitor foetalMonitorOBJ) { @@ -165,8 +160,7 @@ public ResponseEntity getFoetalMonitorDetails( return output.toStringWithHttpStatus(); } - @CrossOrigin - @Operation(summary= "Update foetal monitor data") + @Operation(summary = "Update foetal monitor data") @PostMapping(value = "/update/foetalMonitorData") public ResponseEntity updateFoetalMonitorData( @Param("\r\n" + "{\r\n" + "\"testId\":\"String\", \r\n" + "\"deviceId\":\"String\", \r\n" @@ -193,7 +187,7 @@ public ResponseEntity updateFoetalMonitorData( response.setError(404, "Invalid request"); logger.error("Invalid request"); } - + } catch (IEMRException e) { response.setError(5000, e.getMessage()); logger.error("Error while updating foetal monitor data :" + e); diff --git a/src/main/java/com/iemr/tm/controller/generalOPD/GeneralOPDController.java b/src/main/java/com/iemr/tm/controller/generalOPD/GeneralOPDController.java index fdf0aa76..154e3323 100644 --- a/src/main/java/com/iemr/tm/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/tm/controller/generalOPD/GeneralOPDController.java @@ -26,7 +26,7 @@ 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,13 +44,11 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - /*** * @Objective Saving General OPD data for Nurse and Doctor. */ @RestController -@CrossOrigin @RequestMapping(value = "/generalOPD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class GeneralOPDController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @@ -58,10 +56,11 @@ public class GeneralOPDController { @Autowired private GeneralOPDService generalOPDService; -// @Autowired -// public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl) { -// this.generalOPDService = generalOPDService; -// } + // @Autowired + // public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl + // generalOPDServiceImpl) { + // this.generalOPDService = generalOPDService; + // } /** * @Objective Save General OPD data for nurse. @@ -69,7 +68,6 @@ public class GeneralOPDController { * @return success or failure response * @throws Exception */ - @CrossOrigin @Operation(summary = "Save general OPD data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenGenOPDNurseData(@RequestBody String requestObj, @@ -106,7 +104,6 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj, * @param requestObj * @return success or failure response */ - @CrossOrigin @Operation(summary = "Save general OPD data collected by doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenGenOPDDoctorData(@RequestBody String requestObj, @@ -138,7 +135,6 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() @Operation(summary = "Get general OPD beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseGOPD" }) @Transactional(rollbackFor = Exception.class) @@ -171,7 +167,6 @@ public String getBenVisitDetailsFrmNurseGOPD( * @param comingRequest * @return history details in JSON format */ - @CrossOrigin() @Operation(summary = "Get general OPD beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -203,7 +198,6 @@ public String getBenHistoryDetails( * @param comingRequest * @return vital details in JSON format */ - @CrossOrigin() @Operation(summary = "Get general OPD beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -235,7 +229,6 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return examination details in JSON format */ - @CrossOrigin() @Operation(summary = "Get general OPD beneficiary examination details") @PostMapping(value = { "/getBenExaminationDetails" }) @@ -267,7 +260,6 @@ public String getBenExaminationDetails( * @param comingRequest * @return doctor details in JSON format */ - @CrossOrigin() @Operation(summary = "Get general OPD beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorGeneralOPD" }) @Transactional(rollbackFor = Exception.class) @@ -295,7 +287,6 @@ public String getBenCaseRecordFromDoctorGeneralOPD( return response.toString(); } - @CrossOrigin @Operation(summary = "Update beneficiary's general OPD visit details") @PostMapping(value = { "/update/visitDetailsScreen" }) public String updateVisitNurse(@RequestBody String requestObj) { @@ -330,8 +321,6 @@ public String updateVisitNurse(@RequestBody String requestObj) { * @objective Replace General OPD History Data entered by Nurse with the details * entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -366,8 +355,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * @objective Replace General OPD Vital Data entered by Nurse with the details * entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update general OPD beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -402,8 +389,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @objective Replace General OPD Examination Data entered by Nurse with the * details entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update general OPD beneficiary examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -437,7 +422,6 @@ 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 beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/tm/controller/labtechnician/LabtechnicianController.java b/src/main/java/com/iemr/tm/controller/labtechnician/LabtechnicianController.java index 40fe5c0f..f3e8fd9a 100644 --- a/src/main/java/com/iemr/tm/controller/labtechnician/LabtechnicianController.java +++ b/src/main/java/com/iemr/tm/controller/labtechnician/LabtechnicianController.java @@ -24,7 +24,7 @@ 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; @@ -39,33 +39,29 @@ import io.swagger.v3.oas.annotations.Operation; - - /*** * * @Objective Saving lab test results given by LabTechnician */ @RestController -@CrossOrigin @RequestMapping(value = "/labTechnician", headers = "Authorization", consumes = "application/json", produces = "application/json") public class LabtechnicianController { - + private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - + private LabTechnicianServiceImpl labTechnicianServiceImpl; - + @Autowired public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianServiceImpl) { this.labTechnicianServiceImpl = labTechnicianServiceImpl; } - + /** * @Objective Save lab test results given by LabTechnician - * @param JSON requestObj + * @param JSON requestObj * @return success or failure response */ - @CrossOrigin @Operation(summary = "Save lab test result") @PostMapping(value = { "/save/LabTestResult" }) public String saveLabTestResult(@RequestBody String requestObj) { @@ -95,8 +91,7 @@ public String saveLabTestResult(@RequestBody String requestObj) { } return response.toString(); } - - @CrossOrigin + @Operation(summary = "Get beneficiary lab test prescription") @PostMapping(value = { "/get/prescribedProceduresList" }) public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) { @@ -127,7 +122,6 @@ public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) } // API for getting lab result based on beneficiaryRegID and visitCode - @CrossOrigin() @Operation(summary = "Get lab test result for a beneficiary visit") @PostMapping(value = { "/get/labResultForVisitcode" }) public String getLabResultForVisitCode(@RequestBody String requestOBJ) { @@ -154,5 +148,5 @@ public String getLabResultForVisitCode(@RequestBody String requestOBJ) { } return response.toString(); } - + } diff --git a/src/main/java/com/iemr/tm/controller/location/LocationController.java b/src/main/java/com/iemr/tm/controller/location/LocationController.java index 1fc8a981..737ab8a4 100644 --- a/src/main/java/com/iemr/tm/controller/location/LocationController.java +++ b/src/main/java/com/iemr/tm/controller/location/LocationController.java @@ -25,7 +25,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -39,10 +39,8 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController -@RequestMapping(value = "/location", headers = "Authorization",produces = {"application/json" }) +@RequestMapping(value = "/location", headers = "Authorization", produces = { "application/json" }) public class LocationController { private OutputResponse response; private Logger logger = LoggerFactory.getLogger(CommonMasterController.class); @@ -143,7 +141,6 @@ public String getVillageMaster(@PathVariable("blockID") Integer blockID) { * @param comingRequest * @return */ - @CrossOrigin() @Operation(summary = "Get location details from service point id and provider service map id") @PostMapping(value = "/getLocDetailsBasedOnSpIDAndPsmID") public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequest) { diff --git a/src/main/java/com/iemr/tm/controller/login/IemrMmuLoginController.java b/src/main/java/com/iemr/tm/controller/login/IemrMmuLoginController.java index 5765dc15..6d2c06f7 100644 --- a/src/main/java/com/iemr/tm/controller/login/IemrMmuLoginController.java +++ b/src/main/java/com/iemr/tm/controller/login/IemrMmuLoginController.java @@ -25,7 +25,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -40,8 +40,6 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController @RequestMapping(value = "/user", headers = "Authorization", consumes = "application/json", produces = "application/json") public class IemrMmuLoginController { @@ -56,7 +54,6 @@ public void setIemrMmuLoginServiceImpl(IemrMmuLoginServiceImpl iemrMmuLoginServi this.iemrMmuLoginServiceImpl = iemrMmuLoginServiceImpl; } - @CrossOrigin() @Operation(summary = "Get user service point van details") @PostMapping(value = "/getUserServicePointVanDetails", produces = { "application/json" }) @@ -78,7 +75,6 @@ public String getUserServicePointVanDetails(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get service point villages") @PostMapping(value = "/getServicepointVillages", produces = { "application/json" }) @@ -99,7 +95,6 @@ public String getServicepointVillages(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get user service point van details") @PostMapping(value = "/getUserVanSpDetails", produces = { "application/json" }) public String getUserVanSpDetails(@RequestBody String comingRequest) { @@ -124,7 +119,6 @@ public String getUserVanSpDetails(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get user spoke details") @GetMapping(value = "/getUserSpokeDetails/{psmId}", produces = { "application/json" }) diff --git a/src/main/java/com/iemr/tm/controller/ncdCare/NCDCareController.java b/src/main/java/com/iemr/tm/controller/ncdCare/NCDCareController.java index e8b8d229..b3c050bb 100644 --- a/src/main/java/com/iemr/tm/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/tm/controller/ncdCare/NCDCareController.java @@ -29,7 +29,7 @@ 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,12 +46,9 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - - /** * @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 { @@ -70,7 +67,6 @@ public void setNcdCareServiceImpl(NCDCareServiceImpl ncdCareServiceImpl) { * @return success or failure response * @throws Exception */ - @CrossOrigin @Operation(summary = "Save NCD care data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, @@ -107,7 +103,6 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, * @param 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, @@ -139,7 +134,6 @@ 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) @@ -172,7 +166,6 @@ public String getBenVisitDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() @Operation(summary = "Get NCD care beneficiary history") @PostMapping(value = { "/getBenNCDCareHistoryDetails" }) @@ -204,8 +197,6 @@ public String getBenNCDCareHistoryDetails( * @param comingRequest * @return visit details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get NCD care beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseNCDCare" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -237,7 +228,6 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @param 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) @@ -265,7 +255,6 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @CrossOrigin @Operation(summary = "Update NCD care beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -303,8 +292,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * @objective Replace NCD Care Vital Data entered by Nurse with the details * entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update NCD care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -339,7 +326,6 @@ 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/tm/controller/ncdscreening/NCDScreeningController.java b/src/main/java/com/iemr/tm/controller/ncdscreening/NCDScreeningController.java index 757a18c4..4233327c 100644 --- a/src/main/java/com/iemr/tm/controller/ncdscreening/NCDScreeningController.java +++ b/src/main/java/com/iemr/tm/controller/ncdscreening/NCDScreeningController.java @@ -26,7 +26,7 @@ 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; @@ -47,12 +47,9 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - - /** * @Objective Saving NCD Screening nurse data. */ -@CrossOrigin @RestController @RequestMapping(value = "/NCD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDScreeningController { @@ -75,7 +72,6 @@ public void setNcdScreeningServiceImpl(NCDScreeningServiceImpl ncdScreeningServi * @return success or failure response * @throws Exception */ - @CrossOrigin @Operation(summary = "Save NCD screening beneficiary data collected by nurse") @PostMapping(value = { "/save/nurseData" }) @@ -108,7 +104,6 @@ public String saveBeneficiaryNCDScreeningDetails(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin @Operation(summary = "Save NCD screening beneficiary data collected by doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, @@ -140,7 +135,6 @@ public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin() @Operation(summary = "Get NCD screening beneficiary visit details") @PostMapping(value = { "/get/nurseData" }) public String getNCDScreenigDetails( @@ -166,9 +160,8 @@ public String getNCDScreenigDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get NCD screening visit count for beneficiary register id") - @GetMapping(value = { "/getNcdScreeningVisitCount/{beneficiaryRegID}"} ) + @GetMapping(value = { "/getNcdScreeningVisitCount/{beneficiaryRegID}" }) public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long beneficiaryRegID) { OutputResponse response = new OutputResponse(); try { @@ -194,7 +187,6 @@ public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long b * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() @Operation(summary = "Get NCD screening beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -222,7 +214,6 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get NCD screening beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -250,7 +241,6 @@ public String getBenVisitDetailsFrmNurseGOPD( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get NCD screening beneficiary general OPD history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -277,7 +267,6 @@ public String getBenHistoryDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get NCD screening beneficiary vitals from general OPD nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -304,7 +293,6 @@ public String getBenVitalDetailsFrmNurse( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get NCD screening IDRS details from general OPD nurse") @PostMapping(value = { "/getBenIdrsDetailsFrmNurse" }) public String getBenIdrsDetailsFrmNurse( @@ -332,7 +320,6 @@ public String getBenIdrsDetailsFrmNurse( return response.toString(); } - @CrossOrigin @Operation(summary = "Get NCD screening beneficiary case record and referral") @PostMapping(value = { "/update/nurseData" }) public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestObj) { @@ -367,7 +354,6 @@ public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestOb /* * Updating the history WDF requirement 9-12-2020 */ - @CrossOrigin @Operation(summary = "Update NCD screening beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -396,7 +382,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update NCD screening beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -425,7 +410,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update NCD screening beneficiary history") @PostMapping(value = { "/update/idrsScreen" }) public String updateIDRSScreen(@RequestBody String requestObj) { @@ -454,7 +438,6 @@ public String updateIDRSScreen(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update NCD screening beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/tm/controller/nurse/vitals/AnthropometryVitalsController.java b/src/main/java/com/iemr/tm/controller/nurse/vitals/AnthropometryVitalsController.java index 55e84b35..7c47f4bf 100644 --- a/src/main/java/com/iemr/tm/controller/nurse/vitals/AnthropometryVitalsController.java +++ b/src/main/java/com/iemr/tm/controller/nurse/vitals/AnthropometryVitalsController.java @@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; -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; @@ -17,42 +17,39 @@ import io.swagger.v3.oas.annotations.Operation; @RestController -@CrossOrigin @RequestMapping(value = "/anthropometryVitals", headers = "Authorization", consumes = "application/json", produces = "application/json") public class AnthropometryVitalsController { - private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - + @Autowired private AnthropometryVitalsService anthropometryVitalsService; - - //Auto-patching height in anthropometry details - @CrossOrigin() - @Operation(summary = "Get beneficiary height details") - @PostMapping(value = { "/getBenHeightDetailsFrmNurse" }) - public String getBenHeightDetailsFrmNurse( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { - OutputResponse response = new OutputResponse(); - - logger.info("Request object for beneficiary height data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - - String res = anthropometryVitalsService.getBeneficiaryHeightDetails(benRegID); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("Beneficiary height data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary height data"); - logger.error("Error while getting beneficiary height data :" + e); + + // Auto-patching height in anthropometry details + @Operation(summary = "Get beneficiary height details") + @PostMapping(value = { "/getBenHeightDetailsFrmNurse" }) + public String getBenHeightDetailsFrmNurse( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + OutputResponse response = new OutputResponse(); + + logger.info("Request object for beneficiary height data fetching :" + comingRequest); + try { + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + + String res = anthropometryVitalsService.getBeneficiaryHeightDetails(benRegID); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); } - return response.toString(); + logger.info("Beneficiary height data fetching Response:" + response); + } catch (Exception e) { + response.setError(5000, "Error while getting beneficiary height data"); + logger.error("Error while getting beneficiary height data :" + e); } - + return response.toString(); + } + } diff --git a/src/main/java/com/iemr/tm/controller/patientApp/master/PatientAppCommonMasterController.java b/src/main/java/com/iemr/tm/controller/patientApp/master/PatientAppCommonMasterController.java index b06f3d65..fad5b48a 100644 --- a/src/main/java/com/iemr/tm/controller/patientApp/master/PatientAppCommonMasterController.java +++ b/src/main/java/com/iemr/tm/controller/patientApp/master/PatientAppCommonMasterController.java @@ -26,7 +26,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -42,8 +42,6 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController @RequestMapping(value = "/master", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -56,11 +54,12 @@ public class PatientAppCommonMasterController { public void setCommonPatientAppMasterService(CommonPatientAppMasterService commonPatientAppMasterService) { this.commonPatientAppMasterService = commonPatientAppMasterService; } + /** * @param visitCategoryID * @return nurse master data for the provided visitCategoryID */ - @Operation(summary= "Chief complaints master data API for patient app") + @Operation(summary = "Chief complaints master data API for patient app") @PostMapping(value = "/patientApp/chiefComplaintsMaster/{visitCategoryID}/{providerServiceMapID}/{gender}") public String patientAppChiefComplaintsMasterData(@PathVariable("visitCategoryID") Integer visitCategoryID, @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("gender") String gender) { @@ -74,7 +73,7 @@ public String patientAppChiefComplaintsMasterData(@PathVariable("visitCategoryID return response.toString(); } - @Operation(summary= "COVID master data API for patient app") + @Operation(summary = "COVID master data API for patient app") @PostMapping(value = "/patientApp/covidMaster/{visitCategoryID}/{providerServiceMapID}/{gender}") public String patientAppCovidMasterData(@PathVariable("visitCategoryID") Integer visitCategoryID, @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("gender") String gender) { @@ -88,8 +87,7 @@ public String patientAppCovidMasterData(@PathVariable("visitCategoryID") Integer return response.toString(); } - @CrossOrigin - @Operation(summary= "Save COVID data in patient app") + @Operation(summary = "Save COVID data in patient app") @PostMapping(value = { "/save/covidScreeningDataPatientApp" }) public String saveBenCovidDoctorDataPatientApp(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -108,8 +106,7 @@ public String saveBenCovidDoctorDataPatientApp(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin - @Operation(summary= "Save chief-complaints data in patient app") + @Operation(summary = "Save chief-complaints data in patient app") @PostMapping(value = { "/save/chiefComplaintsDataPatientApp" }) public String saveBenChiefComplaintsDataPatientApp(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -128,8 +125,7 @@ public String saveBenChiefComplaintsDataPatientApp(@RequestBody String requestOb return response.toString(); } - @CrossOrigin - @Operation(summary= "Save tele-consultation slot in data patient app") + @Operation(summary = "Save tele-consultation slot in data patient app") @PostMapping(value = { "/save/tcSlotDetailsDataPatientApp" }) public String saveTCSlotDataPatientApp(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -150,8 +146,7 @@ public String saveTCSlotDataPatientApp(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin - @Operation(summary= "Get patient episode data for specialist in patient app") + @Operation(summary = "Get patient episode data for specialist in patient app") @PostMapping(value = { "/get/getPatientEpisodeData" }) public String getPatientEpisodeDataMobileApp(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -172,8 +167,7 @@ public String getPatientEpisodeDataMobileApp(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin - @Operation(summary= "Get patient booked slot data in patient app") + @Operation(summary = "Get patient booked slot data in patient app") @PostMapping(value = { "/get/getPatientBookedSlotDetails" }) public String getPatientBookedSlotDetails(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -194,8 +188,7 @@ public String getPatientBookedSlotDetails(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin - @Operation(summary= "Save specialist diagnosis data in patient app") + @Operation(summary = "Save specialist diagnosis data in patient app") @PostMapping(value = { "/save/saveSpecialistDiagnosisData" }) public String saveSpecialistDiagnosisData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -216,8 +209,7 @@ public String saveSpecialistDiagnosisData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin - @Operation(summary= "Get specialist diagnosis data in patient app") + @Operation(summary = "Get specialist diagnosis data in patient app") @PostMapping(value = { "/save/getSpecialistDiagnosisData" }) public String getSpecialistDiagnosisData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -238,8 +230,7 @@ public String getSpecialistDiagnosisData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin - @Operation(summary= "Get last 3 episode data of the patient in patient app") + @Operation(summary = "Get last 3 episode data of the patient in patient app") @PostMapping(value = { "/get/getPatientsEpisodes" }) public String getPatientsLast_3_Episode(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { diff --git a/src/main/java/com/iemr/tm/controller/pnc/PostnatalCareController.java b/src/main/java/com/iemr/tm/controller/pnc/PostnatalCareController.java index c0be88da..dd93ef2a 100644 --- a/src/main/java/com/iemr/tm/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/tm/controller/pnc/PostnatalCareController.java @@ -26,7 +26,7 @@ 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; @@ -43,12 +43,10 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - /** * @Objective Saving PNC nurse and doctor data * */ -@CrossOrigin @RestController @RequestMapping(value = "/PNC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class PostnatalCareController { @@ -66,8 +64,6 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { * @return success or failure response * @throws Exception */ - - @CrossOrigin @Operation(summary = "Save PNC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenPNCNurseData(@RequestBody String requestObj, @@ -105,8 +101,6 @@ public String saveBenPNCNurseData(@RequestBody String requestObj, * @param requestObj * @return success or failure response */ - - @CrossOrigin @Operation(summary = "Save PNC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenPNCDoctorData(@RequestBody String requestObj, @@ -139,7 +133,6 @@ 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) @@ -172,7 +165,6 @@ public String getBenVisitDetailsFrmNursePNC( * @param comingRequest * @return PNC Care data in JSON format */ - @CrossOrigin() @Operation(summary = "Get PNC beneficiary details from nurse") @PostMapping(value = { "/getBenPNCDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -205,7 +197,6 @@ public String getBenPNCDetailsFrmNursePNC( * @param comingRequest * @return history data in JSON format */ - @CrossOrigin() @Operation(summary = "Get PNC beneficiary history nurse") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -237,7 +228,6 @@ public String getBenHistoryDetails( * @param comingRequest * @return vital data in JSON format */ - @CrossOrigin() @Operation(summary = "Get PNC beneficiary vital details from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -269,7 +259,6 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return examination data in JSON format */ - @CrossOrigin() @Operation(summary = "Get PNC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsPNC" }) @@ -301,7 +290,6 @@ public String getBenExaminationDetailsPNC( * @param comingRequest * @return doctor data in JSON format */ - @CrossOrigin() @Operation(summary = "Get PNC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorPNC" }) @Transactional(rollbackFor = Exception.class) @@ -329,7 +317,6 @@ public String getBenCaseRecordFromDoctorPNC( return response.toString(); } - @CrossOrigin @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/PNCScreen" }) public String updatePNCCareNurse(@RequestBody String requestObj) { @@ -365,8 +352,6 @@ public String updatePNCCareNurse(@RequestBody String requestObj) { * @objective Replace PNC History Data entered by Nurse with the details entered * by Doctor */ - - @CrossOrigin @Operation(summary = "Update PNC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -402,8 +387,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * @objective Replace PNC Vital Data entered by Nurse with the details entered * by Doctor */ - - @CrossOrigin @Operation(summary = "Update PNC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -439,8 +422,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @objective Replace PNC Examination Data entered by Nurse with the details * entered by Doctor */ - - @CrossOrigin @Operation(summary = "Update PNC examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -469,7 +450,6 @@ 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/tm/controller/quickBlox/QuickbloxController.java b/src/main/java/com/iemr/tm/controller/quickBlox/QuickbloxController.java index 2850dcb2..d46f0969 100644 --- a/src/main/java/com/iemr/tm/controller/quickBlox/QuickbloxController.java +++ b/src/main/java/com/iemr/tm/controller/quickBlox/QuickbloxController.java @@ -24,7 +24,7 @@ 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; @@ -41,8 +41,6 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController @RequestMapping(value = "/quickblox", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -50,8 +48,8 @@ public class QuickbloxController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @Autowired private QuickbloxService quickbloxService; - @CrossOrigin - @Operation(summary= "Get quickblox id") + + @Operation(summary = "Get quickblox id") @PostMapping(value = { "/getquickbloxIds" }) public String getquickbloxIds(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { @@ -62,14 +60,11 @@ public String getquickbloxIds(@RequestBody String requestObj, quickbloxService.getQuickbloxIds(requestObj)); return response.toString(); - } catch (Exception e) { logger.error("Error while getting quickblox Ids :" + e); response.setError(5000, "Error while getting quickblox Ids"); } return response.toString(); } - - } diff --git a/src/main/java/com/iemr/tm/controller/quickconsult/QuickConsultController.java b/src/main/java/com/iemr/tm/controller/quickconsult/QuickConsultController.java index c485b1ef..baf4fb4b 100644 --- a/src/main/java/com/iemr/tm/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/tm/controller/quickconsult/QuickConsultController.java @@ -26,7 +26,7 @@ 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; @@ -53,7 +53,6 @@ * @Date 12-01-2018 * */ -@CrossOrigin @RestController @RequestMapping(value = "/genOPD-QC-quickConsult", headers = "Authorization", consumes = "application/json", produces = "application/json") public class QuickConsultController { @@ -74,7 +73,6 @@ 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, @@ -111,8 +109,6 @@ public String saveBenQuickConsultDataNurse(@RequestBody String requestObj, * @return success or failure response * @objective Save beneficiary data for doctor quick consult - QC. */ - - @CrossOrigin @Operation(summary = "Save quick consult doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveQuickConsultationDetail( @@ -151,7 +147,6 @@ public String saveQuickConsultationDetail( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get quick consult beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -182,8 +177,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @param benRegID and benVisitID * @return visit details in JSON format */ - - @CrossOrigin() @Operation(summary = "Get quick consult beneficiary vital details") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -215,7 +208,6 @@ public String getBenVitalDetailsFrmNurse( * @param 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) @@ -243,7 +235,6 @@ 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/tm/controller/registrar/main/RegistrarController.java b/src/main/java/com/iemr/tm/controller/registrar/main/RegistrarController.java index 84c8ec35..7564bb51 100644 --- a/src/main/java/com/iemr/tm/controller/registrar/main/RegistrarController.java +++ b/src/main/java/com/iemr/tm/controller/registrar/main/RegistrarController.java @@ -29,7 +29,7 @@ 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,9 +51,6 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - - -@CrossOrigin @RestController @RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json") /** @@ -84,7 +81,6 @@ public void setNurseServiceImpl(NurseServiceImpl nurseServiceImpl) { } // Registrar Work List API ..... - @CrossOrigin() @Operation(summary = "Get registrar worklist data") @PostMapping(value = { "/registrarWorkListData" }) public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) @@ -104,7 +100,6 @@ public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @Re } // Registrar Quick search ..... - @CrossOrigin() @Operation(summary = "Search for the beneficiary based on beneficiary id") @PostMapping(value = { "/quickSearch" }) public String quickSearchBeneficiary( @@ -123,7 +118,6 @@ public String quickSearchBeneficiary( } // Registrar Advance search ..... - @CrossOrigin() @Operation(summary = "Search for the beneficiary based on provided data") @PostMapping(value = { "/advanceSearch" }) public String advanceSearch( @@ -146,7 +140,6 @@ public String advanceSearch( } // API for left side ben data - @CrossOrigin() @Operation(summary = "Get beneficiary details based on beneficiary register id") @PostMapping(value = { "/get/benDetailsByRegID" }) public String getBenDetailsByRegID( @@ -176,7 +169,6 @@ public String getBenDetailsByRegID( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary details") @PostMapping(value = { "/get/beneficiaryDetails" }) public String getBeneficiaryDetails( @@ -211,7 +203,6 @@ public String getBeneficiaryDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/get/beneficiaryImage" }) public String getBeneficiaryImage( @@ -238,7 +229,6 @@ public String getBeneficiaryImage( } // beneficiary quick search new integrated with common and identity - @CrossOrigin() @Operation(summary = "Search beneficiary based on beneficiary id or beneficiary phone number") @PostMapping(value = { "/quickSearchNew" }) public String quickSearchNew(@RequestBody String requestObj, @@ -262,7 +252,6 @@ public String quickSearchNew(@RequestBody String requestObj, } // beneficiary Advance search new integrated with common and identity - @CrossOrigin() @Operation(summary = "Beneficiary advance search integrated with common and identity API") @PostMapping(value = { "/advanceSearchNew" }) public String advanceSearchNew(@RequestBody String requestObj, @@ -286,7 +275,6 @@ public String advanceSearchNew(@RequestBody String requestObj, } // Get Beneficiary Details for left side panel of given beneficiaryRegID new - @CrossOrigin() @Operation(summary = "Get beneficiary details for side panel") @PostMapping(value = { "/get/benDetailsByRegIDForLeftPanelNew" }) public String getBenDetailsForLeftSidePanelByRegID( @@ -312,13 +300,12 @@ public String getBenDetailsForLeftSidePanelByRegID( logger.info("getBenDetailsByRegID response :" + response); } catch (Exception e) { logger.error("Error in getBenDetailsByRegID :" + e); - response.setError(5000, "Error while getting beneficiary details" ); + response.setError(5000, "Error while getting beneficiary details"); } return response.toString(); } // new api for ben image - @CrossOrigin() @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/getBenImage" }) public String getBenImage(@RequestBody String requestObj, @@ -334,8 +321,7 @@ public String getBenImage(@RequestBody String requestObj, } } - - @CrossOrigin() + @Operation(summary = "Register a new beneficiary") @PostMapping(value = { "/registrarBeneficaryRegistration" }) public String createBeneficiary( @@ -380,10 +366,10 @@ public String createBeneficiary( if (benData.getBeneficiaryID() != null) { response.setResponse(benData.getBeneficiaryID()); } else { - + } } else { - + response.setError(500, "Something Went-Wrong"); } } else { @@ -399,7 +385,6 @@ public String createBeneficiary( } // beneficiary registration with common and identity new - @CrossOrigin() @Operation(summary = "Register a new beneficiary new API") @PostMapping(value = { "/registrarBeneficaryRegistrationNew" }) public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, @@ -416,8 +401,7 @@ public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, } } - - @CrossOrigin() + @Operation(summary = "Update registered beneficiary data") @PostMapping(value = { "/update/BeneficiaryDetails" }) public String updateBeneficiary( @@ -524,8 +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( @@ -551,5 +534,5 @@ public String masterDataForRegistration( } return response.toString(); } - + } diff --git a/src/main/java/com/iemr/tm/controller/report/CRMReportController.java b/src/main/java/com/iemr/tm/controller/report/CRMReportController.java index 4dd539f6..bcb3aba6 100644 --- a/src/main/java/com/iemr/tm/controller/report/CRMReportController.java +++ b/src/main/java/com/iemr/tm/controller/report/CRMReportController.java @@ -27,7 +27,7 @@ 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; @@ -43,7 +43,6 @@ import io.swagger.v3.oas.annotations.Operation; - @RequestMapping("/TMReport") @RestController public class CRMReportController { @@ -53,7 +52,6 @@ public class CRMReportController { @Autowired private CRMReportService cRMReportService; - @CrossOrigin() @Operation(summary = "Fetch chief complaints report") @PostMapping(value = "/chiefcomplaintreport", headers = "Authorization", produces = { "application/json" }) public String chiefcomplaintreport(@RequestBody ReportInput input) { @@ -78,7 +76,6 @@ public String chiefcomplaintreport(@RequestBody ReportInput input) { } - @CrossOrigin() @Operation(summary = "Fetch consultation report") @PostMapping(value = "/ConsultationReport", headers = "Authorization", produces = { "application/json" }) public String getConsultationReport(@RequestBody ReportInput input) { @@ -103,7 +100,6 @@ public String getConsultationReport(@RequestBody ReportInput input) { } - @CrossOrigin() @Operation(summary = "Fetch total consultation report") @PostMapping(value = "/TotalConsultationReport", headers = "Authorization", produces = { "application/json" }) public String getTotalConsultationReport(@RequestBody ReportInput input) { @@ -128,7 +124,6 @@ public String getTotalConsultationReport(@RequestBody ReportInput input) { } - @CrossOrigin() @Operation(summary = "Fetch monthly report") @PostMapping(value = "/MonthlyReport", headers = "Authorization", produces = { "application/json" }) @@ -154,7 +149,6 @@ public String getMonthlyReport(@RequestBody ReportInput input) { } - @CrossOrigin() @Operation(summary = "Fetch daily report") @PostMapping(value = "/DailyReport", headers = "Authorization", produces = { "application/json" }) diff --git a/src/main/java/com/iemr/tm/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/tm/controller/snomedct/SnomedController.java index 639392bf..945064d6 100644 --- a/src/main/java/com/iemr/tm/controller/snomedct/SnomedController.java +++ b/src/main/java/com/iemr/tm/controller/snomedct/SnomedController.java @@ -24,7 +24,7 @@ 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; @@ -40,8 +40,6 @@ import io.lettuce.core.dynamic.annotation.Param; import io.swagger.v3.oas.annotations.Operation; - - @RequestMapping(value = "/snomed", consumes = "application/json", produces = "application/json") @RestController public class SnomedController { @@ -54,9 +52,8 @@ public void setSnomedService(SnomedService snomedService) { this.snomedService = snomedService; } - @CrossOrigin @Operation(summary = "Retrieve Snomed clinical term") - @PostMapping(value = "/getSnomedCTRecord", headers = "Authorization") + @PostMapping(value = "/getSnomedCTRecord", headers = "Authorization") public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @RequestBody String request) { OutputResponse output = new OutputResponse(); try { @@ -80,7 +77,6 @@ public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @Request return output.toString(); } - @CrossOrigin @Operation(summary = "Retrieve Snomed clinical term list") @PostMapping(value = "/getSnomedCTRecordList", headers = "Authorization") public String getSnomedCTRecordList(@Param(value = "{\"term\":\"String\"}") @RequestBody String request) { @@ -91,7 +87,6 @@ public String getSnomedCTRecordList(@Param(value = "{\"term\":\"String\"}") @Req logger.info("getSnomedCTRecord request " + sctdescription.toString()); - String sctList = snomedService.findSnomedCTRecordList(sctdescription); if (sctList != null) diff --git a/src/main/java/com/iemr/tm/controller/teleconsultation/TeleConsultationController.java b/src/main/java/com/iemr/tm/controller/teleconsultation/TeleConsultationController.java index 986af003..92e95b44 100644 --- a/src/main/java/com/iemr/tm/controller/teleconsultation/TeleConsultationController.java +++ b/src/main/java/com/iemr/tm/controller/teleconsultation/TeleConsultationController.java @@ -24,7 +24,7 @@ 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; @@ -39,7 +39,6 @@ import io.swagger.v3.oas.annotations.Operation; - @RestController @RequestMapping(value = "/tc", headers = "Authorization", consumes = "application/json", produces = "application/json") public class TeleConsultationController { @@ -48,7 +47,6 @@ 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) { @@ -69,7 +67,6 @@ 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, @@ -92,7 +89,6 @@ 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) { @@ -113,7 +109,6 @@ public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String return response.toString(); } - @CrossOrigin @Operation(summary = "Create teleconsultation request from worklist") @PostMapping(value = { "/create/benTCRequestWithVisitCode" }) public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @RequestHeader String Authorization) { @@ -140,7 +135,6 @@ public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @Req } // TC request List - @CrossOrigin @Operation(summary = "Get teleconsultation request list for a specialist") @PostMapping(value = { "/getTCRequestList" }) public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { @@ -170,7 +164,6 @@ public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { return response.toString(); } - @CrossOrigin @Operation(summary = "Update first consultation start time") @PostMapping(value = { "/startconsultation" }) public String startconsultation(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/tm/controller/version/VersionController.java b/src/main/java/com/iemr/tm/controller/version/VersionController.java index 8534c9e0..336d34e8 100644 --- a/src/main/java/com/iemr/tm/controller/version/VersionController.java +++ b/src/main/java/com/iemr/tm/controller/version/VersionController.java @@ -28,7 +28,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.CrossOrigin; + import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -38,13 +38,11 @@ import io.swagger.v3.oas.annotations.Operation; - @RestController public class VersionController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - - @CrossOrigin() + @Operation(summary = "Get version information") @GetMapping(value = "/version") public String versionInformation() { @@ -52,28 +50,30 @@ public String versionInformation() { try { logger.info("version Controller Start"); output.setResponse(readGitProperties()); - } catch (Exception e) { - output.setError(e); - } - + } catch (Exception e) { + output.setError(e); + } + logger.info("version Controller End"); return output.toString(); } + private String readGitProperties() throws Exception { - ClassLoader classLoader = getClass().getClassLoader(); - InputStream inputStream = classLoader.getResourceAsStream("git.properties"); - - return readFromInputStream(inputStream); + ClassLoader classLoader = getClass().getClassLoader(); + InputStream inputStream = classLoader.getResourceAsStream("git.properties"); + + return readFromInputStream(inputStream); } + private String readFromInputStream(InputStream inputStream) - throws IOException { - StringBuilder resultStringBuilder = new StringBuilder(); - try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) { - String line; - while ((line = br.readLine()) != null) { - resultStringBuilder.append(line).append("\n"); - } - } - return resultStringBuilder.toString(); + throws IOException { + StringBuilder resultStringBuilder = new StringBuilder(); + try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream))) { + String line; + while ((line = br.readLine()) != null) { + resultStringBuilder.append(line).append("\n"); + } + } + return resultStringBuilder.toString(); } } diff --git a/src/main/java/com/iemr/tm/controller/videoconsultationcontroller/VideoConsultationController.java b/src/main/java/com/iemr/tm/controller/videoconsultationcontroller/VideoConsultationController.java index 5c3619fd..aca8405a 100644 --- a/src/main/java/com/iemr/tm/controller/videoconsultationcontroller/VideoConsultationController.java +++ b/src/main/java/com/iemr/tm/controller/videoconsultationcontroller/VideoConsultationController.java @@ -24,7 +24,7 @@ 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.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -35,7 +35,6 @@ import io.swagger.v3.oas.annotations.Operation; - @RestController @RequestMapping(value = "/videoConsultation", headers = "Authorization", consumes = "application/json", produces = "application/json") public class VideoConsultationController { @@ -45,7 +44,6 @@ public class VideoConsultationController { @Autowired private VideoConsultationService videoConsultationService; - @CrossOrigin() @Operation(summary = "Login to video consultation service") @GetMapping(value = "/login/{userID}", headers = "Authorization", produces = { "application/json" }) @@ -71,7 +69,6 @@ public String login(@PathVariable("userID") Long userID) { } - @CrossOrigin() @Operation(summary = "Call user for video consultation service") @GetMapping(value = "/call/{fromuserID}/{touserID}", headers = "Authorization", produces = { "application/json" }) public String call(@PathVariable("fromuserID") Long fromuserID, @PathVariable("touserID") Long touserID) { @@ -96,9 +93,9 @@ public String call(@PathVariable("fromuserID") Long fromuserID, @PathVariable("t } - @CrossOrigin() - @Operation(summary = "Video consultation service for users by passing type") - @GetMapping(value = "/call/{fromuserID}/{touserID}/{type}", headers = "Authorization", produces = { "application/json" }) + @Operation(summary = "Video consultation service for users by passing type") + @GetMapping(value = "/call/{fromuserID}/{touserID}/{type}", headers = "Authorization", produces = { + "application/json" }) public String callSwymedAndJitsi(@PathVariable("fromuserID") Long fromuserID, @PathVariable("touserID") Long touserID, @PathVariable("type") String Type) { @@ -126,7 +123,6 @@ public String callSwymedAndJitsi(@PathVariable("fromuserID") Long fromuserID, } - @CrossOrigin() @Operation(summary = "Call van through video consultation") @GetMapping(value = "/callvan/{fromuserID}/{vanID}", headers = "Authorization", produces = { "application/json" }) public String callvan(@PathVariable("fromuserID") Long fromuserID, @PathVariable("vanID") Integer vanID) { @@ -151,9 +147,9 @@ public String callvan(@PathVariable("fromuserID") Long fromuserID, @PathVariable } - @CrossOrigin() @Operation(summary = "Call van through video consultation by passing type") - @GetMapping(value = "/callvan/{fromuserID}/{vanID}/{type}", headers = "Authorization", produces = { "application/json" }) + @GetMapping(value = "/callvan/{fromuserID}/{vanID}/{type}", headers = "Authorization", produces = { + "application/json" }) public String callVanSwymedAndJitsi(@PathVariable("fromuserID") Long fromuserID, @PathVariable("vanID") Integer vanID, @PathVariable("type") String Type) { @@ -182,7 +178,6 @@ public String callVanSwymedAndJitsi(@PathVariable("fromuserID") Long fromuserID, } - @CrossOrigin() @Operation(summary = "Logout of video consultation service") @GetMapping(value = "/logout", headers = "Authorization", produces = { "application/json" }) diff --git a/src/main/java/com/iemr/tm/utils/FilterConfig.java b/src/main/java/com/iemr/tm/utils/FilterConfig.java index 48aee27b..b11a7eeb 100644 --- a/src/main/java/com/iemr/tm/utils/FilterConfig.java +++ b/src/main/java/com/iemr/tm/utils/FilterConfig.java @@ -3,17 +3,26 @@ import org.springframework.boot.web.servlet.FilterRegistrationBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.Ordered; +import org.springframework.beans.factory.annotation.Value; @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.setOrder(Ordered.HIGHEST_PRECEDENCE); registrationBean.addUrlPatterns("/*"); // Apply filter to all API endpoints return registrationBean; } - } diff --git a/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java index 8acc1d00..5d6c05b3 100644 --- a/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/tm/utils/JwtUserIdValidationFilter.java @@ -1,6 +1,7 @@ package com.iemr.tm.utils; import java.io.IOException; +import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -17,14 +18,16 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; -@Component public class JwtUserIdValidationFilter implements Filter { private final JwtAuthenticationUtil jwtAuthenticationUtil; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private final String allowedOrigins; - public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil) { + public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil, + String allowedOrigins) { this.jwtAuthenticationUtil = jwtAuthenticationUtil; + this.allowedOrigins = allowedOrigins; } @Override @@ -33,6 +36,27 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; + String origin = request.getHeader("Origin"); + + logger.debug("Incoming Origin: {}", origin); + logger.debug("Allowed Origins Configured: {}", allowedOrigins); + + 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("Vary", "Origin"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + } else { + logger.warn("Origin [{}] is NOT allowed. CORS headers NOT added.", origin); + } + + if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { + logger.info("OPTIONS request - skipping JWT validation"); + response.setStatus(HttpServletResponse.SC_OK); + return; + } + String path = request.getRequestURI(); String contextPath = request.getContextPath(); logger.info("JwtUserIdValidationFilter invoked for path: " + path); @@ -106,6 +130,25 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo } } + 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 -> { + String regex = pattern + .replace(".", "\\.") + .replace("*", ".*") + .replace("http://localhost:.*", "http://localhost:\\d+"); // special case for wildcard port + + boolean matched = origin.matches(regex); + return matched; + }); + } + private boolean isMobileClient(String userAgent) { if (userAgent == null) return false;