Skip to content

Commit 7e94ccf

Browse files
hargatahargata
authored
Merge pull request #1223 from hargata/Hargata/855
Hargata/855
2 parents eaf08fd + a15b898 commit 7e94ccf

32 files changed

Lines changed: 777 additions & 39 deletions

‎Controllers/API/EquipmentController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@ public IActionResult EquipmentRecords(int vehicleId, MethodParameter parameters)
7878
return Json(result);
7979
}
8080
}
81+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
8182
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
8283
[HttpPost]
8384
[Route("/api/vehicle/equipmentrecords/add")]
8485
[Consumes("application/json")]
8586
public IActionResult AddEquipmentRecordJson(int vehicleId, [FromBody] EquipmentRecordExportModel input) => AddEquipmentRecord(vehicleId, input);
87+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
8688
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
8789
[HttpPost]
8890
[Route("/api/vehicle/equipmentrecords/add")]
@@ -129,6 +131,7 @@ public IActionResult AddEquipmentRecord(int vehicleId, EquipmentRecordExportMode
129131
return Json(OperationResponse.Failed(ex.Message));
130132
}
131133
}
134+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
132135
[HttpDelete]
133136
[Route("/api/vehicle/equipmentrecords/delete")]
134137
public IActionResult DeleteEquipmentRecord(int id)
@@ -163,10 +166,12 @@ public IActionResult DeleteEquipmentRecord(int id)
163166
}
164167
return Json(OperationResponse.Conditional(result, "Equipment Record Deleted"));
165168
}
169+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
166170
[HttpPut]
167171
[Route("/api/vehicle/equipmentrecords/update")]
168172
[Consumes("application/json")]
169173
public IActionResult UpdateEquipmentRecordJson([FromBody] EquipmentRecordExportModel input) => UpdateEquipmentRecord(input);
174+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
170175
[HttpPut]
171176
[Route("/api/vehicle/equipmentrecords/update")]
172177
public IActionResult UpdateEquipmentRecord(EquipmentRecordExportModel input)

‎Controllers/API/GasController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,13 @@ public IActionResult GasRecords(int vehicleId, MethodParameter parameters)
121121
return Json(result);
122122
}
123123
}
124+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
124125
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
125126
[HttpPost]
126127
[Route("/api/vehicle/gasrecords/add")]
127128
[Consumes("application/json")]
128129
public IActionResult AddGasRecordJson(int vehicleId, [FromBody] GasRecordExportModel input) => AddGasRecord(vehicleId, input);
130+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
129131
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
130132
[HttpPost]
131133
[Route("/api/vehicle/gasrecords/add")]
@@ -193,6 +195,7 @@ public IActionResult AddGasRecord(int vehicleId, GasRecordExportModel input)
193195
return Json(OperationResponse.Failed(ex.Message));
194196
}
195197
}
198+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
196199
[HttpDelete]
197200
[Route("/api/vehicle/gasrecords/delete")]
198201
public IActionResult DeleteGasRecord(int id)
@@ -216,10 +219,12 @@ public IActionResult DeleteGasRecord(int id)
216219
}
217220
return Json(OperationResponse.Conditional(result, "Gas Record Deleted"));
218221
}
222+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
219223
[HttpPut]
220224
[Route("/api/vehicle/gasrecords/update")]
221225
[Consumes("application/json")]
222226
public IActionResult UpdateGasRecordJson([FromBody] GasRecordExportModel input) => UpdateGasRecord(input);
227+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
223228
[HttpPut]
224229
[Route("/api/vehicle/gasrecords/update")]
225230
public IActionResult UpdateGasRecord(GasRecordExportModel input)

