WIP: Fixed #9413 and rework upload API for bulk and better responses

app/Exceptions/Handler.php

@@ -61,14 +61,12 @@ public function report(Throwable $exception)
     public function render($request, Throwable $e)
     {
 
-
         // CSRF token mismatch error
         if ($e instanceof \Illuminate\Session\TokenMismatchException) {
             return redirect()->back()->with('error', trans('general.token_expired'));
         }
 
         // Invalid JSON exception
-        // TODO: don't understand why we have to do this when we have the invalidJson() method, below, but, well, whatever
         if ($e instanceof JsonException) {
             return response()->json(Helper::formatStandardApiResponse('error', null, 'Invalid JSON'), 422);
         }
@@ -88,8 +86,9 @@ public function render($request, Throwable $e)
             return redirect()->back()->withInput()->with('error', trans('validation.date', ['attribute' => 'date']));
         }
 
+
         // Handle API requests that fail
-        if ($request->ajax() || $request->wantsJson()) {
+        if ($request->ajax() || $request->wantsJson() || ($request->route() && $request->route()->named('api.files.*'))) {
 
             // Handle API requests that fail because Carbon cannot parse the date on validation (when a submitted date value is definitely not a date)
             if ($e instanceof InvalidFormatException) {
@@ -102,6 +101,7 @@ public function render($request, Throwable $e)
                 return response()->json(Helper::formatStandardApiResponse('error', null, $className . ' not found'), 200);
             }
 
+
             // Handle API requests that fail because of an HTTP status code and return a useful error message
             if ($this->isHttpException($e)) {
 
@@ -116,12 +116,24 @@ public function render($request, Throwable $e)
                         return response()->json(Helper::formatStandardApiResponse('error', null, 'Method not allowed'), 405);
                     default:
                         return response()->json(Helper::formatStandardApiResponse('error', null, $statusCode), $statusCode);
-
                 }
             }
+
+            // This handles API validation exceptions that happen at the Form Request level, so they
+            // never even get to the controller where we normally  nicely format JSON responses
+            if ($e instanceof ValidationException) {
+                $response = $this->invalidJson($request, $e);
+                return response()->json(Helper::formatStandardApiResponse('error', null,  $e->errors()), 200);
+            }
+
+           // return response()->json(Helper::formatStandardApiResponse('error', null,  'Undefined exception'), 200);
+
+
+
         }
 
 
+
         // This is traaaaash but it handles models that are not found while using route model binding :(
         // The only alternative is to set that at *each* route, which is crazypants
         if ($e instanceof \Illuminate\Database\Eloquent\ModelNotFoundException) {

app/Helpers/StorageHelper.php

@@ -48,17 +48,29 @@ public static function allowSafeInline($file_with_path) {
             'avif',
             'webp',
             'png',
+            'gif',
         ];
 
-
         // The file exists and is allowed to be displayed inline
         if (Storage::exists($file_with_path) && (in_array(pathinfo($file_with_path, PATHINFO_EXTENSION), $allowed_inline))) {
             return true;
         }
+
         return false;
 
     }
 
+    public static function getFiletype($file_with_path) {
+
+        // The file exists and is allowed to be displayed inline
+        if (Storage::exists($file_with_path)) {
+            return pathinfo($file_with_path, PATHINFO_EXTENSION);
+        }
+
+        return null;
+
+    }
+
     /**
      * Decide whether to show the file inline or download it.
      */