Skip to content

Cors configuration for TM api service #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vishwab1 wants to merge 7 commits into from
Closed

Cors configuration for TM api service #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4443487
fix(cors): global cors config added controller specific cors config r…
kevalkanp1011 Apr 14, 2025
ef6f4c1
fix(cors): added dynamic cors filter for origin header addition in re…
kevalkanp1011 May 17, 2025
73fe011
fix(cors): update ci properties
kevalkanp1011 Apr 16, 2025
d2a512d
fix(cors): removed unwanted sapce
vishwab1 May 23, 2025
7013279
fix(cors): space remove and cors update
vishwab1 May 26, 2025
a2e2c9d
fix(cors): space remove
vishwab1 May 26, 2025
d37c7e9
fix(cors): space adjusted
vishwab1 May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/environment/common_ci.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,5 @@ logging.file.name=@env.TM_API_LOGGING_FILE_NAME@

springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
cors.allowed-origins=@CORS_ALLOWED_ORIGINS@

2 changes: 2 additions & 0 deletions src/main/environment/common_example.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,7 @@ spring.redis.host=localhost

jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
logging.path=logs/

logging.file.name=logs/tm-api.log
cors.allowed-origins=http://localhost:*

25 changes: 25 additions & 0 deletions src/main/java/com/iemr/tm/config/CorsConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package com.iemr.tm.config;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
public class CorsConfig implements WebMvcConfigurer {

@Value("${cors.allowed-origins}")
private String allowedOrigins;

@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOriginPatterns(allowedOrigins.split(","))
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
.allowedHeaders("*")
.exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed
.allowCredentials(true)
.maxAge(3600)
;
}
}
26 changes: 3 additions & 23 deletions src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.JsonElement;
Expand All @@ -43,16 +41,12 @@
import io.lettuce.core.dynamic.annotation.Param;
import io.swagger.v3.oas.annotations.Operation;




/**
* @Objective Saving ANC data for Nurse and Doctor.
*/

@CrossOrigin
@RestController
@RequestMapping(value = "/ANC", headers = "Authorization",consumes = "application/json", produces = "application/json")
@RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json")
public class AntenatalCareController {
private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());