‎Controllers/API/OdometerController.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public IActionResult LastOdometer(int vehicleId)
2121
var result = _vehicleLogic.GetMaxMileage(vehicleId);
2222
return Json(result);
2323
}
24+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
2425
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
2526
[HttpPut]
2627
[Route("/api/vehicle/odometerrecords/recalculate")]
@@ -123,11 +124,13 @@ public IActionResult OdometerRecords(int vehicleId, MethodParameter parameters)
123124
return Json(result);
124125
}
125126
}
127+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
126128
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
127129
[HttpPost]
128130
[Route("/api/vehicle/odometerrecords/add")]
129131
[Consumes("application/json")]
130132
public IActionResult AddOdometerRecordJson(int vehicleId, [FromBody] OdometerRecordExportModel input) => AddOdometerRecord(vehicleId, input);
133+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
131134
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
132135
[HttpPost]
133136
[Route("/api/vehicle/odometerrecords/add")]
@@ -207,6 +210,7 @@ public IActionResult AddOdometerRecord(int vehicleId, OdometerRecordExportModel
207210
return Json(OperationResponse.Failed(ex.Message));
208211
}
209212
}
213+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
210214
[HttpDelete]
211215
[Route("/api/vehicle/odometerrecords/delete")]
212216
public IActionResult DeleteOdometerRecord(int id)
@@ -230,10 +234,12 @@ public IActionResult DeleteOdometerRecord(int id)
230234
}
231235
return Json(OperationResponse.Conditional(result, "Odometer Record Deleted"));
232236
}
237+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
233238
[HttpPut]
234239
[Route("/api/vehicle/odometerrecords/update")]
235240
[Consumes("application/json")]
236241
public IActionResult UpdateOdometerRecordJson([FromBody] OdometerRecordExportModel input) => UpdateOdometerRecord(input);
242+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
237243
[HttpPut]
238244
[Route("/api/vehicle/odometerrecords/update")]
239245
public IActionResult UpdateOdometerRecord(OdometerRecordExportModel input)

‎Controllers/API/PlanController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,13 @@ public IActionResult PlanRecords(int vehicleId, MethodParameter parameters)
105105
return Json(result);
106106
}
107107
}
108+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
108109
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
109110
[HttpPost]
110111
[Route("/api/vehicle/planrecords/add")]
111112
[Consumes("application/json")]
112113
public IActionResult AddPlanRecordJson(int vehicleId, [FromBody] PlanRecordExportModel input) => AddPlanRecord(vehicleId, input);
114+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
113115
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
114116
[HttpPost]
115117
[Route("/api/vehicle/planrecords/add")]
@@ -182,6 +184,7 @@ public IActionResult AddPlanRecord(int vehicleId, PlanRecordExportModel input)
182184
return Json(OperationResponse.Failed(ex.Message));
183185
}
184186
}
187+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
185188
[HttpDelete]
186189
[Route("/api/vehicle/planrecords/delete")]
187190
public IActionResult DeletePlanRecord(int id)
@@ -210,10 +213,12 @@ public IActionResult DeletePlanRecord(int id)
210213
}
211214
return Json(OperationResponse.Conditional(result, "Plan Record Deleted"));
212215
}
216+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
213217
[HttpPut]
214218
[Route("/api/vehicle/planrecords/update")]
215219
[Consumes("application/json")]
216220
public IActionResult UpdatePlanRecordJson([FromBody] PlanRecordExportModel input) => UpdatePlanRecord(input);
221+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
217222
[HttpPut]
218223
[Route("/api/vehicle/planrecords/update")]
219224
public IActionResult UpdatePlanRecord(PlanRecordExportModel input)

