Started extraction of image controller to separate controllers

app/Http/Controllers/Images/CoverImageController.php

@@ -0,0 +1,95 @@
+<?php
+
+namespace BookStack\Http\Controllers\Images;
+
+use BookStack\Entities\EntityProvider;
+use BookStack\Entities\Repos\EntityRepo;
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Uploads\ImageRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Controllers\Controller;
+
+class CoverImageController extends Controller
+{
+    protected $imageRepo;
+    protected $entityRepo;
+
+    /**
+     * CoverImageController constructor.
+     * @param ImageRepo $imageRepo
+     * @param EntityRepo $entityRepo
+     */
+    public function __construct(ImageRepo $imageRepo, EntityRepo $entityRepo)
+    {
+        $this->imageRepo = $imageRepo;
+        $this->entityRepo = $entityRepo;
+
+        parent::__construct();
+    }
+
+    /**
+     * Get a list of cover images, in a list.
+     * Can be paged and filtered by entity.
+     * @param Request $request
+     * @param string $entity
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function list(Request $request, $entity)
+    {
+        if (!$this->isValidEntityTypeForCover($entity)) {
+            return $this->jsonError(trans('errors.image_upload_type_error'));
+        }
+
+        $page = $request->get('page', 1);
+        $searchTerm = $request->get('search', null);
+
+        $type = 'cover_' . $entity;
+        $imgData = $this->imageRepo->getPaginatedByType($type, $page, 24, null, $searchTerm);
+        return response()->json($imgData);
+    }
+
+    /**
+     * Store a new cover image in the system.
+     * @param Request $request
+     * @param string $entity
+     * @return Illuminate\Http\JsonResponse
+     * @throws \Exception
+     */
+    public function create(Request $request, $entity)
+    {
+        $this->checkPermission('image-create-all');
+        $this->validate($request, [
+            'file' => $this->imageRepo->getImageValidationRules(),
+            'uploaded_to' => 'required|integer'
+        ]);
+
+        if (!$this->isValidEntityTypeForCover($entity)) {
+            return $this->jsonError(trans('errors.image_upload_type_error'));
+        }
+
+        $uploadedTo = $request->get('uploaded_to', 0);
+        $entityInstance = $this->entityRepo->getById($entity, $uploadedTo);
+        $this->checkOwnablePermission($entity . '-update', $entityInstance);
+
+        try {
+            $type = 'cover_' . $entity;
+            $imageUpload = $request->file('file');
+            $image = $this->imageRepo->saveNew($imageUpload, $type, $uploadedTo);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }
+
+    /**
+     * Check if the given entity type is valid entity to have cover images.
+     * @param string $entityType
+     * @return bool
+     */
+    protected function isValidEntityTypeForCover(string $entityType)
+    {
+        return ($entityType === 'book' || $entityType === 'bookshelf');
+    }
+
+}

app/Http/Controllers/Images/DrawioImageController.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace BookStack\Http\Controllers\Images;
+
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Uploads\ImageRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Controllers\Controller;
+
+class DrawioImageController extends Controller
+{
+    protected $imageRepo;
+
+    /**
+     * DrawioImageController constructor.
+     * @param ImageRepo $imageRepo
+     */
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+        parent::__construct();
+    }
+
+    /**
+     * Get a list of gallery images, in a list.
+     * Can be paged and filtered by entity.
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function list(Request $request)
+    {
+        $page = $request->get('page', 1);
+        $searchTerm = $request->get('search', null);
+        $uploadedToFilter = $request->get('uploaded_to', null);
+        $parentTypeFilter = $request->get('filter_type', null);
+
+        $imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
+        return response()->json($imgData);
+    }
+
+    /**
+     * Store a new gallery image in the system.
+     * @param Request $request
+     * @return Illuminate\Http\JsonResponse
+     * @throws \Exception
+     */
+    public function create(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);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }
+
+}

