diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index fc4cd5b7..cbf24266 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -178,3 +178,7 @@ captcha.secret-key=@env.CAPTCHA_SECRET_KEY@ captcha.verify-url=@env.CAPTCHA_VERIFY_URL@ captcha.enable-captcha=@env.ENABLE_CAPTCHA@ +cors.allowed-origins=@CORS_ALLOWED_ORIGINS@ + + + diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index ba807fdf..76144058 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -202,3 +202,5 @@ captcha.secret-key= captcha.verify-url= https://challenges.cloudflare.com/turnstile/v0/siteverify captcha.enable-captcha=true +cors.allowed-origins=http://localhost:* + diff --git a/src/main/java/com/iemr/common/config/CorsConfig.java b/src/main/java/com/iemr/common/config/CorsConfig.java new file mode 100644 index 00000000..2e226b79 --- /dev/null +++ b/src/main/java/com/iemr/common/config/CorsConfig.java @@ -0,0 +1,28 @@ +package com.iemr.common.config; + +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.util.Arrays; +import org.springframework.beans.factory.annotation.Value; + +@Configuration +public class CorsConfig implements WebMvcConfigurer { + + @Value("${cors.allowed-origins}") + private String allowedOrigins; + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOriginPatterns( + Arrays.stream(allowedOrigins.split(",")) + .map(String::trim) + .toArray(String[]::new)) + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") + .allowedHeaders("*") + .exposedHeaders("Authorization", "Jwttoken") + .allowCredentials(true) + .maxAge(3600); + } +} \ No newline at end of file diff --git a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java index 9ec79f65..1aa28712 100644 --- a/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java +++ b/src/main/java/com/iemr/common/controller/abdmfacility/AbdmFacilityController.java @@ -3,7 +3,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestHeader; @@ -25,7 +24,6 @@ public class AbdmFacilityController { @Autowired private AbdmFacilityService abdmFacilityService; - @CrossOrigin @Operation(summary = "Get Abdm facility mapped to worklocation") @GetMapping(value = { "/getWorklocationMappedAbdmFacility/{workLocationId}" }) public String getAbdmFacilityDetails(@PathVariable int workLocationId, @RequestHeader(value = "Authorization") String Authorization) { diff --git a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java index 49ff938e..d9b0f06f 100644 --- a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java +++ b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java @@ -35,7 +35,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -188,7 +187,6 @@ public void setGovtIdentityTypeService(GovtIdentityTypeService govtIdentityTypeS private CallReportsService callReportsService; @Operation(summary = "Create a new beneficiary") - @CrossOrigin() @RequestMapping(value = "/create", method = RequestMethod.POST, produces = "application/json", consumes = "application/json", headers = "Authorization") public String createBeneficiary( @@ -219,7 +217,6 @@ public String createBeneficiary( } @Operation(summary = "Create a new beneficiary for customization") - @CrossOrigin() @RequestMapping(value = "/createBeneficiary", method = RequestMethod.POST, produces = "application/json", consumes = "application/json", headers = "Authorization") public String createBeneficiary(@RequestBody String request, HttpServletRequest httpRequest) throws JsonMappingException, JsonProcessingException { @@ -266,7 +263,6 @@ private String checkExtraFields(JsonElement json) { return otherFieldsJson.toString(); } - @CrossOrigin() @Operation(summary = "Provide the list of beneficiaries based on beneficiary id") @RequestMapping(value = "/searchUserByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String searchUserByID( @@ -315,7 +311,6 @@ public String searchUserByID( } @Operation(summary = "Provide the list of beneficiaries based on phone number") - @CrossOrigin() @RequestMapping(value = "/searchUserByPhone", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String searchUserByPhone( @Param(value = "{\"phoneNo\":\"String\",\"pageNo\":\"Integer\",\"rowsPerPage\":\"Integer\"}") @RequestBody String request, @@ -346,7 +341,6 @@ public String searchUserByPhone( return response.toString(); } - @CrossOrigin() @Operation(summary = "Provide the list of beneficiaries based on search criteria") @RequestMapping(value = "/searchBeneficiary", method = RequestMethod.POST, headers = "Authorization") public String searchBeneficiary( @@ -369,7 +363,6 @@ public String searchBeneficiary( return output.toString(); } - @CrossOrigin() @Operation(summary = "Provide all common data list needed for beneficiary registration") @RequestMapping(value = "/getRegistrationData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRegistrationData() { @@ -400,7 +393,6 @@ public String getRegistrationData() { return response.toString(); } - @CrossOrigin() @Operation(summary = "Provide all common data V1 list needed for beneficiary registration") @RequestMapping(value = "/getRegistrationDataV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRegistrationDataV1( @@ -435,7 +427,6 @@ public String getRegistrationDataV1( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update beneficiary details") @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateBenefciary( @@ -479,7 +470,6 @@ public String updateBenefciary( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update beneficiary details") @RequestMapping(value = "/updateBenefciaryDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateBenefciaryDetails(@RequestBody String benificiaryRequest, HttpServletRequest httpRequest) { @@ -514,7 +504,6 @@ public String updateBenefciaryDetails(@RequestBody String benificiaryRequest, Ht return response.toString(); } - @CrossOrigin() @Operation(summary = "Fetch beneficiary details by phone no") @RequestMapping(value = "/getBeneficiariesByPhoneNo", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getBeneficiariesByPhone(@Param(value = "{\"phoneNo\":\"String\"}") @RequestBody String request, @@ -534,7 +523,6 @@ public String getBeneficiariesByPhone(@Param(value = "{\"phoneNo\":\"String\"}") return response.toString(); } - @CrossOrigin() @Operation(summary = "Update beneficiary community or education") @RequestMapping(value = "/updateCommunityorEducation", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateBenefciaryCommunityorEducation( @@ -564,7 +552,6 @@ public String updateBenefciaryCommunityorEducation( return response.toString(); } - @CrossOrigin() @Operation(summary = "Generate beneficiary id") @RequestMapping(value = "/generateBeneficiaryIDs", headers = "Authorization", method = { RequestMethod.POST }, produces = { "application/json" }) diff --git a/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java b/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java index cf1a2453..5645de3e 100644 --- a/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java +++ b/src/main/java/com/iemr/common/controller/brd/BRDIntegrationController.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -40,7 +39,6 @@ @RestController @RequestMapping("/brd") -@CrossOrigin() public class BRDIntegrationController { private Logger logger = LoggerFactory.getLogger(BRDIntegrationController.class); @@ -50,7 +48,6 @@ public class BRDIntegrationController { @Operation(summary = "Get integration data") @RequestMapping(value = "/getIntegrationData", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") - @CrossOrigin() public String getDetails(@RequestBody String request) { OutputResponse response = new OutputResponse(); String brdDetails = null; diff --git a/src/main/java/com/iemr/common/controller/callhandling/CallController.java b/src/main/java/com/iemr/common/controller/callhandling/CallController.java index 56deb1a2..1242bd2c 100644 --- a/src/main/java/com/iemr/common/controller/callhandling/CallController.java +++ b/src/main/java/com/iemr/common/controller/callhandling/CallController.java @@ -31,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -79,7 +78,6 @@ public void setBeneficiaryCallService(BeneficiaryCallService beneficiaryCallServ this.beneficiaryCallService = beneficiaryCallService; } - @CrossOrigin() @Operation(summary = "Get call types") @PostMapping(value = "/getCallTypes", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAllCallTypes( @@ -97,7 +95,6 @@ public String getAllCallTypes( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get call types V1") @PostMapping(value = "/getCallTypesV1", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCallTypesV1( @@ -114,7 +111,6 @@ public String getCallTypesV1( return response.toString(); } - @CrossOrigin() @Operation(summary = "Start call") @PostMapping(value = "/startCall", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String startCall( @@ -143,7 +139,6 @@ public String startCall( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update beneficiary in call") @PostMapping(value = "/updatebeneficiaryincall", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateBeneficiaryIDInCall(@Param(value = "{\"benCallID\":\"Integer - callID as in CRM\", " @@ -165,7 +160,6 @@ public String updateBeneficiaryIDInCall(@Param(value = "{\"benCallID\":\"Integer return response.toString(); } - @CrossOrigin() @Operation(summary = "Close call") @PostMapping(value = "/closeCall", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String closeCall( @@ -206,7 +200,6 @@ public String closeCall( return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound call list") @PostMapping(value = "/outboundCallList", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundCallList(@Param(value = "{\"providerServiceMapID\":\" called service ID integer\", " @@ -227,7 +220,6 @@ public String outboundCallList(@Param(value = "{\"providerServiceMapID\":\" call return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound call count") @PostMapping(value = "/outboundCallCount", consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundCallCount(@Param(value = "{\"providerServiceMapID\":\"called service ID integer\", " @@ -245,7 +237,6 @@ public String outboundCallCount(@Param(value = "{\"providerServiceMapID\":\"call return response.toString(); } - @CrossOrigin() @Operation(summary = "Filter call list") @RequestMapping(value = "/filterCallList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String filterCallList( @@ -267,7 +258,6 @@ public String filterCallList( return response.toString(); } - @CrossOrigin() @Operation(summary = "Filter call list page") @RequestMapping(value = "/filterCallListPage", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String filterCallListPaginated(@Param(value = "{\"calledServiceID\":\" called service ID integer\", " @@ -288,7 +278,6 @@ public String filterCallListPaginated(@Param(value = "{\"calledServiceID\":\" ca return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound allocation") @RequestMapping(value = "/outboundAllocation", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundAllocation(@Param(value = "{\"userID\":[Integer Array list of user IDs], " @@ -305,7 +294,6 @@ public String outboundAllocation(@Param(value = "{\"userID\":[Integer Array list return response.toString(); } - @CrossOrigin() @Operation(summary = "Complete outbound call") @RequestMapping(value = "/completeOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String completeOutboundCall(@Param(value = "{\"outboundCallReqID\":\"Integer - Outbound call id\", " @@ -322,7 +310,6 @@ public String completeOutboundCall(@Param(value = "{\"outboundCallReqID\":\"Inte return response.toString(); } - @CrossOrigin() @Operation(summary = "Update outbound call") @RequestMapping(value = "/updateOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateOutboundCall(@Param(value = "{\"outboundCallReqID\":\"Integer - Outbound call id\", " @@ -340,7 +327,6 @@ public String updateOutboundCall(@Param(value = "{\"outboundCallReqID\":\"Intege return response.toString(); } - @CrossOrigin() @Operation(summary = "Reset outbound call") @RequestMapping(value = "/resetOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String resetOutboundCall( @@ -356,7 +342,6 @@ public String resetOutboundCall( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get blacklist numbers") @RequestMapping(value = "/getBlacklistNumbers", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getBlacklistNumbers( @@ -375,7 +360,6 @@ public String getBlacklistNumbers( return response.toString(); } - @CrossOrigin() @Operation(summary = "Unblock blocked numbers") @RequestMapping(value = "/unblockBlockedNumbers", method = RequestMethod.GET, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String unblockBlockedNumbers() { @@ -390,7 +374,6 @@ public String unblockBlockedNumbers() { return response.toString(); } - @CrossOrigin() @Operation(summary = "Block phone number") @RequestMapping(value = "/blockPhoneNumber", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String blockPhoneNumber( @@ -406,7 +389,6 @@ public String blockPhoneNumber( return response.toString(); } - @CrossOrigin() @Operation(summary = "Unblock phone number") @RequestMapping(value = "/unblockPhoneNumber", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String unblockPhoneNumber( @@ -422,7 +404,6 @@ public String unblockPhoneNumber( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update beneficiary call CDI status") @RequestMapping(value = "/updateBeneficiaryCallCDIStatus", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateBeneficiaryCallCDIStatus(@Param(value = "{\"benCallID\":\"Integer - callID as in CRM\", " @@ -443,7 +424,6 @@ public String updateBeneficiaryCallCDIStatus(@Param(value = "{\"benCallID\":\"In return response.toString(); } - @CrossOrigin() @Operation(summary = "Get call history by call id") @RequestMapping(value = "/getCallHistoryByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCallHistoryByCallID( @@ -459,7 +439,6 @@ public String getCallHistoryByCallID( return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound call list by call id") @RequestMapping(value = "/outboundCallListByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundCallListByCallID(@Param(value = "{\"providerServiceMapID\":\"called service ID integer\", " @@ -475,7 +454,6 @@ public String outboundCallListByCallID(@Param(value = "{\"providerServiceMapID\" return response.toString(); } - @CrossOrigin() @Operation(summary = "Nuisance call history") @RequestMapping(value = "/nueisanceCallHistory", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String nueisanceCallHistory( @@ -495,7 +473,6 @@ public String nueisanceCallHistory( return response.toString(); } - @CrossOrigin() @Operation(summary = "Beneficiary by call id") @RequestMapping(value = "/beneficiaryByCallID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String beneficiaryByCallID(@Param("{\"callID\":\"String\"}") @RequestBody CallRequestByIDModel request, @@ -515,7 +492,6 @@ public String beneficiaryByCallID(@Param("{\"callID\":\"String\"}") @RequestBody return response.toString(); } - @CrossOrigin() @Operation(summary = "Get calls by beneficiary regitration id and received role name") @RequestMapping(value = "/isAvailed", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String isAvailed(@Param(value = "{\"beneficiaryRegID\":\"beneficiary reg id\", " @@ -523,7 +499,7 @@ public String isAvailed(@Param(value = "{\"beneficiaryRegID\":\"beneficiary reg OutputResponse response = new OutputResponse(); try { ObjectMapper objectMapper = new ObjectMapper(); - BeneficiaryCallModel beneficiaryCallModel = objectMapper.readValue(request, BeneficiaryCallModel.class); + BeneficiaryCallModel beneficiaryCallModel = objectMapper.readValue(request, BeneficiaryCallModel.class); response.setResponse(beneficiaryCallService .isAvailed(beneficiaryCallModel).toString()); } catch (Exception e) { @@ -533,7 +509,6 @@ public String isAvailed(@Param(value = "{\"beneficiaryRegID\":\"beneficiary reg return response.toString(); } - @CrossOrigin() @Operation(summary = "Get beneficiary requested outbound call") @RequestMapping(value = "/getBenRequestedOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getBenRequestedOutboundCall(@Param(value = "{\"beneficiaryRegID\":\"beneficiary reg id\", " @@ -552,7 +527,6 @@ public String getBenRequestedOutboundCall(@Param(value = "{\"beneficiaryRegID\": return response.toString(); } - @CrossOrigin() @Operation(summary = "Auto preview dialing") @RequestMapping(value = "/isAutoPreviewDialing", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String isAutoPreviewDialing(@Param(value = "{\"providerServiceMapID\":\"called service ID integer\", " @@ -571,7 +545,6 @@ public String isAutoPreviewDialing(@Param(value = "{\"providerServiceMapID\":\"c return response.toString(); } - @CrossOrigin() @Operation(summary = "Check auto preview dialing") @RequestMapping(value = "/checkAutoPreviewDialing", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String checkAutoPreviewDialing( @@ -590,7 +563,6 @@ public String checkAutoPreviewDialing( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get file path CTI") @RequestMapping(value = "/getFilePathCTI", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFilePathCTI( @@ -614,7 +586,6 @@ public String getFilePathCTI( @Autowired private SessionObject s; - @CrossOrigin() @Operation(summary = "Redis insert") @RequestMapping(value = "/redisInsert", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String redisInsert(@RequestBody String request) { @@ -630,7 +601,6 @@ public String redisInsert(@RequestBody String request) { } - @CrossOrigin() @Operation(summary = "Redis fetch") @RequestMapping(value = "/redisFetch", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String redisFetch(@Param("{\"sessionID\":\"sessionID/callID String\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java b/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java index 5aa78cd9..ae0b325a 100644 --- a/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java +++ b/src/main/java/com/iemr/common/controller/carestream/CareStreamCreateOrderController.java @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.PropertySource; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -60,7 +59,6 @@ public class CareStreamCreateOrderController { @Value("${carestream_socket_port}") private int carestreamSocketPort; - @CrossOrigin() @Operation(summary = "Create order") @RequestMapping(value = "/createOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = { "application/json" }) @@ -122,7 +120,6 @@ public String createOrder(@Param("{\"firstName\":\"String\",\"middleName\":\"Str return response.toString(); } - @CrossOrigin() @Operation(summary = "Update order") @RequestMapping(value = "/UpdateOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = { "application/json" }) @@ -184,7 +181,6 @@ public String updateOrder(@Param("{\"firstName\":\"String\",\"middleName\":\"Str return response.toString(); } - @CrossOrigin() @Operation(summary = "Delete order") @RequestMapping(value = "/deleteOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = { "application/json" }) diff --git a/src/main/java/com/iemr/common/controller/covid/CovidVaccinationController.java b/src/main/java/com/iemr/common/controller/covid/CovidVaccinationController.java index a144e7c4..0712fe17 100644 --- a/src/main/java/com/iemr/common/controller/covid/CovidVaccinationController.java +++ b/src/main/java/com/iemr/common/controller/covid/CovidVaccinationController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -59,7 +58,6 @@ public class CovidVaccinationController { * @return list of vaccination type and dose taken */ - @CrossOrigin @Operation(summary = "Master Data for Vaccination Type & Dose Taken") @GetMapping(value = { "/master/VaccinationTypeAndDoseTaken" }, produces = MediaType.APPLICATION_JSON) @@ -84,7 +82,6 @@ public String getVaccinationTypeAndDoseTaken(@RequestHeader(value = "Authorizati * @param Authorization * @return Covid vaccination details of a beneficiary */ - @CrossOrigin @Operation(summary = "Getting beneficiary covid vaccination details") @PostMapping(value = { "/getCovidVaccinationDetails" }) @@ -128,7 +125,6 @@ public String getCovidVaccinationDetails( * @return Saving beneficiary vaccination details */ - @CrossOrigin @Operation(summary = "Save beneficiary covid vaccination details") @PostMapping(value = { "/saveCovidVaccinationDetails" }) public String saveCovidVaccinationDetails( diff --git a/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java b/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java index 61c8ec19..711019eb 100644 --- a/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java +++ b/src/main/java/com/iemr/common/controller/cti/ComputerTelephonyIntegrationController.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -56,7 +55,6 @@ public void setCtiService(CTIService ctiService) { this.ctiService = ctiService; } - @CrossOrigin() @Operation(summary = "Get campaign skills") @PostMapping(value = "/getCampaignSkills", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCampaignSkills( @@ -78,7 +76,6 @@ public String getCampaignSkills( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get agent state") @PostMapping(value = "/getAgentState", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAgentState(@Param("{\"agent_id\":\"String: agent id\"}") @RequestBody String request, @@ -99,7 +96,6 @@ public String getAgentState(@Param("{\"agent_id\":\"String: agent id\"}") @Reque return response.toString(); } - @CrossOrigin() @Operation(summary = "Get agent call stats") @PostMapping(value = "/getAgentCallStats", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAgentCallStats(@Param("{\"agent_id\":\"String: agent id\"}") @RequestBody String request, @@ -120,7 +116,6 @@ public String getAgentCallStats(@Param("{\"agent_id\":\"String: agent id\"}") @R return response.toString(); } - @CrossOrigin() @Operation(summary = "Get campaign names") @PostMapping(value = "/getCampaignNames", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCampaignNames( @@ -143,7 +138,6 @@ public String getCampaignNames( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get login key") @PostMapping(value = "/getLoginKey", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getLoginKey( @@ -165,7 +159,6 @@ public String getLoginKey( return response.toString(); } - @CrossOrigin() @Operation(summary = "Do agent logout") @PostMapping(value = "/doAgentLogout", produces = MediaType.APPLICATION_JSON) public String doAgentLogout(@Param("{\"agent_id\":\"String: agent id\"}") @RequestBody String request, @@ -186,7 +179,6 @@ public String doAgentLogout(@Param("{\"agent_id\":\"String: agent id\"}") @Reque return response.toString(); } - @CrossOrigin() @Operation(summary = "Get online agents") @PostMapping(value = "/getOnlineAgents", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getOnlineAgents(@Param("{\"agent_id\":\"String: agent id\"}") @RequestBody String request, @@ -207,7 +199,6 @@ public String getOnlineAgents(@Param("{\"agent_id\":\"String: agent id\"}") @Req return response.toString(); } - @CrossOrigin() @Operation(summary = "Call beneficiary") @PostMapping(value = "/callBeneficiary", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String callBeneficiary( @@ -229,7 +220,6 @@ public String callBeneficiary( return response.toString(); } - @CrossOrigin() @Operation(summary = "Add update user data") @PostMapping(value = "/addUpdateUserData", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String addUpdateUserData( @@ -254,7 +244,6 @@ public String addUpdateUserData( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get transfer campaigns") @PostMapping(value = "/getTransferCampaigns", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getTransferCampaigns(@Param("{\"agent_id\":\"String: agentID\"}") @RequestBody String request, @@ -275,7 +264,6 @@ public String getTransferCampaigns(@Param("{\"agent_id\":\"String: agentID\"}") return response.toString(); } - @CrossOrigin() @Operation(summary = "Get campaign roles") @PostMapping(value = "/getCampaignRoles", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCampaignRoles(@Param("{\"campaign\":\"String: campaign name\"}") @RequestBody String request, @@ -296,7 +284,6 @@ public String getCampaignRoles(@Param("{\"campaign\":\"String: campaign name\"}" return response.toString(); } - @CrossOrigin() @Operation(summary = "Set call disposition") @PostMapping(value = "/setCallDisposition", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String setCallDisposition( @@ -319,7 +306,6 @@ public String setCallDisposition( return response.toString(); } - @CrossOrigin() @Operation(summary = "Create voice file") @PostMapping(value = "/createVoiceFile", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String createVoiceFile( @@ -342,7 +328,6 @@ public String createVoiceFile( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get voice file") @PostMapping(value = "/getVoiceFile", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getVoiceFile( @@ -365,7 +350,6 @@ public String getVoiceFile( return response.toString(); } - @CrossOrigin() @Operation(summary = "Disconnect call") @PostMapping(value = "/disconnectCall", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String disconnectCall(@Param("{\"agent_id\":\"String: agentID\"}") @RequestBody String request, @@ -386,7 +370,6 @@ public String disconnectCall(@Param("{\"agent_id\":\"String: agentID\"}") @Reque return response.toString(); } - @CrossOrigin() @Operation(summary = "Switch to inbound") @PostMapping(value = "/switchToInbound", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String switchToInbound(@Param("{\"agent_id\":\"String: agentID\"}") @RequestBody String request, @@ -407,7 +390,6 @@ public String switchToInbound(@Param("{\"agent_id\":\"String: agentID\"}") @Requ return response.toString(); } - @CrossOrigin() @Operation(summary = "Switch to outbound") @PostMapping(value = "/switchToOutbound", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String switchToOutbound(@Param("{\"agent_id\":\"String: agentID\"}") @RequestBody String request, @@ -428,7 +410,6 @@ public String switchToOutbound(@Param("{\"agent_id\":\"String: agentID\"}") @Req return response.toString(); } - @CrossOrigin() @Operation(summary = "Get agent IP address") @PostMapping(value = "/getAgentIPAddress", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAgentIPAddress(@Param("{\"agent_id\":\"String: agentID\"}") @RequestBody String request, @@ -449,7 +430,6 @@ public String getAgentIPAddress(@Param("{\"agent_id\":\"String: agentID\"}") @Re return response.toString(); } - @CrossOrigin() @Operation(summary = "Get available agent skills") @PostMapping(value = "/getAvailableAgentSkills", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAvailableAgentSkills( @@ -472,7 +452,6 @@ public String getAvailableAgentSkills( return response.toString(); } - @CrossOrigin() @Operation(summary = "Transfer call") @PostMapping(value = "/transferCall", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String transferCall(@Param("{\"transfer_from\":\"String - agent id who is transferring call\", " @@ -498,7 +477,6 @@ public String transferCall(@Param("{\"transfer_from\":\"String - agent id who is return response.toString(); } - @CrossOrigin() @Operation(summary = "Customer preferred language") @PostMapping(value = "/customerPreferredLanguage", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String customerPreferredLanguage( @@ -524,7 +502,6 @@ public String customerPreferredLanguage( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get IVRS path details") @PostMapping(value = "/getIVRSPathDetails", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getIVRSPathDetails(@Param("{\"agent_id\":\"Integer\"}") @RequestBody String request, diff --git a/src/main/java/com/iemr/common/controller/customization/CustomizationController.java b/src/main/java/com/iemr/common/controller/customization/CustomizationController.java index f51c01b9..01a983b1 100644 --- a/src/main/java/com/iemr/common/controller/customization/CustomizationController.java +++ b/src/main/java/com/iemr/common/controller/customization/CustomizationController.java @@ -6,7 +6,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -30,7 +29,6 @@ public class CustomizationController { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Add project") @RequestMapping(value = "/addProject", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String addProject(@RequestBody String request, @@ -46,8 +44,6 @@ public String addProject(@RequestBody String request, } return response.toString(); } - - @CrossOrigin @Operation(summary = "Fetch project names") @RequestMapping(value = "/get/projectNames/{serviceProviderId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getProjectNames(@PathVariable Integer serviceProviderId) { @@ -62,8 +58,6 @@ public String getProjectNames(@PathVariable Integer serviceProviderId) { return response.toString(); } - - @CrossOrigin() @Operation(summary = "Update project") @RequestMapping(value = "/updateProject", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -79,8 +73,6 @@ public String updateProject(@RequestBody String request, } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Save project to serviceline") @RequestMapping(value = "/saveProjectToServiceline", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String saveProjectToServiceline(@RequestBody String request, @@ -97,7 +89,6 @@ public String saveProjectToServiceline(@RequestBody String request, return response.toString(); } - @CrossOrigin() @Operation(summary = "Fetch project serviceline") @RequestMapping(value = "/fetchProjectServiceline", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String fetchProjectServiceline(@RequestBody String request, @@ -113,8 +104,6 @@ public String fetchProjectServiceline(@RequestBody String request, } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Update project to serviceline") @RequestMapping(value = "/updateProjectToServiceline", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateProjectToServiceline(@RequestBody String request, @@ -130,8 +119,6 @@ public String updateProjectToServiceline(@RequestBody String request, } return response.toString(); } - - @CrossOrigin @Operation(summary = "Fetch section masters") @RequestMapping(value = "/get/sections", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSections() { @@ -146,8 +133,6 @@ public String getSections() { return response.toString(); } - - @CrossOrigin() @Operation(summary = "Update section and fields") @RequestMapping(value = "/updateSectionAndFields", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateSectionAndFields(@RequestBody String request, @@ -162,8 +147,6 @@ public String updateSectionAndFields(@RequestBody String request, } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Save section and fields") @RequestMapping(value = "/saveSectionAndFields", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String saveSectionAndFields(@RequestBody SectionFieldsMappingDTO sectionFieldsMappingDTO, @@ -178,8 +161,6 @@ public String saveSectionAndFields(@RequestBody SectionFieldsMappingDTO sectionF } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Section and project mapping") @RequestMapping(value = "/mapSectionToProject", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String mapSectionToProject(@RequestBody SectionProjectMappingDTO sectionProjectMappingDTO, @@ -195,8 +176,6 @@ public String mapSectionToProject(@RequestBody SectionProjectMappingDTO sectionP } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Fetch mapped sections in project") @RequestMapping(value = "/fetchMappedSectionsInProject", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String fetchMappedSectionsInProject(@RequestBody String request, @@ -212,8 +191,6 @@ public String fetchMappedSectionsInProject(@RequestBody String request, } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Fetch mapped fields") @RequestMapping(value = "/fetchMappedFields", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String fetchMappedFields(@RequestBody String request, @@ -229,8 +206,6 @@ public String fetchMappedFields(@RequestBody String request, } return response.toString(); } - - @CrossOrigin() @Operation(summary = "Fetch all data") @RequestMapping(value = "/fetchAllData", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String fetchAllData(@RequestBody String request, @@ -246,8 +221,6 @@ public String fetchAllData(@RequestBody String request, } return response.toString(); } - - @CrossOrigin @Operation(summary = "Fetch field masters") @RequestMapping(value = "/get/fileldType", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getfileldType() { diff --git a/src/main/java/com/iemr/common/controller/directory/DirectoryController.java b/src/main/java/com/iemr/common/controller/directory/DirectoryController.java index 96d2b0b9..e97fb524 100644 --- a/src/main/java/com/iemr/common/controller/directory/DirectoryController.java +++ b/src/main/java/com/iemr/common/controller/directory/DirectoryController.java @@ -29,7 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -79,7 +78,6 @@ public void setDirectoryMappingService(DirectoryMappingService directoryMappingS private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Get directory") @RequestMapping(value = "/getDirectory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -100,7 +98,6 @@ public String getDirectory() return response.toString(); } - @CrossOrigin() @Operation(summary = "Get directory V1") @RequestMapping(value = "/getDirectoryV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -124,7 +121,6 @@ public String getDirectoryV1( return response.toString(); } - @CrossOrigin() @Operation(summary = "This API is used for getting subdirectories for a given institute directory") @RequestMapping(value = "/getSubDirectory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -148,7 +144,6 @@ public String getSubDirectory(@Param("{\"instituteDirectoryID\":\"Integer\"}") @ return response.toString(); } - @CrossOrigin() @Operation(summary = "This API is used for getting institutes for a given directory, subdirectory and location") @RequestMapping(value = "/getInstitutesDirectories", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") diff --git a/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java b/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java index ed373995..3e0d3ae3 100644 --- a/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java +++ b/src/main/java/com/iemr/common/controller/door_to_door_app/DoorToDoorAppController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -38,8 +37,6 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController @RequestMapping(value = "/doortodoorapp", headers = "Authorization") public class DoorToDoorAppController { @@ -49,7 +46,6 @@ public class DoorToDoorAppController { @Autowired private DoorToDoorService doorToDoorService; - @CrossOrigin @Operation(summary = "Get user details") @RequestMapping(value = { "/getUserDetails" }, method = { RequestMethod.POST }, consumes = "application/json", produces = "application/json") public String getUserDetails(@RequestBody String requestObj) { @@ -70,7 +66,6 @@ public String getUserDetails(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get NCD TB HRP suspected status") @PostMapping(value = { "/getSuspectedData_HRP_TB_NCD" }, consumes = "application/json", produces = "application/json") public String getSuspectedData_HRP_TB_NCD(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/common/controller/eausadha/EAusadhaController.java b/src/main/java/com/iemr/common/controller/eausadha/EAusadhaController.java index 2af9f6d2..873d31b1 100644 --- a/src/main/java/com/iemr/common/controller/eausadha/EAusadhaController.java +++ b/src/main/java/com/iemr/common/controller/eausadha/EAusadhaController.java @@ -3,7 +3,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -24,7 +23,6 @@ public class EAusadhaController { private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin @PostMapping(value = { "/create-eAusadha" }) public String createEAusadha(@RequestBody EAusadhaDTO eAusadhaDTO, @RequestHeader(value = "Authorization") String Authorization) { OutputResponse response = new OutputResponse(); diff --git a/src/main/java/com/iemr/common/controller/email/EmailController.java b/src/main/java/com/iemr/common/controller/email/EmailController.java index 4e654ada..9766ff40 100644 --- a/src/main/java/com/iemr/common/controller/email/EmailController.java +++ b/src/main/java/com/iemr/common/controller/email/EmailController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -55,7 +54,6 @@ public void setEmailService(EmailService emailService) { this.emailService = emailService; } - @CrossOrigin @Operation(summary = "Send email") @PostMapping(value = "/SendEmail", headers = "Authorization") public String SendEmail( @@ -74,7 +72,6 @@ public String SendEmail( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get authority email id") @PostMapping(value = "/getAuthorityEmailID", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAuthorityEmailID(@Param(value = "{districtID : Integer}") @RequestBody String severityRequest) { @@ -89,7 +86,6 @@ public String getAuthorityEmailID(@Param(value = "{districtID : Integer}") @Requ return response.toString(); } - @CrossOrigin @Operation(summary = "Send email general") @PostMapping(value = "/sendEmailGeneral", headers = "Authorization") public String sendEmailGeneral( diff --git a/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java b/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java index 85fdbb28..4c1e7164 100644 --- a/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java +++ b/src/main/java/com/iemr/common/controller/esanjeevani/ESanjeevaniController.java @@ -3,7 +3,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -17,8 +16,6 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RestController @RequestMapping(value = "/esanjeevani", headers = "Authorization") public class ESanjeevaniController { @@ -28,7 +25,6 @@ public class ESanjeevaniController { private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin @Operation(summary = "Register patient in E-Sanjeevani and send portal url to route") @GetMapping(value = { "/getESanjeevaniUrl/{beneficiaryReqId}" }, consumes = "application/json", produces = "application/json") public String registerESanjeevaniPatient(@PathVariable Long beneficiaryReqId) { diff --git a/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java b/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java index 787c7654..dcd346a0 100644 --- a/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java +++ b/src/main/java/com/iemr/common/controller/everwell/callhandle/EverwellCallController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -48,7 +47,6 @@ public class EverwellCallController { InputMapper inputMapper = new InputMapper(); final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Outbound call count") @RequestMapping(value = "/outboundCallCount", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundCallCount(@Param(value = "{\"providerServiceMapID\":\"called service ID integer\", " @@ -65,7 +63,6 @@ public String outboundCallCount(@Param(value = "{\"providerServiceMapID\":\"call return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound allocation") @RequestMapping(value = "/outboundAllocation", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundAllocation(@Param(value = "{\"AgentID\":[Integer Array list of Agent IDs], " @@ -82,7 +79,6 @@ public String outboundAllocation(@Param(value = "{\"AgentID\":[Integer Array lis return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound call list") @RequestMapping(value = "/outboundCallList", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundCallList(@Param(value = "{\"providerServiceMapID\":\" called service ID integer\", " @@ -99,7 +95,6 @@ public String outboundCallList(@Param(value = "{\"providerServiceMapID\":\" call return response.toString(); } - @CrossOrigin() @Operation(summary = "Reset outbound call") @RequestMapping(value = "/resetOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String resetOutboundCall( @@ -115,7 +110,6 @@ public String resetOutboundCall( return response.toString(); } - @CrossOrigin() @Operation(summary = "Save feedback") @RequestMapping(value = "/saveFeedback", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String saveCallDetails( @@ -131,7 +125,6 @@ public String saveCallDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Complete outbound call") @RequestMapping(value = "/completeOutboundCall", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String completeOutboundCall(@Param(value = "{\"EAPIID\":\"Integer - Outbound call id\", " @@ -150,7 +143,6 @@ public String completeOutboundCall(@Param(value = "{\"EAPIID\":\"Integer - Outbo return response.toString(); } - @CrossOrigin() @Operation(summary = "Get everwell feedback details") @RequestMapping(value = "/getEverwellfeedbackDetails", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getEverwellfeedbackDetails( @@ -169,7 +161,6 @@ public String getEverwellfeedbackDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Outbound call list with mobile number") @RequestMapping(value = "/outboundCallListWithMobileNumber", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String outboundCallListWithMobileNumber( @@ -184,7 +175,6 @@ public String outboundCallListWithMobileNumber( return response.toString(); } - @CrossOrigin() @Operation(summary = "Check if already called") @RequestMapping(value = "/checkIfAlreadyCalled", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String checkIfCalledOrNot(@Param(value = "{\"providerServiceMapID\":\" called service ID integer\", " diff --git a/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java b/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java index 8fd48bb2..12ad60fd 100644 --- a/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java +++ b/src/main/java/com/iemr/common/controller/everwellTest/EverwellController.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -45,7 +44,6 @@ public class EverwellController { InputMapper inputMapper = new InputMapper(); Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Get data") @RequestMapping(value = "/getjson", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getdata() { @@ -74,7 +72,6 @@ public String getdata() { return response.toString(); } - @CrossOrigin() @Operation(summary = "Add support action") @RequestMapping(value = { "/addSupportAction/{id}" }, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -95,7 +92,6 @@ public String addSupportAction(@PathVariable("id") Long id, @RequestBody String return response.toString(); } - @CrossOrigin() @Operation(summary = "Edit manual doses") @RequestMapping(value = { "/editManualDoses/{id}" }, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -112,7 +108,6 @@ public String editManualDoses(@PathVariable("id") Long id, @RequestBody String r return response.toString(); } - @CrossOrigin() @Operation(summary = "Everwell login") @RequestMapping(value = "/login", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String everwellLogin(@RequestBody LoginRequestModelEverwell login) { diff --git a/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java b/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java index 421d1202..687adb0d 100644 --- a/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java +++ b/src/main/java/com/iemr/common/controller/feedback/FeedbackController.java @@ -32,7 +32,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -96,7 +95,6 @@ public void setFeedbackRequestService(FeedbackRequestService feedbackRequestServ this.feedbackRequestService = feedbackRequestService; } - @CrossOrigin() @Operation(summary = "Beneficiary request") @RequestMapping(value = "/beneficiaryRequests", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String feedbackRequest(@RequestBody String request) { @@ -113,7 +111,6 @@ public String feedbackRequest(@RequestBody String request) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get feedback from feedback id") @RequestMapping(value = "/getfeedback/{feedbackID}", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFeedbackByPost(@PathVariable("feedbackID") Long feedbackID) { @@ -129,7 +126,6 @@ public String getFeedbackByPost(@PathVariable("feedbackID") Long feedbackID) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Create feedback") @RequestMapping(value = "/createFeedback", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String createFeedback(@RequestBody String feedbackDetails) { @@ -145,7 +141,6 @@ public String createFeedback(@RequestBody String feedbackDetails) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Feedback list") @RequestMapping(value = "/feedbacksList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String feedbacksList(@RequestBody String request) { @@ -163,7 +158,6 @@ public String feedbacksList(@RequestBody String request) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get feedback") @RequestMapping(value = "/getFeedback", method = RequestMethod.POST, headers = "Authorization") public String getFeedback(@RequestBody String feedbackRequest) { @@ -178,7 +172,6 @@ public String getFeedback(@RequestBody String feedbackRequest) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Update feedback") @RequestMapping(value = "/updatefeedback", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateFeedback(@RequestBody String feedbackDetails) { @@ -192,7 +185,6 @@ public String updateFeedback(@RequestBody String feedbackDetails) { return response.toString(); } - @CrossOrigin @Operation(summary = "Create a new beneficiary") @RequestMapping(value = "/updateFeedbackStatus", method = RequestMethod.POST, headers = "Authorization") public String updateFeedbackStatus(@RequestBody String feedbackDetails) { @@ -208,7 +200,6 @@ public String updateFeedbackStatus(@RequestBody String feedbackDetails) { return response.toString(); } - @CrossOrigin @Operation(summary = "Search feedback") @RequestMapping(value = "/searchFeedback", method = RequestMethod.POST, headers = "Authorization") public String searchFeedback(@RequestBody String feedbackDetails) { @@ -224,7 +215,6 @@ public String searchFeedback(@RequestBody String feedbackDetails) { return response.toString(); } - @CrossOrigin @Operation(summary = "Search feedback1") @RequestMapping(value = "/searchFeedback1", method = RequestMethod.POST, headers = "Authorization") public String searchFeedback1(@RequestBody String feedbackDetails) { @@ -240,7 +230,6 @@ public String searchFeedback1(@RequestBody String feedbackDetails) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get all feedback") @RequestMapping(value = "/getAllFeedbackById", method = RequestMethod.POST, headers = "Authorization") public String getAllFeedbackById(@RequestBody String feedbackrequest) { @@ -256,7 +245,6 @@ public String getAllFeedbackById(@RequestBody String feedbackrequest) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get all feedback by id") @RequestMapping(value = "/getAllFeedbackById1", method = RequestMethod.POST, headers = "Authorization") public String getAllfeedback(@RequestBody FeedbackResponse tfeedbackresponce) { @@ -283,7 +271,6 @@ public String getAllfeedback(@RequestBody FeedbackResponse tfeedbackresponce) { return OutputMapper.gsonWithoutExposeRestriction().toJson(resList); } - @CrossOrigin @Operation(summary = "Get feedback status") @RequestMapping(value = "/getFeedbackStatus", method = RequestMethod.POST, headers = "Authorization") public String getFeedbackStatusTypes(@RequestBody String request) { @@ -296,7 +283,6 @@ public String getFeedbackStatusTypes(@RequestBody String request) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get email status") @RequestMapping(value = "/getEmailStatus", method = RequestMethod.POST, headers = "Authorization") public String getEmailStatus(@RequestBody String request) { @@ -309,7 +295,6 @@ public String getEmailStatus(@RequestBody String request) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get feedback request by id") @RequestMapping(value = "/getFeedbackRequestById", method = RequestMethod.POST, headers = "Authorization") public String getFeedbackRequestById(@RequestBody String feedbackrequest) { @@ -325,7 +310,6 @@ public String getFeedbackRequestById(@RequestBody String feedbackrequest) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get feedback response by id") @RequestMapping(value = "/getFeedbackResponseById", method = RequestMethod.POST, headers = "Authorization") public String getFeedbackResponseById(@RequestBody String feedbackrequest) { @@ -341,7 +325,6 @@ public String getFeedbackResponseById(@RequestBody String feedbackrequest) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get feedback list") @RequestMapping(value = "/getFeedbacksList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFeedbacksList(@RequestBody FeedbackListRequestModel feedbackDetails, @@ -361,7 +344,6 @@ public String getFeedbacksList(@RequestBody FeedbackListRequestModel feedbackDet } - @CrossOrigin @Operation(summary = "Update response") @PostMapping(value = "/updateResponse", headers = "Authorization") public String updateResponse(@RequestBody String feedbackresponce) { @@ -378,7 +360,6 @@ public String updateResponse(@RequestBody String feedbackresponce) { return response.toString(); } - @CrossOrigin @Operation(summary = "Request feedback") @RequestMapping(value = "/requestFeedback", method = RequestMethod.POST, headers = "Authorization") public String requestFeedback(@RequestBody String feedbackRequest) { @@ -402,7 +383,6 @@ public void setFeedbackSeverityService(FeedbackSeverityServiceImpl feedbackSever this.feedbackSeverityService = feedbackSeverityService; } - @CrossOrigin() @Operation(summary = "Get severity") @RequestMapping(value = "/getSeverity", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFeedbackSeverity( @@ -421,7 +401,6 @@ public String getFeedbackSeverity( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get feedback type") @RequestMapping(value = "/getFeedbackType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFeedbackType( @@ -440,7 +419,6 @@ public String getFeedbackType( return response.toString(); } - @CrossOrigin @Operation(summary = "Get grievances by created date") @RequestMapping(value = "/getGrievancesByCreatedDate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getGrievancesByCreatedDate(@RequestBody FeedbackListRequestModel feedbackDetails, @@ -457,7 +435,6 @@ public String getGrievancesByCreatedDate(@RequestBody FeedbackListRequestModel f return response.toString(); } - @CrossOrigin @Operation(summary = "Get grievances by updated date") @RequestMapping(value = "/getGrievancesByUpdatedDate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getGrievancesByUpdatedDate(@RequestBody FeedbackListRequestModel feedbackDetails, @@ -474,7 +451,6 @@ public String getGrievancesByUpdatedDate(@RequestBody FeedbackListRequestModel f return response.toString(); } - @CrossOrigin @Operation(summary = "Save feedback request") @RequestMapping(value = "/saveFeedbackRequest", method = RequestMethod.POST, headers = "Authorization") public String createFeedbackRequest(@RequestBody String feedbackRequest) { @@ -489,7 +465,6 @@ public String createFeedbackRequest(@RequestBody String feedbackRequest) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get feedback logs") @RequestMapping(value = "/getFeedbackLogs", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFeedbackLogs(@RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java b/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java index bdbcfa12..124de9df 100644 --- a/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java +++ b/src/main/java/com/iemr/common/controller/helpline104history/Helpline104BeneficiaryHistoryController.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -59,7 +58,6 @@ public class Helpline104BeneficiaryHistoryController { @Autowired private H104BenHistoryServiceImpl smpleBenHistoryServiceImpl; - @CrossOrigin @Operation(summary= "Retrieve beneficiary case record") @PostMapping(value = "/get104BenMedHistory", headers = "Authorization", consumes = "application/json", produces = "application/json") diff --git a/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java b/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java index 892f4d5b..6cfcb847 100644 --- a/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java +++ b/src/main/java/com/iemr/common/controller/honeywell/HoneywellController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -39,7 +38,6 @@ import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; -@CrossOrigin @RequestMapping({ "/honeywell" }) @RestController public class HoneywellController { @@ -48,7 +46,6 @@ public class HoneywellController { @Autowired private HoneywellService honeywellService; - @CrossOrigin @Operation(summary = "Get real time district wise call report") @RequestMapping(value = "/realtimeDistrictDistribution", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRealtimeDistrictWiseCallReport() { @@ -62,7 +59,6 @@ public String getRealtimeDistrictWiseCallReport() { return response.toString(); } - @CrossOrigin @Operation(summary = "District wise call distribution") @RequestMapping(value = "/districtWiseCallDistribution", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getDistrictWiseCallReport(@RequestBody String request, HttpServletRequest httpRequest) { @@ -77,7 +73,6 @@ public String getDistrictWiseCallReport(@RequestBody String request, HttpServlet return response.toString(); } - @CrossOrigin @Operation(summary = "Urban and rural calls") @RequestMapping(value = "/urban_rural_calls", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getUrbanRuralCallReport(@RequestBody String request, HttpServletRequest httpRequest) { diff --git a/src/main/java/com/iemr/common/controller/institute/InstituteController.java b/src/main/java/com/iemr/common/controller/institute/InstituteController.java index 39658077..7f27fe92 100644 --- a/src/main/java/com/iemr/common/controller/institute/InstituteController.java +++ b/src/main/java/com/iemr/common/controller/institute/InstituteController.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -75,7 +74,6 @@ public void setDesignationService(DesignationService designationService) { this.designationService = designationService; } - @CrossOrigin() @Operation(summary = "Get institutes by location") @RequestMapping(value = "/getInstitutesByLocation", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getInstitutesByLocation(@RequestBody String instituteRequest) { @@ -96,7 +94,6 @@ public String getInstitutesByLocation(@RequestBody String instituteRequest) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get institute by branch") @RequestMapping(value = { "/getInstituteByBranch" }, method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -117,7 +114,6 @@ public String getInstituteByBranch(@RequestBody String instituteRequest) { return responseObj.toString(); } - @CrossOrigin() @Operation(summary = "Get institute type") @RequestMapping(value = "/getInstituteTypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getInstituteTypes( @@ -134,7 +130,6 @@ public String getInstituteTypes( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get institute name") @RequestMapping(value = "/getInstituteName/{institutionTypeID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getInstituteName(@PathVariable("institutionTypeID") Integer institutionTypeID) { @@ -150,7 +145,6 @@ public String getInstituteName(@PathVariable("institutionTypeID") Integer instit return response.toString(); } - @CrossOrigin() @Operation(summary = "Get designation") @RequestMapping(value = { "/getDesignations" }, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") @@ -167,7 +161,6 @@ public String getDesignations() { } - @CrossOrigin() @Operation(summary = "Get institute name by type and district") @RequestMapping(value = "/getInstituteNameByTypeAndDistrict/{institutionTypeID}/{districtID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getInstituteNameByTypeAndDistrict(@PathVariable("institutionTypeID") Integer institutionTypeID, diff --git a/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java b/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java index cc142706..75c92bc8 100644 --- a/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java +++ b/src/main/java/com/iemr/common/controller/kmfilemanager/KMFileManagerController.java @@ -29,7 +29,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -78,7 +77,6 @@ public KMFileManagerController(CommonServiceImpl commonServiceImpl) { } - @CrossOrigin() @Operation(summary = "Save beneficairy documents locally") @PostMapping(value = { "/saveFiles" }, consumes = "application/json", produces = "application/json") public String saveFiles(@RequestBody String request) { @@ -99,9 +97,6 @@ public String saveFiles(@RequestBody String request) { return response.toString(); } - - - @CrossOrigin @Operation(summary = "Add file") @RequestMapping(value = "/addFile", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String addFile( @@ -127,7 +122,6 @@ public String addFile( return response.toString(); } - @CrossOrigin @Operation(summary = "Get KM file download URL") @RequestMapping(value = "/getKMFileDownloadURL", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getKMFileDownloadURL(@Param(value = "{}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/language/LanguageController.java b/src/main/java/com/iemr/common/controller/language/LanguageController.java index 77204df1..f7fef882 100644 --- a/src/main/java/com/iemr/common/controller/language/LanguageController.java +++ b/src/main/java/com/iemr/common/controller/language/LanguageController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -50,7 +49,6 @@ public void setLanguageService(LanguageService languageService) this.languageService = languageService; } - @CrossOrigin() @Operation(summary = "List of all languages") @RequestMapping(value = "/getLanguageList", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") diff --git a/src/main/java/com/iemr/common/controller/location/LocationController.java b/src/main/java/com/iemr/common/controller/location/LocationController.java index f5e04dad..2d7fb0a1 100644 --- a/src/main/java/com/iemr/common/controller/location/LocationController.java +++ b/src/main/java/com/iemr/common/controller/location/LocationController.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -51,7 +50,6 @@ public class LocationController { private LocationService locationService; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin @Operation(summary = "Get states") @RequestMapping(value = "/states/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getStates(@PathVariable("id") Integer id) { @@ -67,7 +65,6 @@ public String getStates(@PathVariable("id") Integer id) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get districts") @RequestMapping(value = "/districts/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getDistricts(@PathVariable("id") int id) { @@ -83,7 +80,6 @@ public String getDistricts(@PathVariable("id") int id) { return response.toString(); } - @CrossOrigin @Operation(summary = "Fetch state and district by id") @RequestMapping(value = "/statesDistricts/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getStatetDistricts(@PathVariable("id") int id) { @@ -100,7 +96,6 @@ public String getStatetDistricts(@PathVariable("id") int id) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get district blocks") @RequestMapping(value = "/taluks/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getDistrictBlocks(@PathVariable("id") int id) { @@ -116,7 +111,6 @@ public String getDistrictBlocks(@PathVariable("id") int id) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get city") @RequestMapping(value = "/city/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCity(@PathVariable("id") int id) { @@ -133,7 +127,6 @@ public String getCity(@PathVariable("id") int id) { return response.toString(); } - @CrossOrigin @Operation(summary = "Get villages") @RequestMapping(value = "/village/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getVillages(@PathVariable("id") int id) { @@ -154,7 +147,6 @@ public void setLocationService(LocationService locationService) { this.locationService = locationService; } - @CrossOrigin @Operation(summary = "Get countries") @RequestMapping(value = "/getCountries", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getCountries() { diff --git a/src/main/java/com/iemr/common/controller/lonic/LonicController.java b/src/main/java/com/iemr/common/controller/lonic/LonicController.java index 07a4d86e..09083959 100644 --- a/src/main/java/com/iemr/common/controller/lonic/LonicController.java +++ b/src/main/java/com/iemr/common/controller/lonic/LonicController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -53,7 +52,6 @@ public void setLonicService(LonicService lonicService) { this.lonicService = lonicService; } - @CrossOrigin @Operation(summary = "Get lonic record list") @RequestMapping(value = "/getlonicRecordList", method = RequestMethod.POST, headers = "Authorization", consumes = "application/json", produces = "application/json") public String getLonicRecordList( diff --git a/src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java b/src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java index 6e5e0397..cead1716 100644 --- a/src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java +++ b/src/main/java/com/iemr/common/controller/lungassessment/LungAssessmentController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -47,7 +46,6 @@ public class LungAssessmentController { private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Start assesment") @RequestMapping(value = "/startAssesment", method = RequestMethod.POST, headers = "Authorization") public String startAssesment(@RequestParam("file") MultipartFile file, @RequestParam("request") String request) { @@ -65,7 +63,6 @@ public String startAssesment(@RequestParam("file") MultipartFile file, @RequestP return output.toString(); } - @CrossOrigin() @Operation(summary = "Get assesment") @RequestMapping(value = "/getAssesment/{assessmentId}", method = RequestMethod.GET, headers = "Authorization") public String getAssessment(@PathVariable("assessmentId") String assessmentId) { @@ -83,7 +80,6 @@ public String getAssessment(@PathVariable("assessmentId") String assessmentId) { return output.toString(); } - @CrossOrigin() @Operation(summary = "Get assesment details") @RequestMapping(value = "/getAssesmentDetails/{patientId}", method = RequestMethod.GET, headers = "Authorization") public String getAssessmentDetails(@PathVariable("patientId") Long patientId) { diff --git a/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java b/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java index 6edb5077..b6df2d58 100644 --- a/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java +++ b/src/main/java/com/iemr/common/controller/mctshistory/OutboundHistoryController.java @@ -22,7 +22,6 @@ package com.iemr.common.controller.mctshistory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -47,7 +46,6 @@ public void setOutboundHistoryService(OutboundHistoryService outboundHistoryServ this.outboundHistoryService = outboundHistoryService; } - @CrossOrigin() @Operation(summary = "Get MCTS call history") @RequestMapping(value = "/getMctsCallHistory", method = RequestMethod.POST, headers = "Authorization") public String getCallHistory(@Param("{\"beneficiaryRegID\":\"Long\"}") @RequestBody String request) { @@ -63,7 +61,6 @@ public String getCallHistory(@Param("{\"beneficiaryRegID\":\"Long\"}") @RequestB return response.toStringWithSerialization(); } - @CrossOrigin() @Operation(summary = "Get MCTS call response") @RequestMapping(value = "/getMctsCallResponse", method = RequestMethod.POST, headers = "Authorization") public String getMctsCallResponse(@Param("{\"callDetailID\":\"Long\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java b/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java index 6c4e4919..36de4436 100644 --- a/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java +++ b/src/main/java/com/iemr/common/controller/nhmdashboard/NationalHealthMissionDashboardController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -50,7 +49,6 @@ public class NationalHealthMissionDashboardController { @Autowired private NHM_DashboardService nHM_DashboardService; - @CrossOrigin() @Operation(summary = "Push abandoned calls from call centre") @RequestMapping(value = "/push/abandon_calls", method = RequestMethod.POST, headers = "Authorization") public String pushAbandonCallsFromC_Zentrix(@RequestBody AbandonCallSummary abandonCallSummary) { @@ -67,7 +65,6 @@ public String pushAbandonCallsFromC_Zentrix(@RequestBody AbandonCallSummary aban } @Operation(summary = "Get abandoned call information") - @CrossOrigin() @RequestMapping(value = "/get/abandon_calls", method = RequestMethod.GET, headers = "Authorization") public String getAbandonCalls() { OutputResponse output = new OutputResponse(); @@ -83,7 +80,6 @@ public String getAbandonCalls() { } @Operation(summary = "Get agent wise staff & idle time") - @CrossOrigin() @RequestMapping(value = "/get/agentsummaryreport", method = RequestMethod.GET, headers = "Authorization") public String getAgentSummaryReport() { OutputResponse output = new OutputResponse(); @@ -99,7 +95,6 @@ public String getAgentSummaryReport() { } @Operation(summary = "Get detailed call report") - @CrossOrigin() @RequestMapping(value = "/get/detailedCallReport", method = RequestMethod.GET, headers = "Authorization") public String getDetailedCallReport() { OutputResponse output = new OutputResponse(); diff --git a/src/main/java/com/iemr/common/controller/notification/NotificationController.java b/src/main/java/com/iemr/common/controller/notification/NotificationController.java index 430eb7f4..f06e9050 100644 --- a/src/main/java/com/iemr/common/controller/notification/NotificationController.java +++ b/src/main/java/com/iemr/common/controller/notification/NotificationController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -52,7 +51,6 @@ public void setNotificationService(NotificationService notificationService) { this.notificationService = notificationService; } - @CrossOrigin() @Operation(summary = "Get notification") @RequestMapping(value = "/getNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getNotification(@Param(value = "{\"providerServiceMapID\": \"integer-provider service map id\", " @@ -72,7 +70,6 @@ public String getNotification(@Param(value = "{\"providerServiceMapID\": \"integ return response.toString(); } - @CrossOrigin() @Operation(summary = "Get supervisor notification") @RequestMapping(value = "/getSupervisorNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSupervisorNotification( @@ -92,7 +89,6 @@ public String getSupervisorNotification( return response.toString(); } - @CrossOrigin() @Operation(summary = "Create notification") @RequestMapping(value = "/createNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String createNotification( @@ -120,7 +116,6 @@ public String createNotification( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update notification") @RequestMapping(value = "/updateNotification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateNotification( @@ -146,7 +141,6 @@ public String updateNotification( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get notification type") @RequestMapping(value = "/getNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getNotificationType( @@ -163,7 +157,6 @@ public String getNotificationType( return response.toString(); } - @CrossOrigin() @Operation(summary = "Create notification type") @RequestMapping(value = "/createNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String createNotificationType( @@ -182,7 +175,6 @@ public String createNotificationType( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update notification type") @RequestMapping(value = "/updateNotificationType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateNotificationType( @@ -201,7 +193,6 @@ public String updateNotificationType( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get emergency contacts") @RequestMapping(value = "/getEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getEmergencyContacts( @@ -219,7 +210,6 @@ public String getEmergencyContacts( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get supervisor emergency contacts") @RequestMapping(value = "/getSupervisorEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSupervisorEmergencyContacts( @@ -236,7 +226,6 @@ public String getSupervisorEmergencyContacts( return response.toString(); } - @CrossOrigin() @Operation(summary = "Create emergency contact") @RequestMapping(value = "/createEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String createEmergencyContacts( @@ -258,7 +247,6 @@ public String createEmergencyContacts( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update emergency contacts") @RequestMapping(value = "/updateEmergencyContacts", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateEmergencyContacts( diff --git a/src/main/java/com/iemr/common/controller/otp/OTPGateway.java b/src/main/java/com/iemr/common/controller/otp/OTPGateway.java index 42371a88..777503b8 100644 --- a/src/main/java/com/iemr/common/controller/otp/OTPGateway.java +++ b/src/main/java/com/iemr/common/controller/otp/OTPGateway.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -51,7 +50,6 @@ public class OTPGateway { @Autowired private OTPHandler otpHandler; - @CrossOrigin() @Operation(summary = "Send OTP") @RequestMapping(value = "/sendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String sendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) { @@ -74,7 +72,6 @@ public String sendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody Stri return response.toString(); } - @CrossOrigin() @Operation(summary = "Validate OTP") @RequestMapping(value = "/validateOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String validateOTP( @@ -98,7 +95,6 @@ public String validateOTP( return response.toString(); } - @CrossOrigin() @Operation(summary = "Resend OTP") @RequestMapping(value = "/resendOTP", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String resendOTP(@Param(value = "{\"mobNo\":\"String\"}") @RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java index f9251cc0..40ff5d4f 100644 --- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java +++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionTypeController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -60,7 +59,6 @@ public void setQuestionTypeService(QuestionTypeService questionTypeService) { this.questionTypeService = questionTypeService; } - @CrossOrigin() @Operation(summary = "Create question type") @RequestMapping(value = "/put/questionType", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String createQuestionType( @@ -76,7 +74,6 @@ public String createQuestionType( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get question type list") @RequestMapping(value = "/get/questionTypeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String questionTypeList() { diff --git a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java index f984f468..b0b2faa4 100644 --- a/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java +++ b/src/main/java/com/iemr/common/controller/questionconfig/QuestionnaireController.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -56,7 +55,6 @@ public void setQuestionnaireService(QuestionnaireService questionnaireService) { this.questionnaireService = questionnaireService; } - @CrossOrigin() @Operation(summary = "Create questionnaire") @RequestMapping(value = "/put/questionnaire", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String createQuestionnaire(@RequestBody String request) { @@ -71,7 +69,6 @@ public String createQuestionnaire(@RequestBody String request) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Get questionnaire list") @RequestMapping(value = "/get/questionnaireList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String questionTypeList() { diff --git a/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java b/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java index 094f2ac2..ee671552 100644 --- a/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java +++ b/src/main/java/com/iemr/common/controller/report/CustomerRelationshipReports.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -39,8 +38,6 @@ import io.swagger.v3.oas.annotations.Operation; - -@CrossOrigin @RequestMapping({ "/crmReports" }) @RestController public class CustomerRelationshipReports { @@ -58,7 +55,6 @@ public void setCallReportsService(CallReportsService callReportsService) { @Autowired Report1097Mapper mapper; - @CrossOrigin() @Operation(summary = "QA report type master data") @RequestMapping(value = "/getReportTypes/{providerServiceMapID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON) public String patientAppChiefComplaintsMasterData( diff --git a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java index e1c0a261..1ac5e85e 100644 --- a/src/main/java/com/iemr/common/controller/scheme/SchemeController.java +++ b/src/main/java/com/iemr/common/controller/scheme/SchemeController.java @@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -56,7 +55,6 @@ public class SchemeController { InputMapper mapper = new InputMapper(); - @CrossOrigin @Operation(summary = "Save scheme details") @RequestMapping(value = "/save/schemeDetails", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String saveSchemeDetails(@Param(value = "{\"providerServiceMapID\": \"integer-provider service map id\", " @@ -83,7 +81,6 @@ public String saveSchemeDetails(@Param(value = "{\"providerServiceMapID\": \"int return output.toString(); } - @CrossOrigin @Operation(summary = "Get scheme list") @RequestMapping(value = "/get/schemeList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String getSchemeList( @@ -109,7 +106,6 @@ public String getSchemeList( return output.toString(); } - @CrossOrigin @Operation(summary = "Delete scheme") @RequestMapping(value = "/scheme/deleteScheme", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public String deleteScheme( diff --git a/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java b/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java index 82a73ce3..47d73255 100644 --- a/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java +++ b/src/main/java/com/iemr/common/controller/secondaryReport/CustomerRelationshipSecondaryReports.java @@ -29,7 +29,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -47,7 +46,6 @@ import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; -@CrossOrigin @RequestMapping({ "/crmReports" }) @RestController public class CustomerRelationshipSecondaryReports { @@ -55,7 +53,6 @@ public class CustomerRelationshipSecondaryReports { @Autowired private SecondaryReportService secondaryReportService; - @CrossOrigin() @Operation(summary = "Get quality report") @RequestMapping(value = "/getQualityReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getQualityReport( @@ -81,7 +78,6 @@ public ResponseEntity getQualityReport( } } - @CrossOrigin() @Operation(summary = "Get complaint detail report") @RequestMapping(value = "/getComplaintDetailReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getComplaintDetailReport( @@ -108,7 +104,6 @@ public ResponseEntity getComplaintDetailReport( } } - @CrossOrigin() @Operation(summary = "Get call summary report") @RequestMapping(value = "/getCallSummaryReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getCallSummaryReport( @@ -137,7 +132,6 @@ public ResponseEntity getCallSummaryReport( } } - @CrossOrigin() @Operation(summary = "Get all by sexual orientation") @RequestMapping(value = "/getAllBySexualOrientation", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getAllBySexualOrientation( @@ -164,7 +158,6 @@ public ResponseEntity getAllBySexualOrientation( } - @CrossOrigin @Operation(summary = "Get district wise call report") @RequestMapping(value = "/getDistrictWiseCallReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getDistrictWiseCallReport( @@ -190,7 +183,6 @@ public ResponseEntity getDistrictWiseCallReport( } } - @CrossOrigin @Operation(summary = "Get unblocked user report") @RequestMapping(value = "/getUnblockedUserReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getUnblockedUserReport( @@ -215,7 +207,6 @@ public ResponseEntity getUnblockedUserReport( } } - @CrossOrigin @Operation(summary = "Get call quality report") @RequestMapping(value = "/getCallQualityReport", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getCallQualityReport( @@ -244,7 +235,6 @@ public ResponseEntity getCallQualityReport( } } - @CrossOrigin() @Operation(summary = "Get counts by preferred language") @RequestMapping(value = "/getCountsByPreferredLanguage", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getCountsByPreferredLanguage( @@ -272,7 +262,6 @@ public ResponseEntity getCountsByPreferredLanguage( } } - @CrossOrigin @Operation(summary = "Get caller by age group") @RequestMapping(value = "/getAllByAgeGroup", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getAllByAgeGroup( @@ -298,7 +287,6 @@ public ResponseEntity getAllByAgeGroup( } } - @CrossOrigin() @Operation(summary = "Get all reports by date") @RequestMapping(value = "/getAllReportsByDate", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getAllReportsByDate( @@ -326,7 +314,6 @@ public ResponseEntity getAllReportsByDate( } } - @CrossOrigin() @Operation(summary = "Get all by gender") @RequestMapping(value = "/getAllByGender", method = RequestMethod.POST, headers = "Authorization") public ResponseEntity getAllByGender( diff --git a/src/main/java/com/iemr/common/controller/services/CategoryController.java b/src/main/java/com/iemr/common/controller/services/CategoryController.java index 7129577c..a204f487 100644 --- a/src/main/java/com/iemr/common/controller/services/CategoryController.java +++ b/src/main/java/com/iemr/common/controller/services/CategoryController.java @@ -30,7 +30,6 @@ 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; @@ -54,7 +53,6 @@ public class CategoryController { InputMapper inputMapper = new InputMapper(); final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Get all categries") @PostMapping(value = "/categories", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAllCategries( diff --git a/src/main/java/com/iemr/common/controller/services/CommonController.java b/src/main/java/com/iemr/common/controller/services/CommonController.java index 3813acda..a0ed8a4c 100644 --- a/src/main/java/com/iemr/common/controller/services/CommonController.java +++ b/src/main/java/com/iemr/common/controller/services/CommonController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -49,7 +48,6 @@ public class CommonController { InputMapper inputMapper = new InputMapper(); final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin() @Operation(summary = "Get category") @RequestMapping(value = "/category", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") // public Iterable getCategories(){ @@ -64,7 +62,6 @@ public String getCategories(@Param("{\"providerServiceMapID\":\"Integer\", " return response.toString(); } - @CrossOrigin() @Operation(summary = "Get sub categories") @RequestMapping(value = "/subcategory", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSubcategories(@Param("{\"categoryID\":\"Integer\"}") @RequestBody String request) { @@ -78,7 +75,6 @@ public String getSubcategories(@Param("{\"categoryID\":\"Integer\"}") @RequestBo return response.toString(); } - @CrossOrigin() @Operation(summary = "Get sub category files") @RequestMapping(value = "/getSubCategoryFiles", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSubCategoryFiles(@Param("{\"categoryID\":\"Integer\", \"providerServiceMapID\":\"Integer\", " @@ -93,7 +89,6 @@ public String getSubCategoryFiles(@Param("{\"categoryID\":\"Integer\", \"provide return response.toString(); } - @CrossOrigin() @Operation(summary = "Get sub category files with URL") @RequestMapping(value = "/getSubCategoryFilesWithURL", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSubCategoryFilesWithURL( @@ -109,7 +104,6 @@ public String getSubCategoryFilesWithURL( return response.toString(); } - @CrossOrigin() @Operation(summary = "Category by id") @RequestMapping(value = "/categoryByID", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getcategoriesById( @@ -126,7 +120,6 @@ public String getcategoriesById( return response.toString(); } - @CrossOrigin() @Operation(summary = "Service types") @RequestMapping(value = "/servicetypes", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getservicetypes(@Param("{\"providerServiceMapID\":\"Integer\"}") @RequestBody String request) { @@ -156,7 +149,6 @@ public void setServices(ServicesImpl services) { this.services = services; } - @CrossOrigin() @Operation(summary = "Service list") @RequestMapping(value = "/serviceList", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String serviceList(@RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/sms/SMSController.java b/src/main/java/com/iemr/common/controller/sms/SMSController.java index 139b4d75..78a42793 100644 --- a/src/main/java/com/iemr/common/controller/sms/SMSController.java +++ b/src/main/java/com/iemr/common/controller/sms/SMSController.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -63,7 +62,6 @@ public class SMSController { InputMapper inputMapper = new InputMapper(); - @CrossOrigin() @Operation(summary = "Get SMS templates") @PostMapping(value = "/getSMSTemplates", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSMSTemplates( @@ -82,7 +80,6 @@ public String getSMSTemplates( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get full SMS template") @PostMapping(value = "/getFullSMSTemplate", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFullSMSTemplate( @@ -101,7 +98,6 @@ public String getFullSMSTemplate( return response.toString(); } - @CrossOrigin() @Operation(summary = "Save SMS template") @PostMapping(value = "/saveSMSTemplate", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String saveSMSTemplate( @@ -120,7 +116,6 @@ public String saveSMSTemplate( return response.toString(); } - @CrossOrigin() @Operation(summary = "Update SMS template") @PostMapping(value = "/updateSMSTemplate", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String updateSMSTemplate( @@ -144,7 +139,6 @@ public String updateSMSTemplate( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get SMS types") @PostMapping(value = "/getSMSTypes", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSMSTypes( @@ -164,7 +158,6 @@ public String getSMSTypes( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get SMS parameters") @PostMapping(value = "/getSMSParameters", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getSMSParameters( @@ -184,7 +177,6 @@ public String getSMSParameters( return response.toString(); } - @CrossOrigin() @Operation(summary = "Send SMS") @PostMapping(value = "/sendSMS", produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String sendSMS( diff --git a/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java index 23a451af..babf4f83 100644 --- a/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java +++ b/src/main/java/com/iemr/common/controller/snomedct/SnomedController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -53,7 +52,6 @@ public void setSnomedService(SnomedService snomedService) { this.snomedService = snomedService; } - @CrossOrigin @Operation(summary = "Retrives snomed CT record") @RequestMapping(value = "/getSnomedCTRecord", method = RequestMethod.POST, headers = "Authorization", consumes = "application/json", produces = "application/json") public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @RequestBody String request) { @@ -79,7 +77,6 @@ public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @Request return output.toString(); } - @CrossOrigin @Operation(summary = "Retrives snomed CT record list") @RequestMapping(value = "/getSnomedCTRecordList", method = RequestMethod.POST, headers = "Authorization", consumes = "application/json", produces = "application/json") public String getSnomedCTRecordList(@Param(value = "{\"term\":\"String\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java b/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java index 25321d2d..f7571f7b 100644 --- a/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java +++ b/src/main/java/com/iemr/common/controller/uptsu/UPTechnicalSupportController.java @@ -26,7 +26,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -48,7 +47,6 @@ public class UPTechnicalSupportController { private UptsuService uptsuService; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); - @CrossOrigin @Operation(summary = "Get facility master") @RequestMapping(value = "/get/facilityMaster/{providerServiceMapID}/{blockName}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getFacility(@PathVariable Integer providerServiceMapID, @PathVariable String blockName) { @@ -65,7 +63,6 @@ public String getFacility(@PathVariable Integer providerServiceMapID, @PathVaria return response.toString(); } - @CrossOrigin @Operation(summary = "Save appointment details") @RequestMapping(value = "/save/appointment-details", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String saveAppointmentDetails(@RequestBody String request, diff --git a/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java b/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java index 8a81d09b..a2156af1 100644 --- a/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java +++ b/src/main/java/com/iemr/common/controller/users/EmployeeSignatureController.java @@ -28,7 +28,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -56,7 +55,6 @@ public class EmployeeSignatureController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - @CrossOrigin() @Operation(summary = "Fetch file") @RequestMapping(value = "/{userID}", headers = "Authorization", method = { RequestMethod.GET }) public ResponseEntity fetchFile(@PathVariable("userID") Long userID) throws Exception { @@ -78,7 +76,6 @@ public ResponseEntity fetchFile(@PathVariable("userID") Long userID) thr } - @CrossOrigin() @Operation(summary = "Fetch file from central") @RequestMapping(value = "/getSignClass/{userID}", headers = "Authorization", method = { RequestMethod.GET }) public String fetchFileFromCentral(@PathVariable("userID") Long userID) throws Exception { @@ -100,7 +97,6 @@ public String fetchFileFromCentral(@PathVariable("userID") Long userID) throws E return response.toString(); } - @CrossOrigin() @Operation(summary = "Download file based on userID") @RequestMapping(value = "/signexist/{userID}", headers = "Authorization", method = { RequestMethod.GET }) public String existFile(@PathVariable("userID") Long userID) throws Exception { diff --git a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java index 055c82aa..94367bfe 100644 --- a/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java +++ b/src/main/java/com/iemr/common/controller/users/IEMRAdminController.java @@ -117,7 +117,6 @@ public void setSessionObject(SessionObject sessionObject) { @Autowired SecurePassword securePassword; - @CrossOrigin() @Operation(summary = "New user authentication") @RequestMapping(value = "/userAuthenticateNew", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticateNew( @@ -132,7 +131,6 @@ public String userAuthenticateNew( return response.toString(); } - @CrossOrigin() @Operation(summary = "User authentication") @RequestMapping(value = "/userAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticate( @@ -311,7 +309,6 @@ public ResponseEntity refreshToken(@RequestBody Map request) } } - @CrossOrigin() @Operation(summary = "Log out user from concurrent session") @RequestMapping(value = "/logOutUserFromConcurrentSession", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String logOutUserFromConcurrentSession( @@ -395,7 +392,7 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service m_UserServiceRoleMapping.getM_ProviderServiceMapping().getM_ServiceMaster().toString())); previlegeObj.getJSONObject(serv).put("serviceName", serv); previlegeObj.getJSONObject(serv).put("serviceID", - m_UserServiceRoleMapping.getM_ProviderServiceMapping().getM_ServiceMaster().getServiceID()); + m_UserServiceRoleMapping.getM_ProviderServiceMapping().getProviderServiceMapID()); previlegeObj.getJSONObject(serv).put("providerServiceMapID", m_UserServiceRoleMapping.getM_ProviderServiceMapping().getProviderServiceMapID()); previlegeObj.getJSONObject(serv).put("apimanClientKey", @@ -423,10 +420,6 @@ private void createUserMapping(User mUser, JSONObject resMap, JSONObject service resMap.put("Previlege", serviceRoleList); } - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.POST - */) @RequestMapping(value = "/superUserAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String superUserAuthenticate( @Param(value = "\"{\\\"userName\\\":\\\"String\\\",\\\"doLogout\\\":\\\"Boolean\\\"}\"") @RequestBody LoginRequestModel m_User, @@ -519,7 +512,6 @@ public String superUserAuthenticate( return response.toString(); } -// @CrossOrigin() // @Operation(summary = "User authentication V1") // @RequestMapping(value = "/userAuthenticateV1", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) // public String userAuthenticateV1( @@ -547,7 +539,6 @@ public String superUserAuthenticate( // return response.toString(); // } - @CrossOrigin() @Operation(summary = "Get login response") @RequestMapping(value = "/getLoginResponse", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getLoginResponse(HttpServletRequest request) { @@ -602,10 +593,6 @@ public String getLoginResponse(HttpServletRequest request) { return response.toString(); } - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.POST - */) @Operation(summary = "Forget password") @RequestMapping(value = "/forgetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String forgetPassword( @@ -645,7 +632,6 @@ else if (mUsers.size() == 1) { return response.toString(); } - @CrossOrigin() @Operation(summary = "Set forget password") @RequestMapping(value = "/setForgetPassword", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String setPassword( @@ -684,7 +670,6 @@ public String setPassword( return response.toString(); } - @CrossOrigin() @Operation(summary = "Change password") @RequestMapping(value = "/changePassword", method = RequestMethod.POST, produces = "application/json") public String changePassword( @@ -731,7 +716,6 @@ public String changePassword( return response.toString(); } - @CrossOrigin() @Operation(summary = "Save user security questions & answers") @RequestMapping(value = "/saveUserSecurityQuesAns", method = RequestMethod.POST, produces = "application/json") public String saveUserSecurityQuesAns( @@ -754,10 +738,6 @@ public String saveUserSecurityQuesAns( * * @return security qtns */ - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.GET - */) @Operation(summary = "Get security quetions") @RequestMapping(value = "/getsecurityquetions", method = RequestMethod.GET) public String getSecurityts() { @@ -774,10 +754,6 @@ public String getSecurityts() { return response.toString(); } - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.POST - */) @Operation(summary = "Get roles by provider id") @RequestMapping(value = "/getRolesByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRolesByProviderID( @@ -794,10 +770,6 @@ public String getRolesByProviderID( return response.toString(); } - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.POST - */) @Operation(summary = "Get role screen mapping by provider id") @RequestMapping(value = "/getRoleScreenMappingByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getRoleScreenMappingByProviderID( @@ -822,10 +794,6 @@ public String getRoleScreenMappingByProviderID( return response.toString(); } - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.POST - */) @Operation(summary = "Get users by provider id") @RequestMapping(value = "/getUsersByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getUsersByProviderID(@Param(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", " @@ -843,10 +811,6 @@ public String getUsersByProviderID(@Param(value = "{\"providerServiceMapID\":\"I return response.toString(); } - @CrossOrigin(/* - * allowedHeaders = "Authorization", exposedHeaders = "Authorization", methods = - * RequestMethod.POST - */) @Operation(summary = "Get user service point van details") @RequestMapping(value = "/getUserServicePointVanDetails", method = RequestMethod.POST, produces = "application/json", headers = "Authorization") public String getUserServicePointVanDetails( @@ -867,7 +831,6 @@ public String getUserServicePointVanDetails( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get service point villages") @RequestMapping(value = "/getServicepointVillages", method = RequestMethod.POST, produces = "application/json", headers = "Authorization") public String getServicepointVillages( @@ -888,7 +851,6 @@ public String getServicepointVillages( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get locations by provider id") @RequestMapping(value = "/getLocationsByProviderID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getLocationsByProviderID( @@ -906,7 +868,6 @@ public String getLocationsByProviderID( return response.toString(); } - @CrossOrigin() @Operation(summary = "User log out") @RequestMapping(value = "/userLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String userLogout(HttpServletRequest request) { @@ -954,7 +915,6 @@ private void deleteSessionObject(String key) { } } - @CrossOrigin() @Operation(summary = "Force log out") @RequestMapping(value = "/forceLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String forceLogout(@RequestBody ForceLogoutRequestModel request, HttpServletRequest httpRequest, HttpServletResponse response) { @@ -1006,7 +966,6 @@ private String getJwtTokenFromCookies(HttpServletRequest request) { } - @CrossOrigin() @Operation(summary = "User force log out") @RequestMapping(value = "/userForceLogout", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String userForceLogout( @@ -1021,7 +980,6 @@ public String userForceLogout( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get agent by role id") @RequestMapping(value = "/getAgentByRoleID", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getAgentByRoleID(@Param(value = "{\"providerServiceMapID\":\"Integer - providerServiceMapID\", " @@ -1038,7 +996,6 @@ public String getAgentByRoleID(@Param(value = "{\"providerServiceMapID\":\"Integ return response.toString(); } - @CrossOrigin() @Operation(summary = "User authenticate by encryption") @RequestMapping(value = "/userAuthenticateByEncryption", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticateByEncryption( @@ -1083,7 +1040,6 @@ public String userAuthenticateByEncryption( return response.toString(); } - @CrossOrigin() @Operation(summary = "Get role wrap up time") @RequestMapping(value = "/role/{roleID}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON, headers = "Authorization") public String getrolewrapuptime(@PathVariable("roleID") Integer roleID) { @@ -1105,7 +1061,6 @@ public String getrolewrapuptime(@PathVariable("roleID") Integer roleID) { * @param request * @return transaction Id for password change */ - @CrossOrigin @Operation(summary = "Validating security question and answers for password change") @RequestMapping(value = { "/validateSecurityQuestionAndAnswer" }, method = { RequestMethod.POST }) public String validateSecurityQuestionAndAnswer( @@ -1131,7 +1086,6 @@ public String validateSecurityQuestionAndAnswer( return response.toString(); } - @CrossOrigin() @Operation(summary = "User authentication") @RequestMapping(value = "/bhavya/userAuthenticate", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON) public String userAuthenticateBhavya( diff --git a/src/main/java/com/iemr/common/controller/version/VersionController.java b/src/main/java/com/iemr/common/controller/version/VersionController.java index 39c065df..705fccdc 100644 --- a/src/main/java/com/iemr/common/controller/version/VersionController.java +++ b/src/main/java/com/iemr/common/controller/version/VersionController.java @@ -28,7 +28,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; @@ -43,7 +42,6 @@ public class VersionController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - @CrossOrigin() @Operation(summary = "Get version") @RequestMapping(value = "/version", method = { RequestMethod.GET }) public String versionInformation() { diff --git a/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java b/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java index 71db0ca3..6630f367 100644 --- a/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java +++ b/src/main/java/com/iemr/common/data/kmfilemanager/KMFileManager.java @@ -26,7 +26,6 @@ import com.google.gson.annotations.Expose; import com.iemr.common.data.notification.Notification; import com.iemr.common.utils.mapper.OutputMapper; - import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -36,235 +35,247 @@ import jakarta.persistence.Table; import jakarta.persistence.Transient; import lombok.Data; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.LongSerializationPolicy; @Entity @Table(name = "t_kmfilemanager") @Data -public class KMFileManager { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "KmFileManagerID") - @Expose - private Integer kmFileManagerID; - @Transient - @OneToOne(mappedBy = "kmFileManager") - private Notification notification; - - @Column(name = "FileUID") - @Expose - private String fileUID; - - @Column(name = "FileName") - @Expose - private String fileName; - - @Column(name = "FileExtension") - @Expose - private String fileExtension; - - @Column(name = "VersionNo") - @Expose - private String versionNo; - - @Column(name = "FileCheckSum") - @Expose - private String fileCheckSum; - - @Column(name = "ProviderServiceMapID") - @Expose - private Integer providerServiceMapID; - - @Column(name = "UserID") - @Expose - private Integer userID; - - @Column(name = "KmUploadStatus") - @Expose - private String kmUploadStatus; - - @Column(name = "ValidFrom") - @Expose - private Timestamp validFrom; - - @Column(name = "ValidUpto") - @Expose - private Timestamp validUpto; - - @Column(name = "Deleted", insertable = false, updatable = true) - @Expose - private Boolean deleted; - @Column(name = "CreatedBy") - @Expose - private String createdBy; - @Column(name = "CreatedDate", insertable = false, updatable = false) - @Expose - private Timestamp createdDate; - @Column(name = "ModifiedBy") - private String modifiedBy; - @Column(name = "LastModDate", insertable = false, updatable = true) - private Timestamp lastModDate; - - @Transient - @Expose - private Integer categoryID; - @Transient - @Expose - private Integer subCategoryID; - @Transient - @Expose - private String fileContent; - @Transient - @Expose - private boolean isUploaded; - - @Transient - private OutputMapper outputMapper = new OutputMapper(); - - // column added for MMU - @Transient - @Expose - private Integer vanID; - - public Integer getProviderServiceMapID() { - return providerServiceMapID; - } - - public Integer getKmFileManagerID() { - return kmFileManagerID; - } - - public String getFileUID() { - return fileUID; - } - - public String getFileName() { - return fileName; - } - - public String getFileExtension() { - return fileExtension; - } - - public String getVersionNo() { - return versionNo; - } - - public String getFileCheckSum() { - return fileCheckSum; - } - - public Integer getUserID() { - return userID; - } - - public String getKmUploadStatus() { - return kmUploadStatus; - } - - public Timestamp getValidFrom() { - return validFrom; - } - - public Timestamp getValidUpto() { - return validUpto; - } - - public Boolean getDeleted() { - return deleted; - } - - public String getCreatedBy() { - return createdBy; - } - - public Timestamp getCreatedDate() { - return createdDate; - } - - public String getModifiedBy() { - return modifiedBy; - } - - public Timestamp getLastModDate() { - return lastModDate; - } - - public OutputMapper getOutputMapper() { - return outputMapper; - } - - public Integer getCategoryID() { - return categoryID; - } - - public Integer getSubCategoryID() { - return subCategoryID; - } - - public String getFileContent() { - return fileContent; - } - - public void setFileUID(String fileUID) { - this.fileUID = fileUID; - } - - public void setFileCheckSum(String fileCheckSum) { - this.fileCheckSum = fileCheckSum; - } - - public void setKmUploadStatus(String kmUploadStatus) { - this.kmUploadStatus = kmUploadStatus; - } - - public void setVersionNo(String versionNo) { - this.versionNo = versionNo; - } - - public KMFileManager(Integer providerServiceMapID, Integer kmFileManagerID, String fileUID, String fileName, - String fileExtension, String versionNo, String fileCheckSum, String kmUploadStatus, Timestamp validFrom, - Timestamp validUpto, Boolean deleted) { - this.providerServiceMapID = providerServiceMapID; - this.kmFileManagerID = kmFileManagerID; - this.fileUID = fileUID; - this.fileName = fileName; - this.fileExtension = fileExtension; - this.versionNo = versionNo; - this.fileCheckSum = fileCheckSum; - this.versionNo = versionNo; - this.fileCheckSum = fileCheckSum; - this.kmUploadStatus = kmUploadStatus; - this.validFrom = validFrom; - this.validUpto = validUpto; - this.deleted = deleted; - } - - public KMFileManager(Integer providerServiceMapID, Integer kmFileManagerID, String fileUID, String fileName, - String fileExtension, String versionNo, String fileCheckSum, String kmUploadStatus, Timestamp validFrom, - Timestamp validUpto, Boolean deleted, String createdBy) { - this.providerServiceMapID = providerServiceMapID; - this.kmFileManagerID = kmFileManagerID; - this.fileUID = fileUID; - this.fileName = fileName; - this.fileExtension = fileExtension; - this.versionNo = versionNo; - this.fileCheckSum = fileCheckSum; - this.versionNo = versionNo; - this.fileCheckSum = fileCheckSum; - this.kmUploadStatus = kmUploadStatus; - this.validFrom = validFrom; - this.validUpto = validUpto; - this.deleted = deleted; - this.createdBy = createdBy; - } - - public KMFileManager() { - - } - - @Override - public String toString() { - return outputMapper.gson().toJson(this); + public class KMFileManager { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "KmFileManagerID") + @Expose + private Integer kmFileManagerID; + @Transient + @OneToOne(mappedBy = "kmFileManager") + private transient Notification notification; + + @Column(name = "FileUID") + @Expose + private String fileUID; + + @Column(name = "FileName") + @Expose + private String fileName; + + @Column(name = "FileExtension") + @Expose + private String fileExtension; + + @Column(name = "VersionNo") + @Expose + private String versionNo; + + @Column(name = "FileCheckSum") + @Expose + private String fileCheckSum; + + @Column(name = "ProviderServiceMapID") + @Expose + private Integer providerServiceMapID; + + @Column(name = "UserID") + @Expose + private Integer userID; + + @Column(name = "KmUploadStatus") + @Expose + private String kmUploadStatus; + + @Column(name = "ValidFrom") + @Expose + private Timestamp validFrom; + + @Column(name = "ValidUpto") + @Expose + private Timestamp validUpto; + + @Column(name = "Deleted", insertable = false, updatable = true) + @Expose + private Boolean deleted; + @Column(name = "CreatedBy") + @Expose + private String createdBy; + @Column(name = "CreatedDate", insertable = false, updatable = false) + @Expose + private Timestamp createdDate; + @Column(name = "ModifiedBy") + private String modifiedBy; + @Column(name = "LastModDate", insertable = false, updatable = true) + private Timestamp lastModDate; + + @Transient + @Expose + private Integer categoryID; + @Transient + @Expose + private Integer subCategoryID; + @Transient + @Expose + private String fileContent; + @Transient + @Expose + private boolean isUploaded; + + @Transient + private transient OutputMapper outputMapper = new OutputMapper(); + + // column added for MMU + @Transient + @Expose + private Integer vanID; + + public Integer getProviderServiceMapID() { + return providerServiceMapID; + } + + public Integer getKmFileManagerID() { + return kmFileManagerID; + } + + public String getFileUID() { + return fileUID; + } + + public String getFileName() { + return fileName; + } + + public String getFileExtension() { + return fileExtension; + } + + public String getVersionNo() { + return versionNo; + } + + public String getFileCheckSum() { + return fileCheckSum; + } + + public Integer getUserID() { + return userID; + } + + public String getKmUploadStatus() { + return kmUploadStatus; + } + + public Timestamp getValidFrom() { + return validFrom; + } + + public Timestamp getValidUpto() { + return validUpto; + } + + public Boolean getDeleted() { + return deleted; + } + + public String getCreatedBy() { + return createdBy; + } + + public Timestamp getCreatedDate() { + return createdDate; + } + + public String getModifiedBy() { + return modifiedBy; + } + + public Timestamp getLastModDate() { + return lastModDate; + } + + public OutputMapper getOutputMapper() { + return outputMapper; + } + + public Integer getCategoryID() { + return categoryID; + } + + public Integer getSubCategoryID() { + return subCategoryID; + } + + public String getFileContent() { + return fileContent; + } + + public void setFileUID(String fileUID) { + this.fileUID = fileUID; + } + + public void setFileCheckSum(String fileCheckSum) { + this.fileCheckSum = fileCheckSum; + } + + public void setKmUploadStatus(String kmUploadStatus) { + this.kmUploadStatus = kmUploadStatus; + } + + public void setVersionNo(String versionNo) { + this.versionNo = versionNo; + } + + public KMFileManager(Integer providerServiceMapID, Integer kmFileManagerID, String fileUID, String fileName, + String fileExtension, String versionNo, String fileCheckSum, String kmUploadStatus, Timestamp validFrom, + Timestamp validUpto, Boolean deleted) { + this.providerServiceMapID = providerServiceMapID; + this.kmFileManagerID = kmFileManagerID; + this.fileUID = fileUID; + this.fileName = fileName; + this.fileExtension = fileExtension; + this.versionNo = versionNo; + this.fileCheckSum = fileCheckSum; + this.versionNo = versionNo; + this.fileCheckSum = fileCheckSum; + this.kmUploadStatus = kmUploadStatus; + this.validFrom = validFrom; + this.validUpto = validUpto; + this.deleted = deleted; + } + + public KMFileManager(Integer providerServiceMapID, Integer kmFileManagerID, String fileUID, String fileName, + String fileExtension, String versionNo, String fileCheckSum, String kmUploadStatus, Timestamp validFrom, + Timestamp validUpto, Boolean deleted, String createdBy) { + this.providerServiceMapID = providerServiceMapID; + this.kmFileManagerID = kmFileManagerID; + this.fileUID = fileUID; + this.fileName = fileName; + this.fileExtension = fileExtension; + this.versionNo = versionNo; + this.fileCheckSum = fileCheckSum; + this.versionNo = versionNo; + this.fileCheckSum = fileCheckSum; + this.kmUploadStatus = kmUploadStatus; + this.validFrom = validFrom; + this.validUpto = validUpto; + this.deleted = deleted; + this.createdBy = createdBy; + } + + public KMFileManager() { + + } + + @Override + public String toString() { + Gson gson = new GsonBuilder() + .excludeFieldsWithoutExposeAnnotation() + .setLongSerializationPolicy(LongSerializationPolicy.STRING) + .serializeNulls() + .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'") // format dates without custom adapter + .create(); + + return gson.toJson(this); + + + } } -} diff --git a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java index 50f66a14..49cccc76 100644 --- a/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java +++ b/src/main/java/com/iemr/common/notification/agent/UserNotificationMappingController.java @@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.MediaType; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; @@ -51,7 +50,6 @@ -@CrossOrigin() @RequestMapping(value = "/notification") @RestController public class UserNotificationMappingController @@ -63,7 +61,6 @@ public class UserNotificationMappingController @Autowired UserNotificationMappingService notificationService; - @CrossOrigin() @RequestMapping(value = "/getAlertsAndNotificationCount", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") @@ -103,7 +100,6 @@ public class UserNotificationMappingController } } - @CrossOrigin() @RequestMapping(value = "/getAlertsAndNotificationDetail", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") @@ -149,7 +145,6 @@ public class UserNotificationMappingController return output.toString(); } - @CrossOrigin() @RequestMapping(value = "/changeNotificationStatus", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") @@ -203,7 +198,6 @@ public class UserNotificationMappingController } } - @CrossOrigin() @RequestMapping(value = "/markDelete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, headers = "Authorization") public @ResponseBody String markDelete(@Param(value = "{" + "\"isDeleted\":\"Boolean\"\n" @@ -255,7 +249,6 @@ public class UserNotificationMappingController } } - // @CrossOrigin() // @ApiOperation(value = "stores scheme data", consumes = "application/json", produces = "application/json") // @RequestMapping( // value = "/createDetailForUsers", method = RequestMethod.POST, @@ -353,7 +346,6 @@ public class UserNotificationMappingController // // // ------------------------------------- // - // @CrossOrigin() // @RequestMapping( // value = "/getAlertsAndNotificationCountAPI", method = RequestMethod.POST, // produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE, diff --git a/src/main/java/com/iemr/common/utils/FilterConfig.java b/src/main/java/com/iemr/common/utils/FilterConfig.java index 1f15a7fa..9f6efb13 100644 --- a/src/main/java/com/iemr/common/utils/FilterConfig.java +++ b/src/main/java/com/iemr/common/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/common/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java index 6bbf29bb..45f37870 100644 --- a/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/common/utils/JwtUserIdValidationFilter.java @@ -4,7 +4,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Component; import com.iemr.common.utils.http.AuthorizationHeaderRequestWrapper; @@ -16,15 +15,18 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.util.Arrays; -@Component public class JwtUserIdValidationFilter implements Filter { private final JwtAuthenticationUtil jwtAuthenticationUtil; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private final String allowedOrigins; - public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil) { + public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil, + String allowedOrigins) { this.jwtAuthenticationUtil = jwtAuthenticationUtil; + this.allowedOrigins = allowedOrigins; } @Override @@ -33,6 +35,22 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; + String origin = request.getHeader("Origin"); + if (origin != null && isOriginAllowed(origin)) { + response.setHeader("Access-Control-Allow-Origin", origin); + response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS"); + response.setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type, Accept, Jwttoken"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + } 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); @@ -87,7 +105,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo logger.info("User-Agent: " + userAgent); if (userAgent != null && isMobileClient(userAgent) && authHeader != null) { try { - logger.info("Common-API incoming userAget : "+userAgent); + logger.info("Common-API incoming userAget : " + userAgent); UserAgentContext.setUserAgent(userAgent); filterChain.doFilter(servletRequest, servletResponse); } finally { @@ -105,6 +123,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;