lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Change some errors to be 404

Browse source 
The asset or file was not found, so 500 wasn't the best choice of error
code
This commit is contained in:
Scarzy 2024-05-29 22:17:36 +01:00
parent ca9d4e3155
commit 98a94dec29
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/Http/Controllers/Api/AssetFilesController.php
View file

@ -53,7 +53,7 @@ class AssetFilesController extends Controller
{ {
// Start by checking if the asset being acted upon exists // Start by checking if the asset being acted upon exists
if (! $asset = Asset::find($assetId)) { if (! $asset = Asset::find($assetId)) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 500); return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
} }
// Make sure we are allowed to update this asset // Make sure we are allowed to update this asset
@ -93,7 +93,7 @@ class AssetFilesController extends Controller
{ {
// Start by checking if the asset being acted upon exists // Start by checking if the asset being acted upon exists
if (! $asset = Asset::find($assetId)) { if (! $asset = Asset::find($assetId)) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 500); return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
} }
// the asset is valid // the asset is valid
@ -132,7 +132,7 @@ class AssetFilesController extends Controller
{ {
// Start by checking if the asset being acted upon exists // Start by checking if the asset being acted upon exists
if (! $asset = Asset::find($assetId)) { if (! $asset = Asset::find($assetId)) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 500); return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
} }
// the asset is valid // the asset is valid
@ -141,7 +141,7 @@ class AssetFilesController extends Controller
// Check that the file being requested exists for the asset // Check that the file being requested exists for the asset
if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) { if (! $log = Actionlog::whereNotNull('filename')->where('item_id', $asset->id)->find($fileId)) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.no_match', ['id' => $fileId])), 500); return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.download.no_match', ['id' => $fileId])), 404);
} }
// Form the full filename with path // Form the full filename with path
@ -187,7 +187,7 @@ class AssetFilesController extends Controller
{ {
// Start by checking if the asset being acted upon exists // Start by checking if the asset being acted upon exists
if (! $asset = Asset::find($assetId)) { if (! $asset = Asset::find($assetId)) {
return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 500); return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist')), 404);
} }
$rel_path = 'private_uploads/assets'; $rel_path = 'private_uploads/assets';