kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Clean up handler.

Browse Source
This commit is contained in:
James Cole
2021-04-03 13:19:11 +02:00
parent a864d3bd56
commit 51f3b17ad2
1 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/Exceptions/Handler.php
View File

@@ -35,7 +35,6 @@ use Illuminate\Http\Request;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
use Illuminate\Validation\ValidationException as LaravelValidationException; use Illuminate\Validation\ValidationException as LaravelValidationException;
use League\OAuth2\Server\Exception\OAuthServerException; use League\OAuth2\Server\Exception\OAuthServerException;
use Log;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException; use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Throwable; use Throwable;
@@ -51,36 +50,37 @@ class Handler extends ExceptionHandler
*/ */
protected $dontReport protected $dontReport
= [ = [
AuthenticationException::class AuthenticationException::class,
LaravelValidationException::class,
]; ];
/** /**
* Render an exception into an HTTP response. * Render an exception into an HTTP response.
* *
* @param Request $request * @param Request $request
* @param Exception $exception * @param Throwable $e
* *
* @return mixed * @return mixed
*/ */
public function render($request, Throwable $exception) public function render($request, Throwable $e)
{ {
if ($exception instanceof LaravelValidationException && $request->expectsJson()) { if ($e instanceof LaravelValidationException && $request->expectsJson()) {
// ignore it: controller will handle it. // ignore it: controller will handle it.
return parent::render($request, $exception); return parent::render($request, $e);
} }
if ($exception instanceof NotFoundHttpException && $request->expectsJson()) { if ($e instanceof NotFoundHttpException && $request->expectsJson()) {
// JSON error: // JSON error:
return response()->json(['message' => 'Resource not found', 'exception' => 'NotFoundHttpException'], 404); return response()->json(['message' => 'Resource not found', 'exception' => 'NotFoundHttpException'], 404);
} }
if ($exception instanceof AuthenticationException && $request->expectsJson()) { if ($e instanceof AuthenticationException && $request->expectsJson()) {
// somehow Laravel handler does not catch this: // somehow Laravel handler does not catch this:
return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401); return response()->json(['message' => 'Unauthenticated', 'exception' => 'AuthenticationException'], 401);
} }
if ($exception instanceof OAuthServerException && $request->expectsJson()) { if ($e instanceof OAuthServerException && $request->expectsJson()) {
// somehow Laravel handler does not catch this: // somehow Laravel handler does not catch this:
return response()->json(['message' => $exception->getMessage(), 'exception' => 'OAuthServerException'], 401); return response()->json(['message' => $e->getMessage(), 'exception' => 'OAuthServerException'], 401);
} }
if ($request->expectsJson()) { if ($request->expectsJson()) {
@@ -88,33 +88,33 @@ class Handler extends ExceptionHandler
if ($isDebug) { if ($isDebug) {
return response()->json( return response()->json(
[ [
'message' => $exception->getMessage(), 'message' => $e->getMessage(),
'exception' => get_class($exception), 'exception' => get_class($e),
'line' => $exception->getLine(), 'line' => $e->getLine(),
'file' => $exception->getFile(), 'file' => $e->getFile(),
'trace' => $exception->getTrace(), 'trace' => $e->getTrace(),
], ],
500 500
); );
} }
return response()->json( return response()->json(
['message' => sprintf('Internal Firefly III Exception: %s', $exception->getMessage()), 'exception' => get_class($exception)], 500 ['message' => sprintf('Internal Firefly III Exception: %s', $e->getMessage()), 'exception' => get_class($e)], 500
); );
} }
if ($exception instanceof NotFoundHttpException) { if ($e instanceof NotFoundHttpException) {
$handler = app(GracefulNotFoundHandler::class); $handler = app(GracefulNotFoundHandler::class);
return $handler->render($request, $exception); return $handler->render($request, $e);
} }
if ($exception instanceof FireflyException || $exception instanceof ErrorException || $exception instanceof OAuthServerException) { if ($e instanceof FireflyException || $e instanceof ErrorException || $e instanceof OAuthServerException) {
$isDebug = config('app.debug'); $isDebug = config('app.debug');
return response()->view('errors.FireflyException', ['exception' => $exception, 'debug' => $isDebug], 500); return response()->view('errors.FireflyException', ['exception' => $e, 'debug' => $isDebug], 500);
} }
return parent::render($request, $exception); return parent::render($request, $e);
} }
/** /**
@@ -122,19 +122,16 @@ class Handler extends ExceptionHandler
* *
* This is a great spot to send exceptions to Sentry etc. * This is a great spot to send exceptions to Sentry etc.
* *
* // it's five its fine.
*
* @param Throwable $e * @param Throwable $e
* *
* @return void * @return void
* @throws Exception * @throws Throwable
* *
*/ */
public function report(Throwable $e) public function report(Throwable $e)
{ {
$doMailError = config('firefly.send_error_message'); $doMailError = config('firefly.send_error_message');
if ($this->shouldntReportLocal($e) || !$doMailError) { if ($this->shouldntReportLocal($e) || !$doMailError) {
Log::info('Will not report on this error.');
parent::report($e); parent::report($e);
return; return;