Skip to content

Commit f7717ad

Browse files
vishwab1vishwab1
authored
fix: cors error removed in all api (#89)
1 parent b58c191 commit f7717ad

29 files changed

+188
-405
lines changed

‎src/main/environment/common_ci.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,5 @@ [email protected]_API_LOGGING_FILE_NAME@
7676

7777
springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
7878
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
79+
80+
cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@

‎src/main/environment/common_example.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,6 @@ jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
7373
logging.path=logs/
7474
logging.file.name=logs/tm-api.log
7575

76+
77+
cors.allowed-origins=http://localhost:*
78+

‎src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java‎

Lines changed: 4 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.slf4j.LoggerFactory;
2727
import org.springframework.beans.factory.annotation.Autowired;
2828
import org.springframework.transaction.annotation.Transactional;
29-
import org.springframework.web.bind.annotation.CrossOrigin;
29+
3030
import org.springframework.web.bind.annotation.PostMapping;
3131
import org.springframework.web.bind.annotation.RequestBody;
3232
import org.springframework.web.bind.annotation.RequestHeader;
@@ -43,16 +43,11 @@
4343
import io.lettuce.core.dynamic.annotation.Param;
4444
import io.swagger.v3.oas.annotations.Operation;
4545

46-
47-
48-
4946
/**
5047
* @Objective Saving ANC data for Nurse and Doctor.
5148
*/
52-
53-
@CrossOrigin
5449
@RestController
55-
@RequestMapping(value = "/ANC", headers = "Authorization",consumes = "application/json", produces = "application/json")
50+
@RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json")
5651
public class AntenatalCareController {
5752
private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
5853

@@ -69,8 +64,6 @@ public void setAncServiceImpl(ANCServiceImpl ancServiceImpl) {
6964
* @return success or failure response
7065
* @throws Exception
7166
*/
72-
73-
@CrossOrigin
7467
@Operation(summary = "Save ANC nurse data")
7568
@PostMapping(value = { "/save/nurseData" })
7669
public String saveBenANCNurseData(@RequestBody String requestObj,
@@ -103,7 +96,6 @@ public String saveBenANCNurseData(@RequestBody String requestObj,
10396
return response.toString();
10497
}
10598

106-
@CrossOrigin
10799
@Operation(summary = "Save ANC doctor data")
108100
@PostMapping(value = { "/save/doctorData" })
109101
public String saveBenANCDoctorData(@RequestBody String requestObj,
@@ -132,12 +124,11 @@ public String saveBenANCDoctorData(@RequestBody String requestObj,
132124
} catch (Exception e) {
133125
logger.error("Error while saving doctor data:" + e.getMessage());
134126
response.setError(5000, e.getMessage());
135-
127+
136128
}
137129
return response.toString();
138130
}
139131

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

167-
@CrossOrigin()
168158
@Operation(summary = "Get ANC beneficiary details from nurse")
169159
@PostMapping(value = { "/getBenANCDetailsFrmNurseANC" })
170160
@Transactional(rollbackFor = Exception.class)
@@ -192,7 +182,6 @@ public String getBenANCDetailsFrmNurseANC(
192182
return response.toString();
193183
}
194184

195-
@CrossOrigin()
196185
@Operation(summary = "Get ANC beneficiary history from nurse")
197186
@PostMapping(value = { "/getBenANCHistoryDetails" })
198187
public String getBenANCHistoryDetails(
@@ -218,7 +207,6 @@ public String getBenANCHistoryDetails(
218207
return response.toString();
219208
}
220209

221-
@CrossOrigin()
222210
@Operation(summary = "Get ANC beneficiary vitals from nurse")
223211
@PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" })
224212
public String getBenANCVitalDetailsFrmNurseANC(
@@ -245,7 +233,6 @@ public String getBenANCVitalDetailsFrmNurseANC(
245233
return response.toString();
246234
}
247235

248-
@CrossOrigin()
249236
@Operation(summary = "Get ANC beneficiary examination details from nurse")
250237
@PostMapping(value = { "/getBenExaminationDetailsANC" })
251238
public String getBenExaminationDetailsANC(
@@ -271,7 +258,6 @@ public String getBenExaminationDetailsANC(
271258
return response.toString();
272259
}
273260

274-
@CrossOrigin()
275261
@Operation(summary = "Get ANC beneficiary case record")
276262
@PostMapping(value = { "/getBenCaseRecordFromDoctorANC" })
277263
@Transactional(rollbackFor = Exception.class)
@@ -299,7 +285,6 @@ public String getBenCaseRecordFromDoctorANC(
299285
return response.toString();
300286
}
301287

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

332-
@CrossOrigin
333317
@Operation(summary = "Update ANC beneficiary data")
334318
@PostMapping(value = { "/update/ANCScreen" })
335319
public String updateANCCareNurse(@RequestBody String requestObj) {
@@ -358,7 +342,6 @@ public String updateANCCareNurse(@RequestBody String requestObj) {
358342
return response.toString();
359343
}
360344

361-
@CrossOrigin
362345
@Operation(summary = "Update ANC beneficiary history")
363346
@PostMapping(value = { "/update/historyScreen" })
364347
public String updateANCHistoryNurse(@RequestBody String requestObj) {
@@ -387,7 +370,6 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) {
387370
return response.toString();
388371
}
389372

390-
@CrossOrigin
391373
@Operation(summary = "Update ANC beneficiary vitals")
392374
@PostMapping(value = { "/update/vitalScreen" })
393375
public String updateANCVitalNurse(@RequestBody String requestObj) {
@@ -416,7 +398,6 @@ public String updateANCVitalNurse(@RequestBody String requestObj) {
416398
return response.toString();
417399
}
418400

419-
@CrossOrigin
420401
@Operation(summary = "Update ANC examination data")
421402
@PostMapping(value = { "/update/examinationScreen" })
422403
public String updateANCExaminationNurse(@RequestBody String requestObj) {
@@ -445,7 +426,6 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) {
445426
return response.toString();
446427
}
447428

448-
@CrossOrigin
449429
@Operation(summary = "Update ANC doctor data")
450430
@PostMapping(value = { "/update/doctorData" })
451431
public String updateANCDoctorData(@RequestBody String requestObj,
@@ -470,7 +450,7 @@ public String updateANCDoctorData(@RequestBody String requestObj,
470450
} catch (Exception e) {
471451
logger.error("Unable to modify data. " + e.getMessage());
472452
response.setError(5000, e.getMessage());
473-
453+
474454
}
475455

476456
return response.toString();

‎src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.slf4j.LoggerFactory;
2727
import org.springframework.beans.factory.annotation.Autowired;
2828
import org.springframework.transaction.annotation.Transactional;
29-
import org.springframework.web.bind.annotation.CrossOrigin;
29+
3030
import org.springframework.web.bind.annotation.PostMapping;
3131
import org.springframework.web.bind.annotation.RequestBody;
3232
import org.springframework.web.bind.annotation.RequestHeader;
@@ -49,7 +49,6 @@
4949
/**
5050
* @Objective Saving Cancer screening data for Nurse and Doctor both.
5151
*/
52-
@CrossOrigin
5352
@RestController
5453
@RequestMapping(value = "/CS-cancerScreening", headers = "Authorization", consumes = "application/json", produces = "application/json")
5554
public class CancerScreeningController {
@@ -69,8 +68,6 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) {
6968
* @return success or failure response
7069
* @throws Exception
7170
*/
72-
73-
@CrossOrigin
7471
@Operation(summary = "Save cancer screening data collected by nurse")
7572
@PostMapping(value = { "/save/nurseData" })
7673
public String saveBenCancerScreeningNurseData(@RequestBody String requestObj,
@@ -107,8 +104,6 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj,
107104
* @param JSON requestObj
108105
* @return success or failure response
109106
*/
110-
111-
@CrossOrigin
112107
@Operation(summary = "Update cancer screening data by the doctor")
113108
@PostMapping(value = { "/save/doctorData" })
114109
public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
@@ -140,7 +135,6 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
140135
return response.toString();
141136
}
142137

143-
@CrossOrigin()
144138
@Operation(summary = "Get beneficiary visit details")
145139
@PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" })
146140
public String getBenDataFrmNurseScrnToDocScrnVisitDetails(
@@ -170,8 +164,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails(
170164
* @param benRegID and benVisitID
171165
* @return history details in JSON format
172166
*/
173-
174-
@CrossOrigin()
175167
@Operation(summary = "Get beneficiary cancer history")
176168
@PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" })
177169
public String getBenDataFrmNurseScrnToDocScrnHistory(
@@ -201,8 +193,6 @@ public String getBenDataFrmNurseScrnToDocScrnHistory(
201193
* @param benRegID and benVisitID
202194
* @return vital details in JSON format
203195
*/
204-
205-
@CrossOrigin()
206196
@Operation(summary = "Get beneficiary vitals")
207197
@PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" })
208198
public String getBenDataFrmNurseScrnToDocScrnVital(
@@ -232,8 +222,6 @@ public String getBenDataFrmNurseScrnToDocScrnVital(
232222
* @param benRegID and benVisitID
233223
* @return examination details in JSON format
234224
*/
235-
236-
@CrossOrigin()
237225
@Operation(summary = "Get beneficiary examination details")
238226
@PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" })
239227
public String getBenDataFrmNurseScrnToDocScrnExamination(
@@ -263,8 +251,6 @@ public String getBenDataFrmNurseScrnToDocScrnExamination(
263251
* @param benRegID
264252
* @return previous family history details in JSON format
265253
*/
266-
267-
@CrossOrigin()
268254
@Operation(summary = "Get beneficiary family history")
269255
@PostMapping(value = { "/getBenCancerFamilyHistory" })
270256
public String getBenCancerFamilyHistory(
@@ -296,8 +282,6 @@ public String getBenCancerFamilyHistory(
296282
* @param benRegID
297283
* @return previous personal history details in JSON format
298284
*/
299-
300-
@CrossOrigin()
301285
@Operation(summary = "Get beneficiary personal history")
302286
@PostMapping(value = { "/getBenCancerPersonalHistory" })
303287
public String getBenCancerPersonalHistory(
@@ -329,8 +313,6 @@ public String getBenCancerPersonalHistory(
329313
* @param benRegID
330314
* @return previous personal history details in JSON format
331315
*/
332-
333-
@CrossOrigin()
334316
@Operation(summary = "Get beneficiary personal diet history")
335317
@PostMapping(value = { "/getBenCancerPersonalDietHistory" })
336318
public String getBenCancerPersonalDietHistory(
@@ -362,8 +344,6 @@ public String getBenCancerPersonalDietHistory(
362344
* @param benRegID
363345
* @return previous obstetric history details in JSON format
364346
*/
365-
366-
@CrossOrigin()
367347
@Operation(summary = "Get beneficiary obstetric history")
368348
@PostMapping(value = { "/getBenCancerObstetricHistory" })
369349
public String getBenCancerObstetricHistory(
@@ -394,8 +374,6 @@ public String getBenCancerObstetricHistory(
394374
* @param benRegID
395375
* @return diagnosis details in JSON format
396376
*/
397-
398-
@CrossOrigin()
399377
@Operation(summary = "Get beneficiary case record and referral details")
400378
@PostMapping(value = { "/getBenCaseRecordFromDoctorCS" })
401379
@Transactional(rollbackFor = Exception.class)
@@ -422,7 +400,6 @@ public String getBenCaseRecordFromDoctorCS(
422400
return response.toString();
423401
}
424402

425-
@CrossOrigin
426403
@Operation(summary = "Update cancer screening history")
427404
@PostMapping(value = { "/update/historyScreen" })
428405
public String updateCSHistoryNurse(
@@ -474,8 +451,6 @@ public String updateCSHistoryNurse(
474451
* @objective Replace Cancer Screening Vital Details entered by Nurse with the
475452
* details entered by Doctor
476453
*/
477-
478-
@CrossOrigin
479454
@Operation(summary = "Update beneficiary vitals")
480455
@PostMapping(value = { "/update/vitalScreen" })
481456
public String upodateBenVitalDetail(
@@ -514,8 +489,6 @@ public String upodateBenVitalDetail(
514489
* @objective Replace Cancer Screening examination Details entered by Nurse with
515490
* the details entered by Doctor
516491
*/
517-
518-
@CrossOrigin
519492
@Operation(summary = "Update beneficiary examination details")
520493
@PostMapping(value = { "/update/examinationScreen" })
521494
public String upodateBenExaminationDetail(@RequestBody String requestObj) {
@@ -551,8 +524,6 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) {
551524
* @objective update Cancer Diagnosis Details By Oncologist
552525
*
553526
*/
554-
555-
@CrossOrigin
556527
@Operation(summary = "Update cancer diagnosis details by oncologist")
557528
@PostMapping(value = { "/update/examinationScreen/diagnosis" })
558529
public String updateCancerDiagnosisDetailsByOncologist(
@@ -587,8 +558,6 @@ public String updateCancerDiagnosisDetailsByOncologist(
587558
* @objective Replace doctor data for the doctor next visit
588559
*
589560
*/
590-
591-
@CrossOrigin
592561
@Operation(summary = "Update cancer screening data")
593562
@PostMapping(value = { "/update/doctorData" })
594563
public String updateCancerScreeningDoctorData(@RequestBody String requestObj) {

0 commit comments

Comments
 (0)