Skip intermediate login page with single provider

[bookstack] / app / Exceptions / Handler.php

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 2d40f44769127062ea294a7ba12603cf3ad6b05f..317b011d87de92f3369d7b1b3a993efacdd1c864 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -4,11 +4,13 @@ namespace BookStack\Exceptions;
 
 use Exception;
 use Illuminate\Auth\AuthenticationException;
 
 use Exception;
 use Illuminate\Auth\AuthenticationException;

+use Illuminate\Database\Eloquent\ModelNotFoundException;

 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\ValidationException;
 use Symfony\Component\HttpKernel\Exception\HttpException;

+use Throwable;

 
 class Handler extends ExceptionHandler
 {
 
 class Handler extends ExceptionHandler
 {


@@ -27,6 +29,7 @@ class Handler extends ExceptionHandler
      * @var array
      */
     protected $dontFlash = [
      * @var array
      */
     protected $dontFlash = [

+        'current_password',

         'password',
         'password_confirmation',
     ];
         'password',
         'password_confirmation',
     ];


@@ -34,13 +37,13 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
     /**
      * Report or log an exception.
      *

-     * @param Exception $exception
+     * @param \Throwable $exception

      *
      *

-     * @throws Exception
+     * @throws \Throwable

      *
      * @return void
      */
      *
      * @return void
      */

-    public function report(Exception $exception)
+    public function report(Throwable $exception)

     {
         parent::report($exception);
     }
     {
         parent::report($exception);
     }


@@ -53,7 +56,7 @@ class Handler extends ExceptionHandler
      *
      * @return \Illuminate\Http\Response
      */
      *
      * @return \Illuminate\Http\Response
      */

-    public function render($request, Exception $e)
+    public function render($request, Throwable $e)

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


@@ -73,15 +76,20 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception when the API is in use.
      */
     /**
      * Render an exception when the API is in use.
      */

-    protected function renderApiException(Exception $e): JsonResponse
+    protected function renderApiException(Throwable $e): JsonResponse

     {
     {

-        $code = $e->getCode() === 0 ? 500 : $e->getCode();
+        $code = 500;

         $headers = [];
         $headers = [];

+

         if ($e instanceof HttpException) {
             $code = $e->getStatusCode();
             $headers = $e->getHeaders();
         }
 
         if ($e instanceof HttpException) {
             $code = $e->getStatusCode();
             $headers = $e->getHeaders();
         }
 

+        if ($e instanceof ModelNotFoundException) {
+            $code = 404;
+        }
+

         $responseData = [
             'error' => [
                 'message' => $e->getMessage(),
         $responseData = [
             'error' => [
                 'message' => $e->getMessage(),


@@ -93,6 +101,10 @@ class Handler extends ExceptionHandler
             $code = $e->status;
         }
 
             $code = $e->status;
         }
 

+        if (method_exists($e, 'getStatus')) {
+            $code = $e->getStatus();
+        }
+

         $responseData['error']['code'] = $code;
 
         return new JsonResponse($responseData, $code, $headers);
         $responseData['error']['code'] = $code;
 
         return new JsonResponse($responseData, $code, $headers);