Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Treat validation errors the same as a normal error; match the output exactly

Browse source
This commit is contained in:
Dane Everitt 2020-08-27 19:26:52 -07:00
parent 8c98264eed
commit e863683582
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
1 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/Exceptions/Handler.php
View file

@ -169,25 +169,14 @@ class Handler extends ExceptionHandler
*/ */
public function invalidJson($request, ValidationException $exception) public function invalidJson($request, ValidationException $exception)
{ {
$codes = collect($exception->validator->failed())->mapWithKeys(function ($reasons, $field) { $errors = collect($exception->errors())->map(function ($errors, $field) use ($exception) {
$cleaned = [];
foreach ($reasons as $reason => $attrs) {
$cleaned[] = snake_case($reason);
}
return [str_replace('.', '_', $field) => $cleaned];
})->toArray();
$errors = collect($exception->errors())->map(function ($errors, $field) use ($codes) {
$response = []; $response = [];
foreach ($errors as $key => $error) { foreach ($errors as $key => $error) {
$response[] = [ $converted = self::convertToArray($exception)['errors'][0];
'code' => str_replace(self::PTERODACTYL_RULE_STRING, 'p_', array_get( $response[] = array_merge($converted, [
$codes, str_replace('.', '_', $field) . '.' . $key
)),
'detail' => $error, 'detail' => $error,
'source' => ['field' => $field], 'source_field' => $field,
]; ]);
} }
return $response; return $response;
@ -209,7 +198,9 @@ class Handler extends ExceptionHandler
{ {
$error = [ $error = [
'code' => class_basename($exception), 'code' => class_basename($exception),
'status' => method_exists($exception, 'getStatusCode') ? strval($exception->getStatusCode()) : '500', 'status' => method_exists($exception, 'getStatusCode')
? strval($exception->getStatusCode())
: ($exception instanceof ValidationException ? '422' : '500'),
'detail' => 'An error was encountered while processing this request.', 'detail' => 'An error was encountered while processing this request.',
]; ];