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

Return 422 instead of 500 when import is invalid

Browse source
This commit is contained in:
Marcus Moore 2023-02-08 12:39:42 -08:00
parent b3881a43a7
commit 73f355f3a8
No known key found for this signature in database
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/ImportController.php
View file

@ -57,7 +57,7 @@ class ImportController extends Controller
'text/tsv', ])) {
$results['error'] = 'File type must be CSV. Uploaded file is '.$file->getMimeType();
return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 500);
return response()->json(Helper::formatStandardApiResponse('error', null, $results['error']), 422);
}
//TODO: is there a lighter way to do this?
@ -75,7 +75,7 @@ class ImportController extends Controller
null,
'One or more attributes in the header row contain malformed UTF-8 characters'
),
500
422
);
}
@ -95,7 +95,7 @@ class ImportController extends Controller
}
}
if (count($duplicate_headers) > 0) {
return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)), 500); //should this be '4xx'?
return response()->json(Helper::formatStandardApiResponse('error', null, implode('; ', $duplicate_headers)),422);
}
try {
@ -108,7 +108,7 @@ class ImportController extends Controller
null,
'One or more attributes in row 2 contain malformed UTF-8 characters'
),
500
422
);
}
@ -137,7 +137,7 @@ class ImportController extends Controller
]);
}
return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 500);
return response()->json(Helper::formatStandardApiResponse('error', null, trans('general.feature_disabled')), 422);
}
/**