Skip to content

Commit a116693

Browse files
vishwab1vishwab1
committed
fix:cors error remove in all api
1 parent ed96d8c commit a116693

22 files changed

Lines changed: 84 additions & 129 deletions

‎src/main/environment/common_ci.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,5 @@ logging.file.name=@env.INVENTORY_API_LOGGING_FILE_NAME@
1919
springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@
2020
springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@
2121

22+
cors.allowed-origins=@env.CORS_ALLOWED_ORIGINS@
23+

‎src/main/environment/common_example.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,5 @@ spring.data.redis.host=localhost
1717
jwt.secret=my-32-character-ultra-secure-and-ultra-long-secret
1818
logging.path=logs/
1919
logging.file.name=logs/inventory-api.log
20+
21+
cors.allowed-origins=http://localhost:*

‎src/main/java/com/iemr/inventory/controller/Supplier/SupplierMasterController.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;
@@ -50,7 +50,6 @@ public class SupplierMasterController {
5050

5151
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
5252

53-
@CrossOrigin()
5453
@ApiOperation(value = "Create supplier", consumes = "application/json", produces = "application/json")
5554
@RequestMapping(value = "/createSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5655
"application/json" })
@@ -100,7 +99,6 @@ public String createSupplier(@RequestBody String createSupplier) {
10099

101100
}
102101

103-
@CrossOrigin()
104102
@ApiOperation(value = "Get supplier", consumes = "application/json", produces = "application/json")
105103
@RequestMapping(value = "/getSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
106104
"application/json" })
@@ -125,7 +123,6 @@ public String getSupplier(@RequestBody String getSupplier) {
125123

126124
}
127125

128-
@CrossOrigin()
129126
@ApiOperation(value = "Edit supplier", consumes = "application/json", produces = "application/json")
130127
@RequestMapping(value = "/editSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
131128
"application/json" })
@@ -163,7 +160,6 @@ public String editSupplier(@RequestBody String editSupplier) {
163160
return response.toString();
164161
}
165162

166-
@CrossOrigin()
167163
@ApiOperation(value = "Delete supplier", consumes = "application/json", produces = "application/json")
168164
@RequestMapping(value = "/deleteSupplier", headers = "Authorization", method = { RequestMethod.POST }, produces = {
169165
"application/json" })

‎src/main/java/com/iemr/inventory/controller/dispenseagainst_rx/DispenseAgainstRX.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.slf4j.LoggerFactory;
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.stereotype.Service;
28-
import org.springframework.web.bind.annotation.CrossOrigin;
28+
2929
import org.springframework.web.bind.annotation.RequestBody;
3030
import org.springframework.web.bind.annotation.RequestMapping;
3131
import org.springframework.web.bind.annotation.RequestMethod;
@@ -45,7 +45,6 @@ public class DispenseAgainstRX {
4545
@Autowired
4646
private DispenseAgainstRXimpl dispenseAgainstRXimpl;
4747

48-
@CrossOrigin()
4948
@ApiOperation(value = "Get prescribed medicines", consumes = "application/json", produces = "application/json")
5049
@RequestMapping(value = "getPrescribedMedicines", method = RequestMethod.POST)
5150
public String getPrescribedMedicinesToDispense(@RequestBody String requestOBJ) {

‎src/main/java/com/iemr/inventory/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

4949
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
5050

51-
@CrossOrigin()
5251
@ApiOperation(value = "Create drug type", consumes = "application/json", produces = "application/json")
5352
@RequestMapping(value = "/createDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5453
"application/json" })
@@ -73,7 +72,6 @@ public String createManufacturer(@RequestBody String createDrugtype) {
7372

7473
}
7574

76-
@CrossOrigin()
7775
@ApiOperation(value = "Get drug type", consumes = "application/json", produces = "application/json")
7876
@RequestMapping(value = "/getDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
7977
"application/json" })
@@ -98,7 +96,6 @@ public String getManufacturer(@RequestBody String getDrugtype) {
9896

9997
}
10098

101-
@CrossOrigin()
10299
@ApiOperation(value = "Edit drug type", consumes = "application/json", produces = "application/json")
103100
@RequestMapping(value = "/editDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
104101
"application/json" })
@@ -131,7 +128,6 @@ public String editManufacturer(@RequestBody String editDrugtype) {
131128

132129
}
133130

