DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 09:04:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2023-04-12 04:36:30 -07:00
parent 28e0891645 d3d464e179
commit 9ae9ea7f68
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Exceptions/Handler.php
View file

@ -72,27 +72,31 @@ class Handler extends ExceptionHandler
return response()->json(Helper::formatStandardApiResponse('error', null, 'Invalid JSON'), 422); return response()->json(Helper::formatStandardApiResponse('error', null, 'Invalid JSON'), 422);
} }
// Handle SCIM exceptions
if ($e instanceof SCIMException) { if ($e instanceof SCIMException) {
return response()->json(Helper::formatStandardApiResponse('error', null, 'Invalid SCIM Request'), 400); return response()->json(Helper::formatStandardApiResponse('error', null, 'Invalid SCIM Request'), 400);
} }
// Handle standard requests that fail because Carbon cannot parse the date on validation (when a submitted date value is definitely not a date)
if ($e instanceof InvalidFormatException) { if ($e instanceof InvalidFormatException) {
return redirect()->back()->with('error', trans('validation.date', ['attribute' => 'date'])); return redirect()->back()->with('error', trans('validation.date', ['attribute' => 'date']));
} }
// Handle Ajax requests that fail because the model doesn't exist // Handle API requests that fail
if ($request->ajax() || $request->wantsJson()) { if ($request->ajax() || $request->wantsJson()) {
// Handle API requests that fail because Carbon cannot parse the date on validation (when a submitted date value is definitely not a date)
if ($e instanceof InvalidFormatException) { if ($e instanceof InvalidFormatException) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('validation.date')), 200); return response()->json(Helper::formatStandardApiResponse('error', null, trans('validation.date', ['attribute' => 'date'])), 200);
} }
// Handle API requests that fail because the model doesn't exist
if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) { if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {
$className = last(explode('\\', $e->getModel())); $className = last(explode('\\', $e->getModel()));
return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200); return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
} }
// Handle API requests that fail because of an HTTP status code and return a useful error message
if ($this->isHttpException($e)) { if ($this->isHttpException($e)) {
$statusCode = $e->getStatusCode(); $statusCode = $e->getStatusCode();