ZIP Imports: Added API examples, finished testing

[bookstack] / app / Exceptions / NotifyException.php

diff --git a/app/Exceptions/NotifyException.php b/app/Exceptions/NotifyException.php
index efca625708b75ef2509d4f9790664c8ab3c18d24..b62b8fde64673a767b28996e79ae97b6e4ebd4c7 100644 (file)
--- a/app/Exceptions/NotifyException.php
+++ b/app/Exceptions/NotifyException.php
@@ -1,31 +1,56 @@
-<?php namespace BookStack\Exceptions;
+<?php
+
+namespace BookStack\Exceptions;

 
 use Exception;
 use Illuminate\Contracts\Support\Responsable;
 
 use Exception;
 use Illuminate\Contracts\Support\Responsable;

+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;

 
 

-class NotifyException extends Exception implements Responsable
+class NotifyException extends Exception implements Responsable, HttpExceptionInterface

 {
     public $message;
 {
     public $message;

-    public $redirectLocation;
+    public string $redirectLocation;
+    protected int $status;

 
 

-    /**
-     * NotifyException constructor.
-     */
-    public function __construct(string $message, string $redirectLocation = "/")
+    public function __construct(string $message, string $redirectLocation = '/', int $status = 500)

     {
         $this->message = $message;
         $this->redirectLocation = $redirectLocation;
     {
         $this->message = $message;
         $this->redirectLocation = $redirectLocation;

+        $this->status = $status;
+

         parent::__construct();
     }
 
         parent::__construct();
     }
 

+    /**
+     * Get the desired HTTP status code for this exception.
+     */
+    public function getStatusCode(): int
+    {
+        return $this->status;
+    }
+
+    /**
+     * Get the desired HTTP headers for this exception.
+     */
+    public function getHeaders(): array
+    {
+        return [];
+    }
+

     /**
      * Send the response for this type of exception.
     /**
      * Send the response for this type of exception.

-     * @inheritdoc
+     *
+     * {@inheritdoc}

      */
     public function toResponse($request)
     {
         $message = $this->getMessage();
 
      */
     public function toResponse($request)
     {
         $message = $this->getMessage();
 

+        // Front-end JSON handling. API-side handling managed via handler.
+        if ($request->wantsJson()) {
+            return response()->json(['error' => $message], $this->getStatusCode());
+        }
+

         if (!empty($message)) {
             session()->flash('error', $message);
         }
         if (!empty($message)) {
             session()->flash('error', $message);
         }