134-
@CrossOrigin()
135131
@ApiOperation(value = "Delete drug type", consumes = "application/json", produces = "application/json")
136132
@RequestMapping(value = "/deleteDrugtype", headers = "Authorization", method = { RequestMethod.POST }, produces = {
137133
"application/json" })

‎src/main/java/com/iemr/inventory/controller/facilitytype/FacilitytypeController.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;
@@ -49,7 +49,6 @@ public class FacilitytypeController {
4949

5050
private final Logger logger = LoggerFactory.getLogger(this.getClass().getName());
5151

52-
@CrossOrigin()
5352
@ApiOperation(value = "Get facility", consumes = "application/json", produces = "application/json")
5453
@RequestMapping(value = "/getFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
5554
"application/json" })
@@ -74,7 +73,6 @@ public String getFacility(@RequestBody String getFacility) {
7473
return response.toString();
7574
}
7675

77-
@CrossOrigin()
7876
@ApiOperation(value = "Add facility", consumes = "application/json", produces = "application/json")
7977
@RequestMapping(value = "/addFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
8078
"application/json" })
@@ -99,7 +97,6 @@ public String addFacility(@RequestBody String addFacility) {
9997
return response.toString();
10098
}
10199

102-
@CrossOrigin()
103100
@ApiOperation(value = "Edit facility", consumes = "application/json", produces = "application/json")
104101
@RequestMapping(value = "/editFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
105102
"application/json" })
@@ -131,7 +128,6 @@ public String editFacility(@RequestBody String editFacility) {
131128
return response.toString();
132129
}
133130

134-
@CrossOrigin()
135131
@ApiOperation(value = "Delete facility", consumes = "application/json", produces = "application/json")
136132
@RequestMapping(value = "/deleteFacility", headers = "Authorization", method = { RequestMethod.POST }, produces = {
137133
"application/json" })