Expand All @@ -70,7 +64,6 @@ public void setAncServiceImpl(ANCServiceImpl ancServiceImpl) {
* @throws Exception
*/

@CrossOrigin
@Operation(summary = "Save ANC nurse data")
@PostMapping(value = { "/save/nurseData" })
public String saveBenANCNurseData(@RequestBody String requestObj,
Expand Down Expand Up @@ -103,7 +96,6 @@ public String saveBenANCNurseData(@RequestBody String requestObj,
return response.toString();
}

@CrossOrigin
@Operation(summary = "Save ANC doctor data")
@PostMapping(value = { "/save/doctorData" })
public String saveBenANCDoctorData(@RequestBody String requestObj,
Expand Down Expand Up @@ -132,12 +124,11 @@ public String saveBenANCDoctorData(@RequestBody String requestObj,
} catch (Exception e) {
logger.error("Error while saving doctor data:" + e.getMessage());
response.setError(5000, e.getMessage());

}
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get ANC beneficiary visit details from nurse")
@PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" })
@Transactional(rollbackFor = Exception.class)
Expand All @@ -164,7 +155,6 @@ public String getBenVisitDetailsFrmNurseANC(
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get ANC beneficiary details from nurse")
@PostMapping(value = { "/getBenANCDetailsFrmNurseANC" })
@Transactional(rollbackFor = Exception.class)
Expand Down Expand Up @@ -192,7 +182,6 @@ public String getBenANCDetailsFrmNurseANC(
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get ANC beneficiary history from nurse")
@PostMapping(value = { "/getBenANCHistoryDetails" })
public String getBenANCHistoryDetails(
Expand All @@ -218,7 +207,6 @@ public String getBenANCHistoryDetails(
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get ANC beneficiary vitals from nurse")
@PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" })
public String getBenANCVitalDetailsFrmNurseANC(
Expand All @@ -245,7 +233,6 @@ public String getBenANCVitalDetailsFrmNurseANC(
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get ANC beneficiary examination details from nurse")
@PostMapping(value = { "/getBenExaminationDetailsANC" })
public String getBenExaminationDetailsANC(
Expand All @@ -271,7 +258,6 @@ public String getBenExaminationDetailsANC(
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get ANC beneficiary case record")
@PostMapping(value = { "/getBenCaseRecordFromDoctorANC" })
@Transactional(rollbackFor = Exception.class)
Expand Down Expand Up @@ -299,7 +285,6 @@ public String getBenCaseRecordFromDoctorANC(
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Check high risk pregnancy status for ANC beneficiary")
@PostMapping(value = { "/getHRPStatus" })
@Transactional(rollbackFor = Exception.class)
Expand Down Expand Up @@ -329,7 +314,6 @@ public String getHRPStatus(
return response.toString();
}

@CrossOrigin
@Operation(summary = "Update ANC beneficiary data")
@PostMapping(value = { "/update/ANCScreen" })
public String updateANCCareNurse(@RequestBody String requestObj) {
Expand Down Expand Up @@ -358,7 +342,6 @@ public String updateANCCareNurse(@RequestBody String requestObj) {
return response.toString();
}

@CrossOrigin
@Operation(summary = "Update ANC beneficiary history")
@PostMapping(value = { "/update/historyScreen" })
public String updateANCHistoryNurse(@RequestBody String requestObj) {
Expand Down Expand Up @@ -387,7 +370,6 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) {
return response.toString();
}

@CrossOrigin
@Operation(summary = "Update ANC beneficiary vitals")
@PostMapping(value = { "/update/vitalScreen" })
public String updateANCVitalNurse(@RequestBody String requestObj) {
Expand Down Expand Up @@ -416,7 +398,6 @@ public String updateANCVitalNurse(@RequestBody String requestObj) {
return response.toString();
}

@CrossOrigin
@Operation(summary = "Update ANC examination data")
@PostMapping(value = { "/update/examinationScreen" })
public String updateANCExaminationNurse(@RequestBody String requestObj) {
Expand Down Expand Up @@ -445,7 +426,6 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) {
return response.toString();
}

@CrossOrigin
@Operation(summary = "Update ANC doctor data")
@PostMapping(value = { "/update/doctorData" })
public String updateANCDoctorData(@RequestBody String requestObj,
Expand All @@ -470,7 +450,7 @@ public String updateANCDoctorData(@RequestBody String requestObj,
} catch (Exception e) {
logger.error("Unable to modify data. " + e.getMessage());
response.setError(5000, e.getMessage());

}

return response.toString();
Expand Down
20 changes: 1 addition & 19 deletions src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.CrossOrigin;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import com.google.gson.JsonElement;
Expand All @@ -49,7 +47,7 @@
/**
* @Objective Saving Cancer screening data for Nurse and Doctor both.
*/
@CrossOrigin

@RestController
@RequestMapping(value = "/CS-cancerScreening", headers = "Authorization", consumes = "application/json", produces = "application/json")
public class CancerScreeningController {
Expand All @@ -70,7 +68,6 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) {
* @throws Exception
*/

@CrossOrigin
@Operation(summary = "Save cancer screening data collected by nurse")
@PostMapping(value = { "/save/nurseData" })
public String saveBenCancerScreeningNurseData(@RequestBody String requestObj,
Expand Down Expand Up @@ -108,7 +105,6 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj,
* @return success or failure response
*/

@CrossOrigin
@Operation(summary = "Update cancer screening data by the doctor")
@PostMapping(value = { "/save/doctorData" })
public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
Expand Down Expand Up @@ -140,7 +136,6 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
return response.toString();
}

@CrossOrigin()
@Operation(summary = "Get beneficiary visit details")
@PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" })
public String getBenDataFrmNurseScrnToDocScrnVisitDetails(
Expand Down Expand Up @@ -171,7 +166,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails(
* @return history details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary cancer history")
@PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" })
public String getBenDataFrmNurseScrnToDocScrnHistory(
Expand Down Expand Up @@ -202,7 +196,6 @@ public String getBenDataFrmNurseScrnToDocScrnHistory(
* @return vital details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary vitals")
@PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" })
public String getBenDataFrmNurseScrnToDocScrnVital(
Expand Down Expand Up @@ -233,7 +226,6 @@ public String getBenDataFrmNurseScrnToDocScrnVital(
* @return examination details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary examination details")
@PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" })
public String getBenDataFrmNurseScrnToDocScrnExamination(
Expand Down Expand Up @@ -264,7 +256,6 @@ public String getBenDataFrmNurseScrnToDocScrnExamination(
* @return previous family history details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary family history")
@PostMapping(value = { "/getBenCancerFamilyHistory" })
public String getBenCancerFamilyHistory(
Expand Down Expand Up @@ -297,7 +288,6 @@ public String getBenCancerFamilyHistory(
* @return previous personal history details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary personal history")
@PostMapping(value = { "/getBenCancerPersonalHistory" })
public String getBenCancerPersonalHistory(
Expand Down Expand Up @@ -330,7 +320,6 @@ public String getBenCancerPersonalHistory(
* @return previous personal history details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary personal diet history")
@PostMapping(value = { "/getBenCancerPersonalDietHistory" })
public String getBenCancerPersonalDietHistory(
Expand Down Expand Up @@ -363,7 +352,6 @@ public String getBenCancerPersonalDietHistory(
* @return previous obstetric history details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary obstetric history")
@PostMapping(value = { "/getBenCancerObstetricHistory" })
public String getBenCancerObstetricHistory(
Expand Down Expand Up @@ -395,7 +383,6 @@ public String getBenCancerObstetricHistory(
* @return diagnosis details in JSON format
*/

@CrossOrigin()
@Operation(summary = "Get beneficiary case record and referral details")
@PostMapping(value = { "/getBenCaseRecordFromDoctorCS" })
@Transactional(rollbackFor = Exception.class)
Expand All @@ -422,7 +409,6 @@ public String getBenCaseRecordFromDoctorCS(
return response.toString();
}

@CrossOrigin
@Operation(summary = "Update cancer screening history")
@PostMapping(value = { "/update/historyScreen" })
public String updateCSHistoryNurse(
Expand Down Expand Up @@ -475,7 +461,6 @@ public String updateCSHistoryNurse(
* details entered by Doctor
*/

@CrossOrigin
@Operation(summary = "Update beneficiary vitals")
@PostMapping(value = { "/update/vitalScreen" })
public String upodateBenVitalDetail(
Expand Down Expand Up @@ -515,7 +500,6 @@ public String upodateBenVitalDetail(
* the details entered by Doctor
*/

@CrossOrigin
@Operation(summary = "Update beneficiary examination details")
@PostMapping(value = { "/update/examinationScreen" })
public String upodateBenExaminationDetail(@RequestBody String requestObj) {
Expand Down Expand Up @@ -552,7 +536,6 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) {
*
*/

@CrossOrigin
@Operation(summary = "Update cancer diagnosis details by oncologist")
@PostMapping(value = { "/update/examinationScreen/diagnosis" })
public String updateCancerDiagnosisDetailsByOncologist(
Expand Down Expand Up @@ -588,7 +571,6 @@ public String updateCancerDiagnosisDetailsByOncologist(
*
*/

@CrossOrigin
@Operation(summary = "Update cancer screening data")
@PostMapping(value = { "/update/doctorData" })
public String updateCancerScreeningDoctorData(@RequestBody String requestObj) {
Expand Down
Loading
Loading