app/Http/Controllers/Images/GalleryImageController.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace BookStack\Http\Controllers\Images;
+
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Uploads\ImageRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Controllers\Controller;
+
+class GalleryImageController extends Controller
+{
+    protected $imageRepo;
+
+    /**
+     * GalleryImageController constructor.
+     * @param ImageRepo $imageRepo
+     */
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+        parent::__construct();
+    }
+
+    /**
+     * Get a list of gallery images, in a list.
+     * Can be paged and filtered by entity.
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function list(Request $request)
+    {
+        $page = $request->get('page', 1);
+        $searchTerm = $request->get('search', null);
+        $uploadedToFilter = $request->get('uploaded_to', null);
+        $parentTypeFilter = $request->get('filter_type', null);
+
+        $imgData = $this->imageRepo->getEntityFiltered('gallery', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm);
+        return response()->json($imgData);
+    }
+
+    /**
+     * Store a new gallery image in the system.
+     * @param Request $request
+     * @return Illuminate\Http\JsonResponse
+     * @throws \Exception
+     */
+    public function create(Request $request)
+    {
+        $this->checkPermission('image-create-all');
+        $this->validate($request, [
+            'file' => $this->imageRepo->getImageValidationRules()
+        ]);
+
+        try {
+            $imageUpload = $request->file('file');
+            $uploadedTo = $request->get('uploaded_to', 0);
+            $image = $this->imageRepo->saveNew($imageUpload, 'gallery', $uploadedTo);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }
+
+}

app/Http/Controllers/Images/SystemImageController.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace BookStack\Http\Controllers\Images;
+
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Uploads\ImageRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Controllers\Controller;
+
+class SystemImageController extends Controller
+{
+    protected $imageRepo;
+
+    /**
+     * SystemImageController constructor.
+     * @param ImageRepo $imageRepo
+     */
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+        parent::__construct();
+    }
+
+    /**
+     * Get a list of system images, in a list.
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function list(Request $request)
+    {
+        $this->checkPermission('settings-manage');
+        $page = $request->get('page', 1);
+        $searchTerm = $request->get('search', null);
+
+        $imgData = $this->imageRepo->getPaginatedByType('system', $page, 24, null, $searchTerm);
+        return response()->json($imgData);
+    }
+
+    /**
+     * Store a new system image.
+     * @param Request $request
+     * @return Illuminate\Http\JsonResponse
+     * @throws \Exception
+     */
+    public function create(Request $request)
+    {
+        $this->checkPermission('image-create-all');
+        $this->checkPermission('settings-manage');
+
+        $this->validate($request, [
+            'file' => $this->imageRepo->getImageValidationRules()
+        ]);
+
+        try {
+            $imageUpload = $request->file('file');
+            $image = $this->imageRepo->saveNew($imageUpload, 'system', 0);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }
+
+}

app/Http/Controllers/Images/UserImageController.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace BookStack\Http\Controllers\Images;
+
+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Uploads\ImageRepo;
+use Illuminate\Http\Request;
+use BookStack\Http\Controllers\Controller;
+
+class UserImageController extends Controller
+{
+    protected $imageRepo;
+
+    /**
+     * UserImageController constructor.
+     * @param ImageRepo $imageRepo
+     */
+    public function __construct(ImageRepo $imageRepo)
+    {
+        $this->imageRepo = $imageRepo;
+        parent::__construct();
+    }
+
+    /**
+     * Get a list of user profile images, in a list.
+     * @param Request $request
+     * @return \Illuminate\Http\JsonResponse
+     */
+    public function list(Request $request)
+    {
+        $page = $request->get('page', 1);
+        $searchTerm = $request->get('search', null);
+        $userId = $request->get('uploaded_to', null);
+
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+
+        $imgData = $this->imageRepo->getPaginatedByType('user', $page, 24, $userId, $searchTerm);
+        return response()->json($imgData);
+    }
+
+    /**
+     * Store a new user profile image in the system.
+     * @param Request $request
+     * @return Illuminate\Http\JsonResponse
+     * @throws \Exception
+     */
+    public function create(Request $request)
+    {
+        $this->checkPermission('image-create-all');
+
+        $this->validate($request, [
+            'uploaded_to' => 'required|integer',
+            'file' => $this->imageRepo->getImageValidationRules()
+        ]);
+
+        $userId = $request->get('uploaded_to', null);
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+
+        try {
+            $imageUpload = $request->file('file');
+            $uploadedTo = $request->get('uploaded_to', 0);
+            $image = $this->imageRepo->saveNew($imageUpload, 'user', $uploadedTo);
+        } catch (ImageUploadException $e) {
+            return response($e->getMessage(), 500);
+        }
+
+        return response()->json($image);
+    }
+
+}