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 3b4ad4a4da54ae46e003a004988c7aacc24fd803..317b011d87de92f3369d7b1b3a993efacdd1c864 100644 (file)
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -4,6 +4,7 @@ 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\Foundation\Exceptions\Handler as ExceptionHandler;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;


@@ -75,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(),


@@ -95,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);