Started rewriting back-end image managment

[bookstack] / app / Http / Controllers / ImageController.php

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 4d6f759b336eddb97e0516c6ddb69eb8034c9639..ae2d743052fe1b1e70e014f16dbb2e270c964caa 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -45,13 +45,21 @@ class ImageController extends Controller
 
     /**
      * Get all images for a specific type, Paginated
 
     /**
      * Get all images for a specific type, Paginated

+     * @param Request $request

      * @param string $type
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */
      * @param string $type
      * @param int $page
      * @return \Illuminate\Http\JsonResponse
      */

-    public function getAllByType($type, $page = 0)
+    public function getAllByType(Request $request, $type, $page = 0)

     {
     {

-        $imgData = $this->imageRepo->getPaginatedByType($type, $page);
+        $uploadedToFilter = $request->get('uploaded_to', null);
+
+        // For user profile request, check access to user images
+        if ($type === 'user') {
+            $this->checkPermissionOrCurrentUser('users-manage', $uploadedToFilter ?? 0);
+        }
+
+        $imgData = $this->imageRepo->getPaginatedByType($type, $page, 24, $uploadedToFilter);

         return response()->json($imgData);
     }
 
         return response()->json($imgData);
     }
 


@@ -73,17 +81,6 @@ class ImageController extends Controller
         return response()->json($imgData);
     }
 
         return response()->json($imgData);
     }
 

-    /**
-     * Get all images for a user.
-     * @param int $page
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function getAllForUserType($page = 0)
-    {
-        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
-        return response()->json($imgData);
-    }
-

     /**
      * Get gallery images with a specific filter such as book or page
      * @param $filter
     /**
      * Get gallery images with a specific filter such as book or page
      * @param $filter


@@ -94,7 +91,7 @@ class ImageController extends Controller
     public function getGalleryFiltered(Request $request, $filter, $page = 0)
     {
         $this->validate($request, [
     public function getGalleryFiltered(Request $request, $filter, $page = 0)
     {
         $this->validate($request, [

-            'page_id' => 'required|integer'
+            'uploaded_to' => 'required|integer'

         ]);
 
         $validFilters = collect(['page', 'book']);
         ]);
 
         $validFilters = collect(['page', 'book']);


@@ -102,35 +99,50 @@ class ImageController extends Controller
             return response('Invalid filter', 500);
         }
 
             return response('Invalid filter', 500);
         }
 

-        $pageId = $request->get('page_id');
+        $pageId = $request->get('uploaded_to');

         $imgData = $this->imageRepo->getGalleryFiltered(strtolower($filter), $pageId, $page, 24);
 
         return response()->json($imgData);
     }
 
         $imgData = $this->imageRepo->getGalleryFiltered(strtolower($filter), $pageId, $page, 24);
 
         return response()->json($imgData);
     }
 

+    public function uploadGalleryImage(Request $request)
+    {
+        // TODO
+    }
+
+    public function uploadUserImage(Request $request)
+    {
+        // TODO
+    }
+
+    public function uploadSystemImage(Request $request)
+    {
+        // TODO
+    }
+
+    public function uploadCoverImage(Request $request)
+    {
+        // TODO
+    }
+

     /**
     /**

-     * Handles image uploads for use on pages.
-     * @param string $type
+     * Upload a draw.io image into the system.

      * @param Request $request
      * @param Request $request

-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Exception
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response

      */
      */

-    public function uploadByType($type, Request $request)
+    public function uploadDrawioImage(Request $request)

     {
     {

-        $this->checkPermission('image-create-all');

         $this->validate($request, [
         $this->validate($request, [

-            'file' => 'image_extension|no_double_extension|mimes:jpeg,png,gif,bmp,webp,tiff'
+            'image' => 'required|string',
+            'uploaded_to' => 'required|integer'

         ]);
         ]);

-
-        if (!$this->imageRepo->isValidType($type)) {
-            return $this->jsonError(trans('errors.image_upload_type_error'));
-        }
-
-        $imageUpload = $request->file('file');
+        $uploadedTo = $request->get('uploaded_to', 0);
+        $page = $this->
+        $this->checkPermission('image-create-all');
+        $imageBase64Data = $request->get('image');

 
         try {
 
         try {

-            $uploadedTo = $request->get('uploaded_to', 0);
-            $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
+            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);

         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }


@@ -139,29 +151,40 @@ class ImageController extends Controller
     }
 
     /**
     }
 
     /**

-     * Upload a drawing to the system.
+     * Handles image uploads for use on pages.
+     * @param string $type

      * @param Request $request
      * @param Request $request

-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Exception

      */
      */

-    public function uploadDrawing(Request $request)
+    public function uploadByType($type, Request $request)

     {
     {

+        $this->checkPermission('image-create-all');

         $this->validate($request, [
         $this->validate($request, [

-            'image' => 'required|string',
-            'uploaded_to' => 'required|integer'
+            'file' => 'image_extension|no_double_extension|mimes:jpeg,png,gif,bmp,webp,tiff'

         ]);
         ]);

-        $this->checkPermission('image-create-all');
-        $imageBase64Data = $request->get('image');
+
+        if (!$this->imageRepo->isValidType($type)) {
+            return $this->jsonError(trans('errors.image_upload_type_error'));
+        }
+
+        $imageUpload = $request->file('file');

 
         try {
             $uploadedTo = $request->get('uploaded_to', 0);
 
         try {
             $uploadedTo = $request->get('uploaded_to', 0);

-            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+
+            // For user profile request, check access to user images
+            if ($type === 'user') {
+                $this->checkPermissionOrCurrentUser('users-manage', $uploadedTo ?? 0);
+            }
+
+            $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);

         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }
 
         return response()->json($image);
     }
         } catch (ImageUploadException $e) {
             return response($e->getMessage(), 500);
         }
 
         return response()->json($image);
     }

-

     /**
      * Get the content of an image based64 encoded.
      * @param $id
     /**
      * Get the content of an image based64 encoded.
      * @param $id


@@ -199,19 +222,21 @@ class ImageController extends Controller
 
     /**
      * Update image details
 
     /**
      * Update image details

-     * @param integer $imageId
+     * @param integer $id

      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @throws ImageUploadException
      * @throws \Exception
      */
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @throws ImageUploadException
      * @throws \Exception
      */

-    public function update($imageId, Request $request)
+    public function update($id, Request $request)

     {
         $this->validate($request, [
             'name' => 'required|min:2|string'
         ]);
     {
         $this->validate($request, [
             'name' => 'required|min:2|string'
         ]);

-        $image = $this->imageRepo->getById($imageId);
+
+        $image = $this->imageRepo->getById($id);

         $this->checkOwnablePermission('image-update', $image);
         $this->checkOwnablePermission('image-update', $image);

+

         $image = $this->imageRepo->updateImageDetails($image, $request->all());
         return response()->json($image);
     }
         $image = $this->imageRepo->updateImageDetails($image, $request->all());
         return response()->json($image);
     }