From d7d3681d71289052641f895fd8e190617d9b20e7 Mon Sep 17 00:00:00 2001
From: Petri Asikainen <petri.asikainen@sataedu.fi>
Date: Fri, 2 Jul 2021 10:18:18 +0300
Subject: [PATCH] trait base64 encoded files

---
 app/Http/Requests/ImageUploadRequest.php  | 19 +++++++++++++++----
 app/Http/Traits/ConvertsBase64toFiles.php |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 0a25ad7336..d4ca989c0f 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -5,10 +5,13 @@ namespace App\Http\Requests;
 use App\Models\SnipeModel;
 use enshrined\svgSanitize\Sanitizer;
 use Intervention\Image\Facades\Image;
+use App\Traits\ConvertsBase64ToFiles;
 use Storage;
 
 class ImageUploadRequest extends Request
 {
+    use ConvertsBase64ToFiles;
+
     /**
      * Determine if the user is authorized to make this request.
      *
@@ -26,10 +29,11 @@ class ImageUploadRequest extends Request
      */
     public function rules()
     {
-        return [
-            'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp',
-            'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp',
-        ];
+       
+            return [
+                'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp',
+                'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp',
+            ];
     }
 
     public function response(array $errors)
@@ -37,6 +41,13 @@ class ImageUploadRequest extends Request
         return $this->redirector->back()->withInput()->withErrors($errors, $this->errorBag);
     }
 
+    protected function base64FileKeys(): array
+    {
+        return [
+            'image' => 'auto',
+        ];
+    }
+
     /**
      * Handle and store any images attached to request
      * @param SnipeModel $item Item the image is associated with
diff --git a/app/Http/Traits/ConvertsBase64toFiles.php b/app/Http/Traits/ConvertsBase64toFiles.php
index 5d4f20b5af..71d316f848 100644
--- a/app/Http/Traits/ConvertsBase64toFiles.php
+++ b/app/Http/Traits/ConvertsBase64toFiles.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Traits;
+namespace App\Http\Traits;
 
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Arr;