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 e675bff0c5b52bbaef6e13db509f287ddfb31a63..ae2d743052fe1b1e70e014f16dbb2e270c964caa 100644 (file)
--- a/app/Http/Controllers/ImageController.php
+++ b/app/Http/Controllers/ImageController.php
@@ -1,13 +1,12 @@
 <?php namespace BookStack\Http\Controllers;
 
 <?php namespace BookStack\Http\Controllers;
 

+use BookStack\Entities\Repos\EntityRepo;

 use BookStack\Exceptions\ImageUploadException;
 use BookStack\Exceptions\ImageUploadException;

-use BookStack\Exceptions\NotFoundException;
-use BookStack\Repos\EntityRepo;
-use BookStack\Repos\ImageRepo;
+use BookStack\Repos\PageRepo;
+use BookStack\Uploads\Image;
+use BookStack\Uploads\ImageRepo;

 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;
 use Illuminate\Filesystem\Filesystem as File;
 use Illuminate\Http\Request;

-use BookStack\Image;
-use BookStack\Repos\PageRepo;

 
 class ImageController extends Controller
 {
 
 class ImageController extends Controller
 {


@@ -46,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);
     }
 


@@ -63,25 +70,14 @@ class ImageController extends Controller
      * @param Request $request
      * @return mixed
      */
      * @param Request $request
      * @return mixed
      */

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

     {
         $this->validate($request, [
             'term' => 'required|string'
         ]);
 
         $searchTerm = $request->get('term');
     {
         $this->validate($request, [
             'term' => 'required|string'
         ]);
 
         $searchTerm = $request->get('term');

-        $imgData = $this->imageRepo->searchPaginatedByType($type, $page, 24, $searchTerm);
-        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);
+        $imgData = $this->imageRepo->searchPaginatedByType($type, $searchTerm, $page, 24);

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


@@ -92,67 +88,60 @@ class ImageController extends Controller
      * @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($filter, $page = 0, Request $request)
+    public function getGalleryFiltered(Request $request, $filter, $page = 0)

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

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

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

-        if (!$validFilters->contains($filter)) return response('Invalid filter', 500);
+        if (!$validFilters->contains($filter)) {
+            return response('Invalid filter', 500);
+        }

 
 

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

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

-    /**
-     * Handles image uploads for use on pages.
-     * @param string $type
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     * @throws \Exception
-     */
-    public function uploadByType($type, Request $request)
+    public function uploadGalleryImage(Request $request)

     {
     {

-        $this->checkPermission('image-create-all');
-        $this->validate($request, [
-            'file' => 'is_image'
-        ]);
-
-        if (!$this->imageRepo->isValidType($type)) {
-            return $this->jsonError(trans('errors.image_upload_type_error'));
-        }
+        // TODO
+    }

 
 

-        $imageUpload = $request->file('file');
+    public function uploadUserImage(Request $request)
+    {
+        // TODO
+    }

 
 

-        try {
-            $uploadedTo = $request->get('uploaded_to', 0);
-            $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
-        } catch (ImageUploadException $e) {
-            return response($e->getMessage(), 500);
-        }
+    public function uploadSystemImage(Request $request)
+    {
+        // TODO
+    }

 
 

-        return response()->json($image);
+    public function uploadCoverImage(Request $request)
+    {
+        // TODO

     }
 
     /**
     }
 
     /**

-     * Upload a drawing to the system.
+     * 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 uploadDrawing(Request $request)
+    public function uploadDrawioImage(Request $request)

     {
         $this->validate($request, [
             'image' => 'required|string',
             'uploaded_to' => 'required|integer'
         ]);
     {
         $this->validate($request, [
             'image' => 'required|string',
             'uploaded_to' => 'required|integer'
         ]);

+        $uploadedTo = $request->get('uploaded_to', 0);
+        $page = $this->

         $this->checkPermission('image-create-all');
         $imageBase64Data = $request->get('image');
 
         try {
         $this->checkPermission('image-create-all');
         $imageBase64Data = $request->get('image');
 
         try {

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

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


@@ -162,31 +151,40 @@ class ImageController extends Controller
     }
 
     /**
     }
 
     /**

-     * Replace the data content of a drawing.
-     * @param string $id
+     * 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 replaceDrawing(string $id, Request $request)
+    public function uploadByType($type, Request $request)

     {
     {

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

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

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

         ]);
         ]);

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

 
 

-        $imageBase64Data = $request->get('image');
-        $image = $this->imageRepo->getById($id);
-        $this->checkOwnablePermission('image-update', $image);
+        if (!$this->imageRepo->isValidType($type)) {
+            return $this->jsonError(trans('errors.image_upload_type_error'));
+        }
+
+        $imageUpload = $request->file('file');

 
         try {
 
         try {

-            $image = $this->imageRepo->replaceDrawingContent($image, $imageBase64Data);
+            $uploadedTo = $request->get('uploaded_to', 0);
+
+            // 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


@@ -224,47 +222,50 @@ 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);
     }
 

+    /**
+     * Show the usage of an image on pages.
+     * @param \BookStack\Entities\Repos\EntityRepo $entityRepo
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function usage(EntityRepo $entityRepo, $id)
+    {
+        $image = $this->imageRepo->getById($id);
+        $pageSearch = $entityRepo->searchForImage($image->url);
+        return response()->json($pageSearch);
+    }
+

     /**
      * Deletes an image and all thumbnail/image files
     /**
      * Deletes an image and all thumbnail/image files

-     * @param EntityRepo $entityRepo
-     * @param Request $request

      * @param int $id
      * @return \Illuminate\Http\JsonResponse
      * @param int $id
      * @return \Illuminate\Http\JsonResponse

+     * @throws \Exception

      */
      */

-    public function destroy(EntityRepo $entityRepo, Request $request, $id)
+    public function destroy($id)

     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
 
     {
         $image = $this->imageRepo->getById($id);
         $this->checkOwnablePermission('image-delete', $image);
 

-        // Check if this image is used on any pages
-        $isForced = in_array($request->get('force', ''), [true, 'true']);
-        if (!$isForced) {
-            $pageSearch = $entityRepo->searchForImage($image->url);
-            if ($pageSearch !== false) {
-                return response()->json($pageSearch, 400);
-            }
-        }
-

         $this->imageRepo->destroyImage($image);
         return response()->json(trans('components.images_deleted'));
     }
         $this->imageRepo->destroyImage($image);
         return response()->json(trans('components.images_deleted'));
     }

-
-

 }
 }