From a76b36cad9ee40107d5687a1644ba7ee3866b480 Mon Sep 17 00:00:00 2001
From: Petri Asikainen <petri.asikainen@sataedu.fi>
Date: Wed, 7 Jul 2021 09:08:37 +0300
Subject: [PATCH] Handle image_source with ConvertBase64ToFiles

---
 app/Http/Controllers/Api/AssetsController.php | 78 +++++--------------
 app/Http/Requests/ImageUploadRequest.php      |  5 ++
 2 files changed, 25 insertions(+), 58 deletions(-)

diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 1f6d47eeb3..0fe146cfc1 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -416,42 +416,26 @@ class AssetsController extends Controller
         $asset = new Asset();
         $asset->model()->associate(AssetModel::find((int) $request->get('model_id')));
 
-        $asset->name = $request->get('name');
-        $asset->serial = $request->get('serial');
-        $asset->company_id = Company::getIdForCurrentUser($request->get('company_id'));
-        $asset->model_id = $request->get('model_id');
-        $asset->order_number = $request->get('order_number');
-        $asset->notes = $request->get('notes');
-        $asset->asset_tag = $request->get('asset_tag', Asset::autoincrement_asset());
-        $asset->user_id = Auth::id();
-        $asset->archived = '0';
-        $asset->physical = '1';
-        $asset->depreciate = '0';
-        $asset->status_id = $request->get('status_id', 0);
-        $asset->warranty_months = $request->get('warranty_months', null);
-        $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost'));
-        $asset->purchase_date = $request->get('purchase_date', null);
-        $asset->assigned_to = $request->get('assigned_to', null);
-        $asset->supplier_id = $request->get('supplier_id', 0);
-        $asset->requestable = $request->get('requestable', 0);
-        $asset->rtd_location_id = $request->get('rtd_location_id', null);
-        $asset->location_id = $request->get('rtd_location_id', null);
-
-        if ($request->has('image_source') && $request->input('image_source') != '') {
-            $saved_image_path = Helper::processUploadedImage(
-                $request->input('image_source'), 'uploads/assets/'
-            );
-
-            if (! $saved_image_path) {
-                return response()->json(Helper::formatStandardApiResponse(
-                        'error',
-                        null,
-                        trans('admin/hardware/message.create.error')
-                    ), 200);
-            }
-
-            $asset->image = $saved_image_path;
-        }
+        $asset->name                    = $request->get('name');
+        $asset->serial                  = $request->get('serial');
+        $asset->company_id              = Company::getIdForCurrentUser($request->get('company_id'));
+        $asset->model_id                = $request->get('model_id');
+        $asset->order_number            = $request->get('order_number');
+        $asset->notes                   = $request->get('notes');
+        $asset->asset_tag               = $request->get('asset_tag', Asset::autoincrement_asset());
+        $asset->user_id                 = Auth::id();
+        $asset->archived                = '0';
+        $asset->physical                = '1';
+        $asset->depreciate              = '0';
+        $asset->status_id               = $request->get('status_id', 0);
+        $asset->warranty_months         = $request->get('warranty_months', null);
+        $asset->purchase_cost           = Helper::ParseFloat($request->get('purchase_cost'));
+        $asset->purchase_date           = $request->get('purchase_date', null);
+        $asset->assigned_to             = $request->get('assigned_to', null);
+        $asset->supplier_id             = $request->get('supplier_id', 0);
+        $asset->requestable             = $request->get('requestable', 0);
+        $asset->rtd_location_id         = $request->get('rtd_location_id', null);
+        $asset->location_id             = $request->get('rtd_location_id', null);
 
         $asset = $request->handleImages($asset);
 
@@ -537,28 +521,6 @@ class AssetsController extends Controller
             ($request->filled('rtd_location_id')) ?
                 $asset->location_id = $request->get('rtd_location_id') : null;
 
-            if ($request->filled('image_source')) {
-                if ($request->input('image_source') == '') {
-                    ($request->filled('rtd_location_id')) ?
-                $asset->location_id = $request->get('rtd_location_id') : null;
-                    $asset->image = null;
-                } else {
-                    $saved_image_path = Helper::processUploadedImage(
-                        $request->input('image_source'), 'uploads/assets/'
-                    );
-
-                    if (! $saved_image_path) {
-                        return response()->json(Helper::formatStandardApiResponse(
-                            'error',
-                            null,
-                            trans('admin/hardware/message.update.error')
-                        ), 200);
-                    }
-
-                    $asset->image = $saved_image_path;
-                }
-            }
-
             $asset = $request->handleImages($asset); 
             
             // Update custom fields
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index 17acff957d..3bf922722f 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -47,8 +47,13 @@ class ImageUploadRequest extends Request
      */
     protected function base64FileKeys(): array
     {
+        /**
+         * image_source is here just legacy reasons. Api\AssetController
+         * had it once to allow encoded image uploads.
+        */ 
         return [
             'image' => 'auto',
+            'image_source' => 'auto'
         ];
     }