Fixed OIDC Logout

[bookstack] / app / Uploads / ImageRepo.php

diff --git a/app/Uploads/ImageRepo.php b/app/Uploads/ImageRepo.php
index b7a21809f18ab7347e44945b8f0933815bf57b7e..5507933f3fafbbb8e9025a52eb0674ce12b4c8ca 100644 (file)
--- a/app/Uploads/ImageRepo.php
+++ b/app/Uploads/ImageRepo.php
@@ -1,42 +1,28 @@
-<?php namespace BookStack\Uploads;
+<?php

 
 

-use BookStack\Auth\Permissions\PermissionService;
-use BookStack\Entities\Page;
+namespace BookStack\Uploads;
+
+use BookStack\Entities\Models\Page;

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

+use BookStack\Permissions\PermissionApplicator;

 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo
 {
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 class ImageRepo
 {

-
-    protected $image;
-    protected $imageService;
-    protected $restrictionService;
-    protected $page;
-
-    /**
-     * ImageRepo constructor.
-     */

     public function __construct(
     public function __construct(

-        Image $image,
-        ImageService $imageService,
-        PermissionService $permissionService,
-        Page $page
+        protected ImageService $imageService,
+        protected PermissionApplicator $permissions

     ) {
     ) {

-        $this->image = $image;
-        $this->imageService = $imageService;
-        $this->restrictionService = $permissionService;
-        $this->page = $page;

     }
 
     }
 

-

     /**
      * Get an image with the given id.
      */
     public function getById($id): Image
     {
     /**
      * Get an image with the given id.
      */
     public function getById($id): Image
     {

-        return $this->image->findOrFail($id);
+        return Image::query()->findOrFail($id);

     }
 
     /**
     }
 
     /**


@@ -49,13 +35,13 @@ class ImageRepo
         $hasMore = count($images) > $pageSize;
 
         $returnImages = $images->take($pageSize);
         $hasMore = count($images) > $pageSize;
 
         $returnImages = $images->take($pageSize);

-        $returnImages->each(function ($image) {
+        $returnImages->each(function (Image $image) {

             $this->loadThumbs($image);
         });
 
         return [
             $this->loadThumbs($image);
         });
 
         return [

-            'images'  => $returnImages,
-            'has_more' => $hasMore
+            'images'   => $returnImages,
+            'has_more' => $hasMore,

         ];
     }
 
         ];
     }
 


@@ -70,9 +56,8 @@ class ImageRepo
         int $uploadedTo = null,
         string $search = null,
         callable $whereClause = null
         int $uploadedTo = null,
         string $search = null,
         callable $whereClause = null

-    ): array
-    {
-        $imageQuery = $this->image->newQuery()->where('type', '=', strtolower($type));
+    ): array {
+        $imageQuery = Image::query()->where('type', '=', strtolower($type));

 
         if ($uploadedTo !== null) {
             $imageQuery = $imageQuery->where('uploaded_to', '=', $uploadedTo);
 
         if ($uploadedTo !== null) {
             $imageQuery = $imageQuery->where('uploaded_to', '=', $uploadedTo);


@@ -83,7 +68,7 @@ class ImageRepo
         }
 
         // Filter by page access
         }
 
         // Filter by page access

-        $imageQuery = $this->restrictionService->filterRelatedEntity('page', $imageQuery, 'images', 'uploaded_to');
+        $imageQuery = $this->permissions->restrictPageRelationQuery($imageQuery, 'images', 'uploaded_to');

 
         if ($whereClause !== null) {
             $imageQuery = $imageQuery->where($whereClause);
 
         if ($whereClause !== null) {
             $imageQuery = $imageQuery->where($whereClause);


@@ -102,9 +87,9 @@ class ImageRepo
         int $pageSize = 24,
         int $uploadedTo = null,
         string $search = null
         int $pageSize = 24,
         int $uploadedTo = null,
         string $search = null

-    ): array
-    {
-        $contextPage = $this->page->findOrFail($uploadedTo);
+    ): array {
+        /** @var Page $contextPage */
+        $contextPage = Page::visible()->findOrFail($uploadedTo);

         $parentFilter = null;
 
         if ($filterType === 'book' || $filterType === 'page') {
         $parentFilter = null;
 
         if ($filterType === 'book' || $filterType === 'page') {


@@ -112,7 +97,10 @@ class ImageRepo
                 if ($filterType === 'page') {
                     $query->where('uploaded_to', '=', $contextPage->id);
                 } elseif ($filterType === 'book') {
                 if ($filterType === 'page') {
                     $query->where('uploaded_to', '=', $contextPage->id);
                 } elseif ($filterType === 'book') {

-                    $validPageIds = $contextPage->book->pages()->get(['id'])->pluck('id')->toArray();
+                    $validPageIds = $contextPage->book->pages()
+                        ->scopes('visible')
+                        ->pluck('id')
+                        ->toArray();

                     $query->whereIn('uploaded_to', $validPageIds);
                 }
             };
                     $query->whereIn('uploaded_to', $validPageIds);
                 }
             };


@@ -123,86 +111,127 @@ class ImageRepo
 
     /**
      * Save a new image into storage and return the new image.
 
     /**
      * Save a new image into storage and return the new image.

+     *

      * @throws ImageUploadException
      */
     public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image
     {
         $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);
      * @throws ImageUploadException
      */
     public function saveNew(UploadedFile $uploadFile, string $type, int $uploadedTo = 0, int $resizeWidth = null, int $resizeHeight = null, bool $keepRatio = true): Image
     {
         $image = $this->imageService->saveNewFromUpload($uploadFile, $type, $uploadedTo, $resizeWidth, $resizeHeight, $keepRatio);

+
+        if ($type !== 'system') {
+            $this->loadThumbs($image);
+        }
+
+        return $image;
+    }
+
+    /**
+     * Save a new image from an existing image data string.
+     *
+     * @throws ImageUploadException
+     */
+    public function saveNewFromData(string $imageName, string $imageData, string $type, int $uploadedTo = 0): Image
+    {
+        $image = $this->imageService->saveNew($imageName, $imageData, $type, $uploadedTo);

         $this->loadThumbs($image);
         $this->loadThumbs($image);

+

         return $image;
     }
 
     /**
         return $image;
     }
 
     /**

-     * Save a drawing the the database.
+     * Save a drawing in the database.
+     *

      * @throws ImageUploadException
      */
     public function saveDrawing(string $base64Uri, int $uploadedTo): Image
     {
      * @throws ImageUploadException
      */
     public function saveDrawing(string $base64Uri, int $uploadedTo): Image
     {

-        $name = 'Drawing-' . strval(user()->id) . '-' . strval(time()) . '.png';
+        $name = 'Drawing-' . user()->id . '-' . time() . '.png';
+

         return $this->imageService->saveNewFromBase64Uri($base64Uri, $name, 'drawio', $uploadedTo);
     }
 
         return $this->imageService->saveNewFromBase64Uri($base64Uri, $name, 'drawio', $uploadedTo);
     }
 

-

     /**
      * Update the details of an image via an array of properties.
     /**
      * Update the details of an image via an array of properties.

-     * @throws ImageUploadException
+     *

      * @throws Exception
      */
     public function updateImageDetails(Image $image, $updateDetails): Image
     {
         $image->fill($updateDetails);
      * @throws Exception
      */
     public function updateImageDetails(Image $image, $updateDetails): Image
     {
         $image->fill($updateDetails);

+        $image->updated_by = user()->id;

         $image->save();
         $this->loadThumbs($image);
         $image->save();
         $this->loadThumbs($image);

+

         return $image;
     }
 
         return $image;
     }
 

+    /**
+     * Update the image file of an existing image in the system.
+     * @throws ImageUploadException
+     */
+    public function updateImageFile(Image $image, UploadedFile $file): void
+    {
+        if ($file->getClientOriginalExtension() !== pathinfo($image->path, PATHINFO_EXTENSION)) {
+            throw new ImageUploadException(trans('errors.image_upload_replace_type'));
+        }
+
+        $image->refresh();
+        $image->updated_by = user()->id;
+        $image->touch();
+        $image->save();
+        $this->imageService->replaceExistingFromUpload($image->path, $image->type, $file);
+        $this->loadThumbs($image, true);
+    }
+

     /**
      * Destroys an Image object along with its revisions, files and thumbnails.
     /**
      * Destroys an Image object along with its revisions, files and thumbnails.

+     *

      * @throws Exception
      */
      * @throws Exception
      */

-    public function destroyImage(Image $image = null): bool
+    public function destroyImage(Image $image = null): void

     {
         if ($image) {
             $this->imageService->destroy($image);
         }
     {
         if ($image) {
             $this->imageService->destroy($image);
         }

-        return true;

     }
 
     /**
     }
 
     /**

-     * Destroy all images of a certain type.
+     * Destroy images that have a specific URL and type combination.
+     *

      * @throws Exception
      */
      * @throws Exception
      */

-    public function destroyByType(string $imageType)
+    public function destroyByUrlAndType(string $url, string $imageType): void

     {
     {

-        $images = $this->image->where('type', '=', $imageType)->get();
+        $images = Image::query()
+            ->where('url', '=', $url)
+            ->where('type', '=', $imageType)
+            ->get();
+

         foreach ($images as $image) {
             $this->destroyImage($image);
         }
     }
 
         foreach ($images as $image) {
             $this->destroyImage($image);
         }
     }
 

-

     /**
      * Load thumbnails onto an image object.
     /**
      * Load thumbnails onto an image object.

-     * @throws Exception

      */
      */

-    protected function loadThumbs(Image $image)
+    public function loadThumbs(Image $image, bool $forceCreate = false): void

     {
     {

-        $image->thumbs = [
-            'gallery' => $this->getThumbnail($image, 150, 150, false),
-            'display' => $this->getThumbnail($image, 1680, null, true)
-        ];
+        $image->setAttribute('thumbs', [
+            'gallery' => $this->getThumbnail($image, 150, 150, false, $forceCreate),
+            'display' => $this->getThumbnail($image, 1680, null, true, $forceCreate),
+        ]);

     }
 
     /**
      * Get the thumbnail for an image.
      * If $keepRatio is true only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.
     }
 
     /**
      * Get the thumbnail for an image.
      * If $keepRatio is true only the width will be used.
      * Checks the cache then storage to avoid creating / accessing the filesystem on every check.

-     * @throws Exception

      */
      */

-    protected function getThumbnail(Image $image, ?int $width = 220, ?int $height = 220, bool $keepRatio = false): ?string
+    protected function getThumbnail(Image $image, ?int $width, ?int $height, bool $keepRatio, bool $forceCreate): ?string

     {
         try {
     {
         try {

-            return $this->imageService->getThumbnail($image, $width, $height, $keepRatio);
+            return $this->imageService->getThumbnail($image, $width, $height, $keepRatio, $forceCreate);

         } catch (Exception $exception) {
             return null;
         }
         } catch (Exception $exception) {
             return null;
         }


@@ -219,4 +248,20 @@ class ImageRepo
             return null;
         }
     }
             return null;
         }
     }

+
+    /**
+     * Get the user visible pages using the given image.
+     */
+    public function getPagesUsingImage(Image $image): array
+    {
+        $pages = Page::visible()
+            ->where('html', 'like', '%' . $image->url . '%')
+            ->get(['id', 'name', 'slug', 'book_id']);
+
+        foreach ($pages as $page) {
+            $page->setAttribute('url', $page->getUrl());
+        }
+
+        return $pages->all();
+    }

 }
 }