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

 
 

-namespace BookStack\Http\Controllers;
-
-use BookStack\Repos\ImageRepo;
+use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Exceptions\ImageUploadException;
+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 Illuminate\Support\Facades\Auth;
-use Intervention\Image\Facades\Image as ImageTool;
-use Illuminate\Support\Facades\DB;
-use BookStack\Image;
-use BookStack\Repos\PageRepo;

 
 class ImageController extends Controller
 {
 
 class ImageController extends Controller
 {


@@ -19,8 +16,8 @@ class ImageController extends Controller
 
     /**
      * ImageController constructor.
 
     /**
      * ImageController constructor.

-     * @param Image     $image
-     * @param File      $file
+     * @param Image $image
+     * @param File $file

      * @param ImageRepo $imageRepo
      */
     public function __construct(Image $image, File $file, ImageRepo $imageRepo)
      * @param ImageRepo $imageRepo
      */
     public function __construct(Image $image, File $file, ImageRepo $imageRepo)


@@ -31,47 +28,179 @@ class ImageController extends Controller
         parent::__construct();
     }
 
         parent::__construct();
     }
 

+    /**
+     * Provide an image file from storage.
+     * @param string $path
+     * @return mixed
+     */
+    public function showImage(string $path)
+    {
+        $path = storage_path('uploads/images/' . $path);
+        if (!file_exists($path)) {
+            abort(404);
+        }
+
+        return response()->file($path);
+    }

 
     /**
      * 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 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);
     }
 
     /**

-     * Get all images for a user.
+     * Search through images within a particular type.
+     * @param $type

      * @param int $page
      * @param int $page

-     * @return \Illuminate\Http\JsonResponse
+     * @param Request $request
+     * @return mixed

      */
      */

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

     {
     {

-        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $this->currentUser->id);
+        $this->validate($request, [
+            'term' => 'required|string'
+        ]);
+
+        $searchTerm = $request->get('term');
+        $imgData = $this->imageRepo->searchPaginatedByType($type, $searchTerm, $page, 24);

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

+    /**
+     * Get gallery images with a specific filter such as book or page
+     * @param $filter
+     * @param int $page
+     * @param Request $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     */
+    public function getGalleryFiltered(Request $request, $filter, $page = 0)
+    {
+        $this->validate($request, [
+            'uploaded_to' => 'required|integer'
+        ]);
+
+        $validFilters = collect(['page', 'book']);
+        if (!$validFilters->contains($filter)) {
+            return response('Invalid filter', 500);
+        }
+
+        $pageId = $request->get('uploaded_to');
+        $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
+    }
+
+    /**
+     * Upload a draw.io image into the system.
+     * @param Request $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\JsonResponse|\Symfony\Component\HttpFoundation\Response
+     */
+    public function uploadDrawioImage(Request $request)
+    {
+        $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 {
+            $image = $this->imageRepo->saveDrawing($imageBase64Data, $uploadedTo);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }

 
     /**
      * Handles image uploads for use on pages.
 
     /**
      * Handles image uploads for use on pages.

-     * @param string  $type
+     * @param string $type

      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse

+     * @throws \Exception

      */
     public function uploadByType($type, Request $request)
     {
      */
     public function uploadByType($type, Request $request)
     {

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

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

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

         ]);
 
         ]);
 

+        if (!$this->imageRepo->isValidType($type)) {
+            return $this->jsonError(trans('errors.image_upload_type_error'));
+        }
+

         $imageUpload = $request->file('file');
         $imageUpload = $request->file('file');

-        $image = $this->imageRepo->saveNew($imageUpload, $type);
+
+        try {
+            $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);
     }
         return response()->json($image);
     }

+    /**
+     * Get the content of an image based64 encoded.
+     * @param $id
+     * @return \Illuminate\Http\JsonResponse|mixed
+     */
+    public function getBase64Image($id)
+    {
+        $image = $this->imageRepo->getById($id);
+        $imageData = $this->imageRepo->getImageData($image);
+        if ($imageData === null) {
+            return $this->jsonError("Image data could not be found");
+        }
+        return response()->json([
+            'content' => base64_encode($imageData)
+        ]);
+    }

 
     /**
      * Generate a sized thumbnail for an image.
 
     /**
      * Generate a sized thumbnail for an image.


@@ -80,10 +209,12 @@ class ImageController extends Controller
      * @param $height
      * @param $crop
      * @return \Illuminate\Http\JsonResponse
      * @param $height
      * @param $crop
      * @return \Illuminate\Http\JsonResponse

+     * @throws ImageUploadException
+     * @throws \Exception

      */
     public function getThumbnail($id, $width, $height, $crop)
     {
      */
     public function getThumbnail($id, $width, $height, $crop)
     {

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

         $image = $this->imageRepo->getById($id);
         $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
         return response()->json(['url' => $thumbnailUrl]);
         $image = $this->imageRepo->getById($id);
         $thumbnailUrl = $this->imageRepo->getThumbnail($image, $width, $height, $crop == 'false');
         return response()->json(['url' => $thumbnailUrl]);


@@ -91,46 +222,50 @@ class ImageController extends Controller
 
     /**
      * Update image details
 
     /**
      * Update image details

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

      * @param Request $request
      * @return \Illuminate\Http\JsonResponse
      * @param Request $request
      * @return \Illuminate\Http\JsonResponse

+     * @throws ImageUploadException
+     * @throws \Exception

      */
      */

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

     {
     {

-        $this->checkPermission('image-update');

         $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);
+

         $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 PageRepo $pageRepo
-     * @param Request  $request
-     * @param int      $id
+     * @param int $id

      * @return \Illuminate\Http\JsonResponse
      * @return \Illuminate\Http\JsonResponse

+     * @throws \Exception

      */
      */

-    public function destroy(PageRepo $pageRepo, Request $request, $id)
+    public function destroy($id)

     {
     {

-        $this->checkPermission('image-delete');

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

-
-        // Check if this image is used on any pages
-        $isForced = ($request->has('force') && ($request->get('force') === 'true') || $request->get('force') === true);
-        if (!$isForced) {
-            $pageSearch = $pageRepo->searchForImage($image->url);
-            if ($pageSearch !== false) {
-                return response()->json($pageSearch, 400);
-            }
-        }
+        $this->checkOwnablePermission('image-delete', $image);

 
         $this->imageRepo->destroyImage($image);
 
         $this->imageRepo->destroyImage($image);

-        return response()->json('Image Deleted');
+        return response()->json(trans('components.images_deleted'));

     }
     }

-
-

 }
 }