‎src/main/java/com/iemr/inventory/controller/indent/IndentController.java‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import org.slf4j.LoggerFactory;
2828
import org.springframework.beans.factory.annotation.Autowired;
2929
import org.springframework.stereotype.Controller;
30-
import org.springframework.web.bind.annotation.CrossOrigin;
30+
3131
import org.springframework.web.bind.annotation.RequestBody;
3232
import org.springframework.web.bind.annotation.RequestMapping;
3333
import org.springframework.web.bind.annotation.RequestMethod;
@@ -55,7 +55,6 @@ public class IndentController {
5555
@Autowired
5656
IndentService IndentService;
5757

58-
@CrossOrigin()
5958
@ApiOperation(value = "Partial search indent items", consumes = "application/json", produces = "application/json")
6059
@RequestMapping(value = "/partialsearchindentitems", headers = "Authorization", method = {
6160
RequestMethod.POST }, produces = { "application/json" })
@@ -83,7 +82,6 @@ public String createStore(
8382
return response.toString();
8483
}
8584

86-
@CrossOrigin()
8785
@ApiOperation(value = "Create indent request", consumes = "application/json", produces = "application/json")
8886
@RequestMapping(value = "/createIndentRequest", headers = "Authorization", method = {
8987
RequestMethod.POST }, produces = { "application/json" })
@@ -106,7 +104,6 @@ public String createIndentRequest(@RequestBody String request) {
106104
return response.toString();
107105
}
108106

109-
@CrossOrigin()
110107
@ApiOperation(value = "Get indent history", consumes = "application/json", produces = "application/json")
111108
@RequestMapping(value = "/getIndentHistory", headers = "Authorization", method = {
112109
RequestMethod.POST }, produces = { "application/json" })
@@ -129,7 +126,6 @@ public String getIndentHistory(@ApiParam("{\"facilityID\":\"Integer\"}") @Reques
129126
return response.toString();
130127
}
131128

132-
@CrossOrigin()
133129
@ApiOperation(value = "Get order by indent id", consumes = "application/json", produces = "application/json")
134130
@RequestMapping(value = "/getOrdersByIndentID", headers = "Authorization", method = {
135131
RequestMethod.POST }, produces = { "application/json" })
@@ -152,7 +148,6 @@ public String getOrdersByIndentID(@ApiParam("{\"indentID\":\"Integer\"}") @Reque
152148
return response.toString();
153149
}
154150

155-
@CrossOrigin()
156151
@ApiOperation(value = "Get indent worklist", consumes = "application/json", produces = "application/json")
157152
@RequestMapping(value = "/getIndentWorklist", headers = "Authorization", method = {
158153
RequestMethod.POST }, produces = { "application/json" })
@@ -175,7 +170,6 @@ public String getIndentWorklist(@ApiParam("{\"facilityID\":\"Integer\"}") @Reque
175170
return response.toString();
176171
}
177172

178-
@CrossOrigin()
179173
@ApiOperation(value = "Get indent order worklist", consumes = "application/json", produces = "application/json")
180174
@RequestMapping(value = "/getIndentOrderWorklist", headers = "Authorization", method = {
181175
RequestMethod.POST }, produces = { "application/json" })
@@ -199,7 +193,6 @@ public String getIndentOrderWorklist(
199193
return response.toString();
200194
}
201195

202-
@CrossOrigin()
203196
@ApiOperation(value = "Issue indent", consumes = "application/json", produces = "application/json")
204197
@RequestMapping(value = "/issueIndent", headers = "Authorization", method = { RequestMethod.POST }, produces = {
205198
"application/json" })
@@ -222,7 +215,6 @@ public String issueIndent(@ApiParam("{\"facilityID\":\"Integer\"}") @RequestBody
222215
return response.toString();
223216
}
224217

225-
@CrossOrigin()
226218
@ApiOperation(value = "Cancel indent order", consumes = "application/json", produces = "application/json")
227219
@RequestMapping(value = "/cancelIndentOrder", headers = "Authorization", method = {
228220
RequestMethod.POST }, produces = { "application/json" })
@@ -245,7 +237,6 @@ public String cancelIndentOrder(@ApiParam("{\"indentID\":\"Integer\"}") @Request
245237
return response.toString();
246238
}
247239

248-
@CrossOrigin()
249240
@ApiOperation(value = "Receive indent", consumes = "application/json", produces = "application/json")
250241
@RequestMapping(value = "/receiveIndent", headers = "Authorization", method = { RequestMethod.POST }, produces = {
251242
"application/json" })
@@ -268,7 +259,6 @@ public String receiveIndent(@RequestBody String request) {
268259
return response.toString();
269260
}
270261

271-
@CrossOrigin()
272262
@ApiOperation(value = "Update indent order", consumes = "application/json", produces = "application/json")
273263
@RequestMapping(value = "/updateIndentOrder", headers = "Authorization", method = {
274264
RequestMethod.POST }, produces = { "application/json" })

‎src/main/java/com/iemr/inventory/controller/item/ItemController.java‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import org.slf4j.LoggerFactory;
2929
import org.springframework.beans.factory.annotation.Autowired;
3030
import org.springframework.stereotype.Controller;
31-
import org.springframework.web.bind.annotation.CrossOrigin;
31+
3232
import org.springframework.web.bind.annotation.PathVariable;
3333
import org.springframework.web.bind.annotation.RequestBody;
3434
import org.springframework.web.bind.annotation.RequestMapping;
@@ -54,7 +54,6 @@ public class ItemController {
5454
@Autowired
5555
private ItemService itemService;
5656

57-
@CrossOrigin()
5857
@ApiOperation(value = "Get item form id", consumes = "application/json", produces = "application/json")
5958
@RequestMapping(value = "/getItemForm/{providerservicemapID}", headers = "Authorization", method = {
6059
RequestMethod.GET }, produces = { "application/json" })
@@ -75,7 +74,6 @@ public String getItemForm(@PathVariable("providerservicemapID") Integer provider
7574
return response.toString();
7675
}
7776

78-
@CrossOrigin()
7977
@ApiOperation(value = "Get item route", consumes = "application/json", produces = "application/json")
8078
@RequestMapping(value = "/getItemRoute/{providerservicemapID}", headers = "Authorization", method = {
8179
RequestMethod.GET }, produces = { "application/json" })
@@ -96,7 +94,6 @@ public String getItemRoute(@PathVariable("providerservicemapID") Integer provide
9694
return response.toString();
9795
}
9896

99-
@CrossOrigin()
10097
@ApiOperation(value = "Get item category", consumes = "application/json", produces = "application/json")
10198
@RequestMapping(value = "/getItemCategory/{providerservicemapID}/{bool}", headers = "Authorization", method = {
10299
RequestMethod.GET }, produces = { "application/json" })
@@ -123,7 +120,6 @@ public String getItemCategory(@PathVariable("providerservicemapID") Integer prov
123120
return response.toString();
124121
}
125122

126-
@CrossOrigin()
127123
@ApiOperation(value = "Create item master", consumes = "application/json", produces = "application/json")
128124
@RequestMapping(value = "/createItemMaster", headers = "Authorization", method = {
129125
RequestMethod.POST }, produces = { "application/json" })
@@ -145,7 +141,6 @@ public String createItemMaster(@RequestBody ItemMaster[] item) {
145141
return response.toString();
146142
}
147143

148-
@CrossOrigin()
149144
@ApiOperation(value = "Get item master", consumes = "application/json", produces = "application/json")
150145
@RequestMapping(value = "/getItemMaster/{providerservicemapID}", headers = "Authorization", method = {
151146
RequestMethod.GET }, produces = { "application/json" })
@@ -166,7 +161,6 @@ public String getItemMaster(@PathVariable("providerservicemapID") Integer provid
166161
return response.toString();
167162
}
168163

169-
@CrossOrigin()
170164
@ApiOperation(value = "Get active item master", consumes = "application/json", produces = "application/json")
171165
@RequestMapping(value = "/getActiveItemMaster", headers = "Authorization", method = {
172166
RequestMethod.POST }, produces = { "application/json" })
@@ -187,7 +181,6 @@ public String getActiveItemMaster(@RequestBody ItemMaster providerServicemapID)
187181
return response.toString();
188182
}
189183

190-
@CrossOrigin()
191184
@ApiOperation(value = "Block item master", consumes = "application/json", produces = "application/json")
192185
@RequestMapping(value = "/blockItemMaster/{itemmasterid}/{deleteflag}", headers = "Authorization", method = {
193186
RequestMethod.GET }, produces = { "application/json" })
@@ -209,7 +202,6 @@ public String blockItemMaster(@PathVariable("itemmasterid") Integer itemmasterID
209202
return response.toString();
210203
}
211204

212-
@CrossOrigin()
213205
@ApiOperation(value = "Discontinue item master", consumes = "application/json", produces = "application/json")
214206
@RequestMapping(value = "/discontinueItemMaster/{itemmasterid}/{deleteflag}", headers = "Authorization", method = {
215207
RequestMethod.GET }, produces = { "application/json" })
@@ -231,7 +223,6 @@ public String discontinueItemMaster(@PathVariable("itemmasterid") Integer itemma
231223
return response.toString();
232224
}
233225

234-
@CrossOrigin()
235226
@ApiOperation(value = "Edit item master", consumes = "application/json", produces = "application/json")
236227
@RequestMapping(value = "/editItemMaster", headers = "Authorization", method = { RequestMethod.POST }, produces = {
237228
"application/json" })
@@ -254,7 +245,6 @@ public String editItemMaster(@RequestBody ItemMaster item) {
254245
return response.toString();
255246
}
256247

257-
@CrossOrigin()
258248
@ApiOperation(value = "Configure item issue", consumes = "application/json", produces = "application/json")
259249
@RequestMapping(value = "/configItemIssue", headers = "Authorization", method = { RequestMethod.POST }, produces = {
260250
"application/json" })
@@ -276,7 +266,6 @@ public String configItemIssue(@RequestBody M_ItemCategory[] itemIssue) {
276266
return response.toString();
277267
}
278268

279-
@CrossOrigin()
280269
@ApiOperation(value = "Get item", consumes = "application/json", produces = "application/json")
281270
@RequestMapping(value = "/getItem", headers = "Authorization", method = { RequestMethod.POST }, produces = {
282271
"application/json" })

0 commit comments

Comments
 (0)