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 8d3a743faf939bd18b101c8e982a0d30afc4ad4e..317b011d87de92f3369d7b1b3a993efacdd1c864 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -4,12 +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 Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Throwable;

 
 class Handler extends ExceptionHandler
 {
 
 class Handler extends ExceptionHandler
 {


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

+        'current_password',

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


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

-     * @param Exception $exception
-     * @return void
+     * @param \Throwable $exception
+     *
+     * @throws \Throwable

      *
      *

-     * @throws Exception
+     * @return void

      */
      */

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

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


@@ -48,26 +51,17 @@ class Handler extends ExceptionHandler
     /**
      * Render an exception into an HTTP response.
      *
     /**
      * Render an exception into an HTTP response.
      *

-     * @param  \Illuminate\Http\Request $request
-     * @param Exception $e
+     * @param \Illuminate\Http\Request $request
+     * @param Exception                $e
+     *

      * @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);
         }
 

-        // Handle notify exceptions which will redirect to the
-        // specified location then show a notification message.
-        if ($this->isExceptionType($e, NotifyException::class)) {
-            $message = $this->getOriginalMessage($e);
-            if (!empty($message)) {
-                session()->flash('error', $message);
-            }
-            return redirect($e->redirectLocation);
-        }
-

         return parent::render($request, $e);
     }
 
         return parent::render($request, $e);
     }
 


@@ -82,19 +76,24 @@ 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(),

-            ]
+            ],

         ];
 
         if ($e instanceof ValidationException) {
         ];
 
         if ($e instanceof ValidationException) {


@@ -102,39 +101,21 @@ class Handler extends ExceptionHandler
             $code = $e->status;
         }
 
             $code = $e->status;
         }
 

-        $responseData['error']['code'] = $code;
-        return new JsonResponse($responseData, $code, $headers);
-    }
+        if (method_exists($e, 'getStatus')) {
+            $code = $e->getStatus();
+        }

 
 

-    /**
-     * Check the exception chain to compare against the original exception type.
-     */
-    protected function isExceptionType(Exception $e, string $type): bool
-    {
-        do {
-            if (is_a($e, $type)) {
-                return true;
-            }
-        } while ($e = $e->getPrevious());
-        return false;
-    }
+        $responseData['error']['code'] = $code;

 
 

-    /**
-     * Get original exception message.
-     */
-    protected function getOriginalMessage(Exception $e): string
-    {
-        do {
-            $message = $e->getMessage();
-        } while ($e = $e->getPrevious());
-        return $message;
+        return new JsonResponse($responseData, $code, $headers);

     }
 
     /**
      * Convert an authentication exception into an unauthenticated response.
      *
     }
 
     /**
      * Convert an authentication exception into an unauthenticated response.
      *

-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Auth\AuthenticationException  $exception
+     * @param \Illuminate\Http\Request                 $request
+     * @param \Illuminate\Auth\AuthenticationException $exception
+     *

      * @return \Illuminate\Http\Response
      */
     protected function unauthenticated($request, AuthenticationException $exception)
      * @return \Illuminate\Http\Response
      */
     protected function unauthenticated($request, AuthenticationException $exception)


@@ -149,8 +130,9 @@ class Handler extends ExceptionHandler
     /**
      * Convert a validation exception into a JSON response.
      *
     /**
      * Convert a validation exception into a JSON response.
      *

-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Illuminate\Validation\ValidationException  $exception
+     * @param \Illuminate\Http\Request                   $request
+     * @param \Illuminate\Validation\ValidationException $exception
+     *

      * @return \Illuminate\Http\JsonResponse
      */
     protected function invalidJson($request, ValidationException $exception)
      * @return \Illuminate\Http\JsonResponse
      */
     protected function invalidJson($request, ValidationException $exception)