Adds laravel-microscope package

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 0eb62dc31aab20388e8047a39788ee0c3990e4dc..57078522b748bbbf905b1836705a4d24c0695bbb 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -3,12 +3,14 @@
 namespace BookStack\Exceptions;
 
 use Exception;
 namespace BookStack\Exceptions;
 
 use Exception;

+use Illuminate\Auth\Access\AuthorizationException;

 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Auth\AuthenticationException;

-use Illuminate\Validation\ValidationException;

 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;

-use Symfony\Component\HttpKernel\Exception\HttpException;

 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

-use Illuminate\Auth\Access\AuthorizationException;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
+use Symfony\Component\HttpKernel\Exception\HttpException;

 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Handler extends ExceptionHandler
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class Handler extends ExceptionHandler


@@ -23,6 +25,7 @@ class Handler extends ExceptionHandler
         HttpException::class,
         ModelNotFoundException::class,
         ValidationException::class,
         HttpException::class,
         ModelNotFoundException::class,
         ValidationException::class,

+        NotFoundException::class,

     ];
 
     /**
     ];
 
     /**


@@ -47,10 +50,17 @@ class Handler extends ExceptionHandler
      */
     public function render($request, Exception $e)
     {
      */
     public function render($request, Exception $e)
     {

+        if ($this->isApiRequest($request)) {
+            return $this->renderApiException($e);
+        }
+

         // Handle notify exceptions which will redirect to the
         // specified location then show a notification message.
         if ($this->isExceptionType($e, NotifyException::class)) {
         // Handle notify exceptions which will redirect to the
         // specified location then show a notification message.
         if ($this->isExceptionType($e, NotifyException::class)) {

-            session()->flash('error', $this->getOriginalMessage($e));
+            $message = $this->getOriginalMessage($e);
+            if (!empty($message)) {
+                session()->flash('error', $message);
+            }

             return redirect($e->redirectLocation);
         }
 
             return redirect($e->redirectLocation);
         }
 


@@ -70,6 +80,41 @@ class Handler extends ExceptionHandler
         return parent::render($request, $e);
     }
 
         return parent::render($request, $e);
     }
 

+    /**
+     * Check if the given request is an API request.
+     */
+    protected function isApiRequest(Request $request): bool
+    {
+        return strpos($request->path(), 'api/') === 0;
+    }
+
+    /**
+     * Render an exception when the API is in use.
+     */
+    protected function renderApiException(Exception $e): JsonResponse
+    {
+        $code = $e->getCode() === 0 ? 500 : $e->getCode();
+        $headers = [];
+        if ($e instanceof HttpException) {
+            $code = $e->getStatusCode();
+            $headers = $e->getHeaders();
+        }
+
+        $responseData = [
+            'error' => [
+                'message' => $e->getMessage(),
+            ]
+        ];
+
+        if ($e instanceof ValidationException) {
+            $responseData['error']['validation'] = $e->errors();
+            $code = $e->status;
+        }
+
+        $responseData['error']['code'] = $code;
+        return new JsonResponse($responseData, $code, $headers);
+    }
+

     /**
      * Check the exception chain to compare against the original exception type.
      * @param Exception $e
     /**
      * Check the exception chain to compare against the original exception type.
      * @param Exception $e