extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2024-12-25 00:19:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reset exception handler to the Laravel 7.* definition

Browse Source
This commit is contained in:
Bubka 2020-11-20 19:06:58 +01:00
parent f76a834b05
commit af5b52dcf8
1 changed files with 5 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
app/Exceptions/Handler.php
View File

@ -3,11 +3,7 @@
namespace App\Exceptions; namespace App\Exceptions;
use Throwable; use Throwable;
use Illuminate\Http\Response;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Database\Eloquent\ModelNotFoundException as ModelNotFoundException;
use Illuminate\Validation\ValidationException as ValidationException;
use Symfony\Component\HttpKernel\Exception\HttpException;
class Handler extends ExceptionHandler class Handler extends ExceptionHandler
{ {
@ -46,99 +42,12 @@ public function report(Throwable $exception)
* *
* @param \Illuminate\Http\Request $request * @param \Illuminate\Http\Request $request
* @param \Throwable $exception * @param \Throwable $exception
* @return \Illuminate\Http\Response * @return \Symfony\Component\HttpFoundation\Response
*
* @throws \Throwable
*/ */
public function render($request, Throwable $exception) public function render($request, Throwable $exception)
{ {
if ( $request->wantsJson() ) { return parent::render($request, $exception);
return $this->handleApiException($request, $exception);
} else {
return parent::render($request, $exception);
}
}
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Throwable $exception
* @return \Illuminate\Http\JsonResponse
*/
private function handleApiException($request, Throwable $exception)
{
$debug = [
'exception' => get_class($exception),
'trace' => $exception->getTrace(),
];
$exception = $this->prepareException($exception);
if ($exception instanceof \Illuminate\Http\Exception\HttpResponseException) {
$exception = $exception->getResponse();
}
if ($exception instanceof \Illuminate\Auth\AuthenticationException) {
$exception = $this->unauthenticated($request, $exception);
}
if ($exception instanceof \Illuminate\Validation\ValidationException) {
$exception = $this->convertValidationExceptionToResponse($exception, $request);
}
return $this->customApiResponse($exception, $debug);
}
/**
* Set a specific response payload for commons http error codes
*
* @param \Throwable $exception
* @return \Illuminate\Http\JsonResponse
*/
private function customApiResponse($exception, $debug)
{
$statusCode = 500;
if (method_exists($exception, 'getStatusCode')) {
$statusCode = $exception->getStatusCode();
}
$response = [];
$response['status_code'] = $statusCode;
switch ($statusCode) {
case 401:
$response['message'] = 'Unauthorized';
break;
case 404:
$response['message'] = 'Not Found';
break;
case 405:
$response['message'] = 'Method Not Allowed';
break;
case 422:
$response['message'] = $exception->original['message'];
$response['errors'] = $exception->original['errors'];
break;
default:
$response['message'] = ($statusCode >= 500) ? 'Whoops, looks like something went wrong :(' : $exception->getMessage();
if (config('app.debug')) {
$response['originalMessage'] = $exception->getMessage();
$response['debug'] = $debug;
}
break;
}
return response()->json($response, $statusCode);
} }
} }