Skip to content

Commit 73ea731

Browse files
vishwab1vishwab1
authored
CORS Configuration for Admin API Services (#87)
* implemented cors check * fix:cors remove for admin api * fix: changed ci properties
1 parent c7731f6 commit 73ea731

47 files changed

Lines changed: 309 additions & 462 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎logs/admin-api.log.json‎

Lines changed: 163 additions & 0 deletions
Large diffs are not rendered by default.

‎logs/admin-api.log.json.2025-06-13.gz‎

3.96 KB
Binary file not shown.

‎src/main/environment/admin_ci.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,6 @@ logging.file.name=@env.ADMIN_API_LOGGING_FILE_NAME@
2323
common-url=@env.COMMON_API@
2424

2525
springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
26-
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
26+
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
27+
28+
cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@

‎src/main/environment/admin_example.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,5 @@ logging.path=logs/
2424
logging.file.name=logs/admin-api.log
2525

2626
jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
27+
28+
cors.allowed-origins=http://localhost:*

‎src/main/java/com/iemr/admin/config/CorsConfig.java‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.iemr.admin.config;
2+
3+
import org.springframework.context.annotation.Configuration;
4+
import org.springframework.web.servlet.config.annotation.CorsRegistry;
5+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
6+
import java.util.Arrays;
7+
import org.springframework.beans.factory.annotation.Value;
8+
9+
@Configuration
10+
public class CorsConfig implements WebMvcConfigurer {
11+
12+
@Value("${cors.allowed-origins}")
13+
private String allowedOrigins;
14+
15+
@Override
16+
public void addCorsMappings(CorsRegistry registry) {
17+
registry.addMapping("/**")
18+
.allowedOriginPatterns(
19+
Arrays.stream(allowedOrigins.split(","))
20+
.map(String::trim)
21+
.toArray(String[]::new))
22+
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
23+
.allowedHeaders("*")
24+
.exposedHeaders("Authorization", "Jwttoken")
25+
.allowCredentials(true)
26+
.maxAge(3600);
27+
}
28+
}

‎src/main/java/com/iemr/admin/controller/blocking/BlockingController.java‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
@@ -60,7 +60,6 @@ public void setServiceProvider_ServiceImpl(BlockingInter blockingInter) {
6060
this.blockingInter = blockingInter;
6161
}
6262

63-
@CrossOrigin()
6463
@Operation(summary = "Block provider 1")
6564
@RequestMapping(value = "/blockProvider1", headers = "Authorization", method = { RequestMethod.POST }, produces = {
6665
"application/json" })
@@ -119,7 +118,6 @@ public String blockProvider1(@RequestBody String providerBlocking) {
119118

120119
}
121120

122-
@CrossOrigin()
123121
@Operation(summary = "Block provider")
124122
@RequestMapping(value = "/blockProvider", headers = "Authorization", method = { RequestMethod.POST }, produces = {
125123
"application/json" })
@@ -178,7 +176,6 @@ public String blockProvider(@RequestBody String providerBlocking) {
178176

179177
}
180178

181-
@CrossOrigin()
182179
@Operation(summary = "Block provider by service id")
183180
@RequestMapping(value = { "/blockProviderByServiceId" }, method = { RequestMethod.POST }, produces = {
184181
"application/json" }, headers = "Authorization")
@@ -239,7 +236,6 @@ public String blockProviderByServiceId(@RequestBody String blockProviderByServic
239236

240237
}
241238

242-
@CrossOrigin()
243239
@Operation(summary = "Get provider status")
244240
@RequestMapping(value = "/getProviderStatus", headers = "Authorization", method = {
245241
RequestMethod.POST }, produces = { "application/json" })
@@ -266,7 +262,6 @@ public String getProviderStatus(@RequestBody String getProviderStatus) {
266262

267263
}
268264

269-
@CrossOrigin()
270265
@Operation(summary = "Get provider status 1")
271266
@RequestMapping(value = "/getProviderStatus1", headers = "Authorization", method = {
272267
RequestMethod.POST }, produces = { "application/json" })
@@ -293,7 +288,6 @@ public String getProviderStatus1(@RequestBody String getProviderStatus) {
293288

294289
}
295290

296-
@CrossOrigin()
297291
@Operation(summary = "Get service liens using provider")
298292
@RequestMapping(value = "/getServiceLinesUsingProvider", headers = "Authorization", method = {
299293
RequestMethod.POST }, produces = { "application/json" })
@@ -320,7 +314,6 @@ public String getServiceLiensUsingProvider(@RequestBody String getServiceLiensUs
320314

321315
}
322316

323-
@CrossOrigin()
324317
@Operation(summary = "Get provider status by provider and service id")
325318
@RequestMapping(value = "/getProviderStatusByProviderAndServiceId", headers = "Authorization", method = {
326319
RequestMethod.POST }, produces = { "application/json" })
@@ -348,7 +341,6 @@ public String getProviderStatusByProviderAndServiceId(@RequestBody String getPro
348341

349342
}
350343

351-
@CrossOrigin()
352344
@Operation(summary = "Block provider by service")
353345
@RequestMapping(value = "/blockProviderByService", headers = "Authorization", method = {
354346
RequestMethod.POST }, produces = { "application/json" })
@@ -401,7 +393,6 @@ public String blockProviderByService(@RequestBody String providerServiceBlocking
401393

402394
}
403395

404-
@CrossOrigin()
405396
@Operation(summary = "Get provider status by service")
406397
@RequestMapping(value = "/getProviderStatusByService", headers = "Authorization", method = {
407398
RequestMethod.POST }, produces = { "application/json" })
@@ -430,7 +421,6 @@ public String getProviderStatusByService(@RequestBody String providerServiceBloc
430421

431422
}
432423

433-
@CrossOrigin()
434424
@Operation(summary = "Block provider by state")
435425
@RequestMapping(value = "/blockProviderByState", headers = "Authorization", method = {
436426
RequestMethod.POST }, produces = { "application/json" })
@@ -491,7 +481,6 @@ public String blockProviderByState(@RequestBody String providerStateBlocking) {
491481

492482
}
493483

494-
@CrossOrigin()
495484
@Operation(summary = "Get provider status by state")
496485
@RequestMapping(value = "/getProviderStatusByState", headers = "Authorization", method = {
497486
RequestMethod.POST }, produces = { "application/json" })
@@ -520,7 +509,6 @@ public String getProviderStatusByState(@RequestBody String providerStateBlocking
520509

521510
}
522511

523-
@CrossOrigin()
524512
@Operation(summary = "Block user")
525513
@RequestMapping(value = "/blockUser", headers = "Authorization", method = { RequestMethod.POST }, produces = {
526514
"application/json" })
@@ -568,7 +556,6 @@ public String blockUser(@RequestBody String blockUser) {
568556

569557
}
570558

571-
@CrossOrigin()
572559
@Operation(summary = "Get status")
573560
@RequestMapping(value = "/getStatus", headers = "Authorization", method = { RequestMethod.POST }, produces = {
574561
"application/json" })
@@ -593,7 +580,6 @@ public String getStatus(@RequestBody String getStatus) {
593580

594581
}
595582

596-
@CrossOrigin()
597583
@Operation(summary = "Provider state and service lines")
598584
@RequestMapping(value = "/addProviderStateAndServiceLines", headers = "Authorization", method = {
599585
RequestMethod.POST }, produces = { "application/json" })
@@ -657,7 +643,6 @@ public String ProviderStateAndServiceLines(@RequestBody String ProviderStateAndS
657643

658644
}
659645

660-
@CrossOrigin()
661646
@Operation(summary = "Delete provider state and service lines")
662647
@RequestMapping(value = "/deleteProviderStateAndServiceLines", headers = "Authorization", method = {
663648
RequestMethod.POST }, produces = { "application/json" })
@@ -701,7 +686,6 @@ public String deleteProviderStateAndServiceLines(@RequestBody String deleteProvi
701686

702687
}
703688

704-
@CrossOrigin()
705689
@Operation(summary = "Create cit mapping with service lines")
706690
@RequestMapping(value = "/createCitMappingwithServiceLines", headers = "Authorization", method = {
707691
RequestMethod.POST }, produces = { "application/json" })
@@ -728,7 +712,6 @@ public String createCitMappingwithServiceLines(@RequestBody String createCitMapp
728712

729713
}
730714

731-
@CrossOrigin()
732715
@Operation(summary = "Get mapped service lines and state to provider")
733716
@RequestMapping(value = "/getMappedServiceLinesAndStatetoProvider", headers = "Authorization", method = {
734717
RequestMethod.POST }, consumes = { "application/json" }, produces = { "application/json" })
@@ -756,7 +739,6 @@ public String getMappedServiceLinesAndStatetoProvider(@RequestBody String getMap
756739

757740
}
758741

759-
@CrossOrigin()
760742
@Operation(summary = "Map provider and service lines")
761743
@RequestMapping(value = "/mapServiceLinesAndStatetoProvider", headers = "Authorization", method = {
762744
RequestMethod.POST }, produces = { "application/json" })
@@ -822,7 +804,6 @@ public String mapProviderAndServiceLines(@RequestBody String mapProviderAndServi
822804

823805
}
824806

825-
@CrossOrigin()
826807
@Operation(summary = "Edit mapped service lines and state to provider")
827808
@RequestMapping(value = "/editMappedServiceLinesAndStatetoProvider", headers = "Authorization", method = {
828809
RequestMethod.POST }, produces = { "application/json" })
@@ -856,7 +837,6 @@ public String editMappedServiceLinesAndStatetoProvider(
856837

857838
}
858839

859-
@CrossOrigin()
860840
@Operation(summary = "Delete mapped service lines and state to provider")
861841
@RequestMapping(value = "/deleteMappedServiceLinesAndStatetoProvider", headers = "Authorization", method = {
862842
RequestMethod.POST }, produces = { "application/json" })

‎src/main/java/com/iemr/admin/controller/calibration/CalibrationController.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.slf4j.Logger;
2525
import org.slf4j.LoggerFactory;
2626
import org.springframework.beans.factory.annotation.Autowired;
27-
import org.springframework.web.bind.annotation.CrossOrigin;
27+
2828
import org.springframework.web.bind.annotation.RequestBody;
2929
import org.springframework.web.bind.annotation.RequestMapping;
3030
import org.springframework.web.bind.annotation.RequestMethod;
@@ -52,7 +52,6 @@ public class CalibrationController {
5252
* @param request
5353
* @return CalibrationStripMasterData
5454
*/
55-
@CrossOrigin()
5655
@Operation(summary = "Create calibration strip")
5756
@RequestMapping(value = "/createCalibrationStrip", headers = "Authorization", method = {
5857
RequestMethod.POST }, produces = { "application/json" })
@@ -85,7 +84,6 @@ public String createCalibrationStrip(
8584
* @param request
8685
* @return CalibrationStripList
8786
*/
88-
@CrossOrigin()
8987
@Operation(summary = "Fetch calibration strip")
9088
@RequestMapping(value = "/fetchCalibrationStrips", headers = "Authorization", method = {
9189
RequestMethod.POST }, produces = { "application/json" })
@@ -113,7 +111,6 @@ public String fetchCalibrationStrips(
113111
* @param request
114112
* @return Response
115113
*/
116-
@CrossOrigin()
117114
@Operation(summary = "Delete calibration strip")
118115
@RequestMapping(value = "/deleteCalibrationStrip", headers = "Authorization", method = {
119116
RequestMethod.POST }, produces = { "application/json" })
@@ -141,7 +138,6 @@ public String deleteCalibrationStrip(
141138

142139
}
143140

144-
@CrossOrigin()
145141
@Operation(summary = "Update calibration strip")
146142
@RequestMapping(value = "/updateCalibrationStrip", headers = "Authorization", method = {
147143
RequestMethod.POST }, produces = { "application/json" })

‎src/main/java/com/iemr/admin/controller/createorder/CareStreamCreateOrderController.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
import org.slf4j.Logger;
3131
import org.slf4j.LoggerFactory;
32-
import org.springframework.web.bind.annotation.CrossOrigin;
32+
3333
import org.springframework.web.bind.annotation.RequestBody;
3434
import org.springframework.web.bind.annotation.RequestMapping;
3535
import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +49,6 @@ public class CareStreamCreateOrderController {
4949
private static final char START_OF_BLOCK = '\u000b';
5050
private static final char CARRIAGE_RETURN = 13;
5151

52-
@CrossOrigin()
5352
@Operation(summary = "Create order")
5453
@RequestMapping(value = "/createOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5554
"application/json" })
@@ -118,7 +117,6 @@ public String createOrder(@RequestBody String createOrder) throws UnknownHostExc
118117
return response.toString();
119118
}
120119

121-
@CrossOrigin()
122120
@Operation(summary = "Update order")
123121
@RequestMapping(value = "/UpdateOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = {
124122
"application/json" })
@@ -174,7 +172,6 @@ public String UpdateOrder(@RequestBody String UpdateOrder) throws UnknownHostExc
174172
return response.toString();
175173
}
176174

177-
@CrossOrigin()
178175
@Operation(summary = "Delete order")
179176
@RequestMapping(value = "/deleteOrder", headers = "Authorization", method = { RequestMethod.POST }, produces = {
180177
"application/json" })

‎src/main/java/com/iemr/admin/controller/drugstrength/DrugStrength.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
@@ -48,7 +48,6 @@ public class DrugStrength {
4848
@Autowired
4949
private DrugStrangthInter durgStrangthInter;
5050

51-
@CrossOrigin()
5251
@Operation(summary = "Create drug strength")
5352
@RequestMapping(value = "/createDrugStrangth", headers = "Authorization", method = {
5453
RequestMethod.POST }, produces = { "application/json" })
@@ -76,7 +75,6 @@ public String createDrugStrangth(@RequestBody String createDrugStrangth) {
7675

7776
}
7877

79-
@CrossOrigin()
8078
@Operation(summary = "Get drug strength")
8179
@RequestMapping(value = "/getDrugStrangth", headers = "Authorization", method = { RequestMethod.POST }, produces = {
8280
"application/json" })
@@ -103,7 +101,6 @@ public String getDrugStrangth(@RequestBody String getDrugStrangth) {
103101

104102
}
105103

106-
@CrossOrigin()
107104
@Operation(summary = "Update drug strength")
108105
@RequestMapping(value = "/updateDrugStrangth", headers = "Authorization", method = {
109106
RequestMethod.POST }, produces = { "application/json" })
@@ -136,7 +133,6 @@ public String updateDrugStrangth(@RequestBody String updateDrugStrangth) {
136133

137134
}
138135

139-
@CrossOrigin()
140136
@Operation(summary = "Delete drug strength")
141137
@RequestMapping(value = "/deleteDrugStrangth", headers = "Authorization", method = {
142138
RequestMethod.POST }, produces = { "application/json" })

‎src/main/java/com/iemr/admin/controller/drugtype/DrugtypeController.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.Logger;
2929
import org.slf4j.LoggerFactory;
3030
import org.springframework.beans.factory.annotation.Autowired;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.RequestBody;
3333
import org.springframework.web.bind.annotation.RequestMapping;
3434
import org.springframework.web.bind.annotation.RequestMethod;
@@ -48,7 +48,6 @@ public class DrugtypeController {
4848
@Autowired
4949
private DrugtypeInter drugtypeInter;
5050

51-
@CrossOrigin()
5251
@Operation(summary = "Create manufacturer")
5352
@RequestMapping(value = "/createDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5453
"application/json" })
@@ -75,7 +74,6 @@ public String createManufacturer(@RequestBody String createDrugtype) {
7574

7675
}
7776

78-
@CrossOrigin()
7977
@Operation(summary = "Get manufacturer")
8078
@RequestMapping(value = "/getDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
8179
"application/json" })
@@ -102,7 +100,6 @@ public String getManufacturer(@RequestBody String getDrugtype) {
102100

103101
}
104102

105-
@CrossOrigin()
106103
@Operation(summary = "Edit manufacturer")
107104
@RequestMapping(value = "/editDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
108105
"application/json" })
@@ -137,7 +134,6 @@ public String editManufacturer(@RequestBody String editDrugtype) {
137134

138135
}
139136

140-
@CrossOrigin()
141137
@Operation(summary = "Delete manufacturer")
142138
@RequestMapping(value = "/deleteDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
143139
"application/json" })

0 commit comments

Comments
 (0)