Fix display exception handling

Author: DaneEveritt

app/Exceptions/DisplayException.php

@@ -8,8 +8,9 @@
 use Illuminate\Http\Response;
 use Illuminate\Container\Container;
 use Prologue\Alerts\AlertsMessageBag;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 
-class DisplayException extends PterodactylException
+class DisplayException extends PterodactylException implements HttpExceptionInterface
 {
     public const LEVEL_DEBUG = 'debug';
     public const LEVEL_INFO = 'info';
@@ -51,17 +52,29 @@ public function getStatusCode()
         return Response::HTTP_BAD_REQUEST;
     }
 
+    /**
+     * @return array
+     */
+    public function getHeaders()
+    {
+        return [];
+    }
+
     /**
      * Render the exception to the user by adding a flashed message to the session
      * and then redirecting them back to the page that they came from. If the
      * request originated from an API hit, return the error in JSONAPI spec format.
      *
      * @param \Illuminate\Http\Request $request
      *
-     * @return \Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
      */
     public function render($request)
     {
+        if ($request->expectsJson()) {
+            return response()->json(Handler::toArray($this), $this->getStatusCode(), $this->getHeaders());
+        }
+
         app(AlertsMessageBag::class)->danger($this->getMessage())->flash();
 
         return redirect()->back()->withInput();

app/Exceptions/Handler.php

@@ -284,4 +284,13 @@ protected function extractPrevious(Throwable $e): array
 
         return $previous;
     }
+
+    /**
+     * Helper method to allow reaching into the handler to convert an exception
+     * into the expected array response type.
+     */
+    public static function toArray(Throwable $e): array
+    {
+        return (new self(app()))->convertExceptionToArray($e);
+    }
 }