Started extraction of image controller to separate controllers

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

diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php
index 4bd1b479c9316f8ac732cec7ff0a565b5082ba5a..df77581767cb858776fd389f9fd64a8835a531a2 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,39 +81,44 @@ 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)
+    public function uploadUserImage(Request $request)

     {
     {

-        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
-        return response()->json($imgData);
+        // TODO
+    }
+
+    public function uploadSystemImage(Request $request)
+    {
+        // TODO
+    }
+
+    public function uploadCoverImage(Request $request)
+    {
+        // TODO

     }
 
     /**
     }
 
     /**

-     * Get gallery images with a specific filter such as book or page
-     * @param $filter
-     * @param int $page
+     * Upload a draw.io image into the system.

      * @param Request $request
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */
      * @param Request $request
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
      */

-    public function getGalleryFiltered(Request $request, $filter, $page = 0)
+    public function uploadDrawioImage(Request $request)

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

-            'page_id' => 'required|integer'
+            'image' => 'required|string',
+            'uploaded_to' => 'required|integer'

         ]);
         ]);

+        $uploadedTo = $request->get('uploaded_to', 0);
+        $page = $this->
+        $this->checkPermission('image-create-all');
+        $imageBase64Data = $request->get('image');

 
 

-        $validFilters = collect(['page', 'book']);
-        if (!$validFilters->contains($filter)) {
-            return response('Invalid filter', 500);
+        try {
+            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);

         }
 
         }
 

-        $pageId = $request->get('page_id');
-        $imgData = $this->imageRepo->getGalleryFiltered(strtolower($filter), $pageId, $page, 24);
-
-        return response()->json($imgData);
+        return response()->json($image);

     }
 
     /**
     }
 
     /**


@@ -119,7 +132,7 @@ class ImageController extends Controller
     {
         $this->checkPermission('image-create-all');
         $this->validate($request, [
     {
         $this->checkPermission('image-create-all');
         $this->validate($request, [

-            'file' => 'is_image'
+            'file' => 'image_extension|no_double_extension|mimes:jpeg,png,gif,bmp,webp,tiff'

         ]);
 
         if (!$this->imageRepo->isValidType($type)) {
         ]);
 
         if (!$this->imageRepo->isValidType($type)) {


@@ -130,39 +143,19 @@ class ImageController extends Controller
 
         try {
             $uploadedTo = $request->get('uploaded_to', 0);
 
         try {
             $uploadedTo = $request->get('uploaded_to', 0);

-            $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
-        } catch (ImageUploadException $e) {
-            return response($e->getMessage(), 500);
-        }

 
 

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

 
 

-        return response()->json($image);
-    }
-
-    /**
-     * Upload a drawing to the system.
-     * @param Request $request
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
-     */
-    public function uploadDrawing(Request $request)
-    {
-        $this->validate($request, [
-            'image' => 'required|string',
-            'uploaded_to' => 'required|integer'
-        ]);
-        $this->checkPermission('image-create-all');
-        $imageBase64Data = $request->get('image');
-
-        try {
-            $uploadedTo = $request->get('uploaded_to', 0);
-            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+            $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


@@ -200,19 +193,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);
     }