‎Controllers/API/ReminderController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,13 @@ public IActionResult Reminders(int vehicleId, ReminderMethodParameter parameters
8888
return Json(results);
8989
}
9090
}
91+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
9192
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
9293
[HttpPost]
9394
[Route("/api/vehicle/reminders/add")]
9495
[Consumes("application/json")]
9596
public IActionResult AddReminderRecordJson(int vehicleId, [FromBody] ReminderExportModel input) => AddReminderRecord(vehicleId, input);
97+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
9698
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
9799
[HttpPost]
98100
[Route("/api/vehicle/reminders/add")]
@@ -162,10 +164,12 @@ public IActionResult AddReminderRecord(int vehicleId, ReminderExportModel input)
162164
return Json(OperationResponse.Failed(ex.Message));
163165
}
164166
}
167+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
165168
[HttpPut]
166169
[Route("/api/vehicle/reminders/update")]
167170
[Consumes("application/json")]
168171
public IActionResult UpdateReminderRecordJson([FromBody] ReminderExportModel input) => UpdateReminderRecord(input);
172+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
169173
[HttpPut]
170174
[Route("/api/vehicle/reminders/update")]
171175
public IActionResult UpdateReminderRecord(ReminderExportModel input)
@@ -242,6 +246,7 @@ public IActionResult UpdateReminderRecord(ReminderExportModel input)
242246
return Json(OperationResponse.Failed(ex.Message));
243247
}
244248
}
249+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
245250
[HttpDelete]
246251
[Route("/api/vehicle/reminders/delete")]
247252
public IActionResult DeleteReminderRecord(int id)

‎Controllers/API/RepairController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,13 @@ public IActionResult RepairRecords(int vehicleId, MethodParameter parameters)
8989
return Json(result);
9090
}
9191
}
92+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
9293
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
9394
[HttpPost]
9495
[Route("/api/vehicle/repairrecords/add")]
9596
[Consumes("application/json")]
9697
public IActionResult AddRepairRecordJson(int vehicleId, [FromBody] GenericRecordExportModel input) => AddRepairRecord(vehicleId, input);
98+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
9799
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
98100
[HttpPost]
99101
[Route("/api/vehicle/repairrecords/add")]
@@ -157,6 +159,7 @@ public IActionResult AddRepairRecord(int vehicleId, GenericRecordExportModel inp
157159
return Json(OperationResponse.Failed(ex.Message));
158160
}
159161
}
162+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
160163
[HttpDelete]
161164
[Route("/api/vehicle/repairrecords/delete")]
162165
public IActionResult DeleteRepairRecord(int id)
@@ -185,10 +188,12 @@ public IActionResult DeleteRepairRecord(int id)
185188
}
186189
return Json(OperationResponse.Conditional(result, "Repair Record Deleted"));
187190
}
191+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
188192
[HttpPut]
189193
[Route("/api/vehicle/repairrecords/update")]
190194
[Consumes("application/json")]
191195
public IActionResult UpdateRepairRecordJson([FromBody] GenericRecordExportModel input) => UpdateRepairRecord(input);
196+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
192197
[HttpPut]
193198
[Route("/api/vehicle/repairrecords/update")]
194199
public IActionResult UpdateRepairRecord(GenericRecordExportModel input)

‎Controllers/API/ServiceController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,13 @@ public IActionResult ServiceRecords(int vehicleId, MethodParameter parameters)
8989
return Json(result);
9090
}
9191
}
92+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
9293
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
9394
[HttpPost]
9495
[Route("/api/vehicle/servicerecords/add")]
9596
[Consumes("application/json")]
9697
public IActionResult AddServiceRecordJson(int vehicleId, [FromBody] GenericRecordExportModel input) => AddServiceRecord(vehicleId, input);
98+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
9799
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
98100
[HttpPost]
99101
[Route("/api/vehicle/servicerecords/add")]
@@ -156,6 +158,7 @@ public IActionResult AddServiceRecord(int vehicleId, GenericRecordExportModel in
156158
return Json(OperationResponse.Failed(ex.Message));
157159
}
158160
}
161+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
159162
[HttpDelete]
160163
[Route("/api/vehicle/servicerecords/delete")]
161164
public IActionResult DeleteServiceRecord(int id)
@@ -184,10 +187,12 @@ public IActionResult DeleteServiceRecord(int id)
184187
}
185188
return Json(OperationResponse.Conditional(result, "Service Record Deleted"));
186189
}
190+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
187191
[HttpPut]
188192
[Route("/api/vehicle/servicerecords/update")]
189193
[Consumes("application/json")]
190194
public IActionResult UpdateServiceRecordJson([FromBody] GenericRecordExportModel input) => UpdateServiceRecord(input);
195+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
191196
[HttpPut]
192197
[Route("/api/vehicle/servicerecords/update")]
193198
public IActionResult UpdateServiceRecord(GenericRecordExportModel input)

‎Controllers/API/SupplyController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,13 @@ public IActionResult SupplyRecords(int vehicleId, MethodParameter parameters)
121121
return Json(result);
122122
}
123123
}
124+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
124125
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
125126
[HttpPost]
126127
[Route("/api/vehicle/supplyrecords/add")]
127128
[Consumes("application/json")]
128129
public IActionResult AddSupplyRecordJson(int vehicleId, [FromBody] SupplyRecordExportModel input) => AddSupplyRecord(vehicleId, input);
130+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
129131
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
130132
[HttpPost]
131133
[Route("/api/vehicle/supplyrecords/add")]
@@ -178,6 +180,7 @@ public IActionResult AddSupplyRecord(int vehicleId, SupplyRecordExportModel inpu
178180
return Json(OperationResponse.Failed(ex.Message));
179181
}
180182
}
183+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
181184
[HttpDelete]
182185
[Route("/api/vehicle/supplyrecords/delete")]
183186
public IActionResult DeleteSupplyRecord(int id)
@@ -211,10 +214,12 @@ public IActionResult DeleteSupplyRecord(int id)
211214
}
212215
return Json(OperationResponse.Conditional(result, "Supply Record Deleted"));
213216
}
217+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
214218
[HttpPut]
215219
[Route("/api/vehicle/supplyrecords/update")]
216220
[Consumes("application/json")]
217221
public IActionResult UpdateSupplyRecordJson([FromBody] SupplyRecordExportModel input) => UpdateSupplyRecord(input);
222+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
218223
[HttpPut]
219224
[Route("/api/vehicle/supplyrecords/update")]
220225
public IActionResult UpdateSupplyRecord(SupplyRecordExportModel input)

‎Controllers/API/TaxController.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,13 @@ public IActionResult CheckRecurringTaxRecords()
125125
return Json(OperationResponse.Failed($"No Recurring Taxes Updated Due To Error: {ex.Message}"));
126126
}
127127
}
128+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
128129
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
129130
[HttpPost]
130131
[Route("/api/vehicle/taxrecords/add")]
131132
[Consumes("application/json")]
132133
public IActionResult AddTaxRecordJson(int vehicleId, [FromBody] TaxRecordExportModel input) => AddTaxRecord(vehicleId, input);
134+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
133135
[TypeFilter(typeof(CollaboratorFilter), Arguments = new object[] { false, true, HouseholdPermission.Edit })]
134136
[HttpPost]
135137
[Route("/api/vehicle/taxrecords/add")]
@@ -179,6 +181,7 @@ public IActionResult AddTaxRecord(int vehicleId, TaxRecordExportModel input)
179181
return Json(OperationResponse.Failed(ex.Message));
180182
}
181183
}
184+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Delete })]
182185
[HttpDelete]
183186
[Route("/api/vehicle/taxrecords/delete")]
184187
public IActionResult DeleteTaxRecord(int id)
@@ -202,10 +205,12 @@ public IActionResult DeleteTaxRecord(int id)
202205
}
203206
return Json(OperationResponse.Conditional(result, "Tax Record Deleted"));
204207
}
208+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
205209
[HttpPut]
206210
[Route("/api/vehicle/taxrecords/update")]
207211
[Consumes("application/json")]
208212
public IActionResult UpdateTaxRecordJson([FromBody] TaxRecordExportModel input) => UpdateTaxRecord(input);
213+
[TypeFilter(typeof(APIKeyFilter), Arguments = new object[] { HouseholdPermission.Edit })]
209214
[HttpPut]
210215
[Route("/api/vehicle/taxrecords/update")]
211216
public IActionResult UpdateTaxRecord(TaxRecordExportModel input)

0 commit comments

Comments
 (0)