controller refactoring part 23

src/Domain/Files/Controllers/FileAccess/GetFileController.php

@@ -0,0 +1,42 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class GetFileController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload,
+    ){}
+
+    /**
+     * Get file
+     */
+    public function __invoke(
+        Request $request,
+        string $filename,
+    ): StreamedResponse {
+
+        // Get file record
+        $file = UserFile::withTrashed()
+            ->where('user_id', Auth::id())
+            ->where('basename', $filename)
+            ->firstOrFail();
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: (int) $file->getRawOriginal('filesize'),
+            user_id: Auth::id(),
+        );
+
+        return $this->helper->download_file($file, Auth::id());
+    }
+}

src/Domain/Files/Controllers/FileAccess/GetThumbnailController.php

@@ -0,0 +1,31 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+class GetThumbnailController extends Controller
+{
+    /**
+     * Get image thumbnail
+     */
+    public function __invoke(
+        Request $request,
+        string $filename,
+    ): FileNotFoundException|StreamedResponse {
+
+        $file = UserFile::withTrashed()
+            ->whereUserId(Auth::id())
+            ->whereThumbnail($filename)
+            ->firstOrFail();
+
+        return $this->helper->download_thumbnail_file($file, Auth::id());
+    }
+}

src/Domain/Files/Controllers/FileAccess/VisitorGetFileController.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Domain\Sharing\Models\Share;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+/**
+ * Get file public
+ */
+class VisitorGetFileController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload
+    ){}
+
+    public function __invoke(
+        $filename,
+        Share $shared,
+    ): StreamedResponse {
+
+        // Check ability to access protected share files
+        $this->helper->check_protected_share_record($shared);
+
+        // Get file record
+        $file = UserFile::where('user_id', $shared->user_id)
+            ->where('basename', $filename)
+            ->firstOrFail();
+
+        // Check file access
+        $this->helper->check_guest_access_to_shared_items($shared, $file);
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: (int) $file->getRawOriginal('filesize'),
+            user_id: $shared->user_id,
+        );
+
+        return $this->helper->download_file($file, $shared->user_id);
+    }
+}

src/Domain/Files/Controllers/FileAccess/VisitorGetThumbnailController.php

@@ -0,0 +1,46 @@
+<?php
+
+
+namespace Domain\Files\Controllers\FileAccess;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File as UserFile;
+use Domain\Sharing\Models\Share;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+
+/**
+ * Get public image thumbnail
+ */
+class VisitorGetThumbnailController extends Controller
+{
+    public function __construct(
+        private RecordDownloadAction $recordDownload,
+    ) {}
+
+    public function __invoke(
+
+        $filename,
+        Share $shared,
+    ): StreamedResponse {
+        // Check ability to access protected share files
+        $this->helper->check_protected_share_record($shared);
+
+        // Get file record
+        $file = UserFile::where('user_id', $shared->user_id)
+            ->where('thumbnail', $filename)
+            ->firstOrFail();
+
+        // Check file access
+        $this->helper->check_guest_access_to_shared_items($shared, $file);
+
+        // Store user download size
+        ($this->recordDownload)(
+            file_size: (int) $file->getRawOriginal('filesize'),
+            user_id: $shared->user_id,
+        );
+
+        return $this->helper->download_thumbnail_file($file, $shared->user_id);
+    }
+}

src/Domain/Files/Controllers/FileAccessController.php

@@ -1,144 +0,0 @@
-<?php
-namespace Domain\Files\Controllers;
-
-use Illuminate\Http\Request;
-use Domain\Zipping\Models\Zip;
-use Support\Services\HelperService;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Storage;
-use Domain\Files\Models\File as UserFile;
-use Domain\Traffic\Actions\RecordDownloadAction;
-
-class FileAccessController extends Controller
-{
-    public function __construct(
-        public HelperService $helper,
-        public RecordDownloadAction $recordDownload,
-    ) {
-    }
-
-    /**
-     * Get avatar
-     *
-     * @param $basename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_avatar($basename)
-    {
-        // Check if file exist
-        if (! Storage::exists("/avatars/$basename")) {
-            abort(404);
-        }
-
-        // Return avatar
-        return Storage::download("/avatars/$basename", $basename);
-    }
-
-    /**
-     * Get system image
-     *
-     * @param $basename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_system_image($basename)
-    {
-        // Check if file exist
-        if (! Storage::exists("/system/$basename")) {
-            abort(404);
-        }
-
-        // Return avatar
-        return Storage::download("/system/$basename", $basename);
-    }
-
-    /**
-     * Get file
-     *
-     * @param Request $request
-     * @param $filename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_file(Request $request, $filename)
-    {
-        // Get file record
-        $file = UserFile::withTrashed()
-            ->where('user_id', Auth::id())
-            ->where('basename', $filename)
-            ->firstOrFail();
-
-        // Check user permission
-        /*if (!$request->user()->tokenCan('master')) {
-
-            // Get shared token
-            $shared = get_shared($request->cookie('shared_token'));
-
-            // Check access to file
-            $this->check_file_access($shared, $file);
-        }*/
-
-        // Store user download size
-        ($this->recordDownload)(
-            (int) $file->getRawOriginal('filesize'),
-            Auth::id()
-        );
-
-        return $this->helper->download_file($file, Auth::id());
-    }
-
-    /**
-     * Get generated zip for user
-     *
-     * @param $id
-     * @return \Symfony\Component\HttpFoundation\StreamedResponse
-     */
-    public function get_zip($id)
-    {
-        $disk = Storage::disk('local');
-
-        $zip = Zip::whereId($id)
-            ->where('user_id', Auth::id())
-            ->firstOrFail();
-
-        // Store user download size
-        ($this->recordDownload)(
-            $disk->size("zip/$zip->basename"),
-            $zip->user_id
-        );
-
-        return $disk->download("zip/$zip->basename", $zip->basename, [
-            'Content-Type'        => 'application/zip',
-            'Content-Length'      => $disk->size("zip/$zip->basename"),
-            'Accept-Ranges'       => 'bytes',
-            'Content-Range'       => 'bytes 0-600/' . $disk->size("zip/$zip->basename"),
-            'Content-Disposition' => "attachment; filename=$zip->basename",
-        ]);
-    }
-
-    /**
-     * Get image thumbnail
-     *
-     * @param Request $request
-     * @param $filename
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_thumbnail(Request $request, $filename)
-    {
-        // Get file record
-        $file = UserFile::withTrashed()
-            ->whereUserId(Auth::id())
-            ->whereThumbnail($filename)
-            ->firstOrFail();
-
-        // Check user permission
-        /*if (!$request->user()->tokenCan('master')) {
-            $this->check_file_access($request, $file);
-        }*/
-
-        return $this->helper->download_thumbnail_file($file, Auth::id());
-    }
-}

src/Domain/Files/Controllers/VisitorShowFileController.php

@@ -10,7 +10,7 @@ use Domain\Files\Resources\FileResource;
 /**
  * Get shared file record
  */
-class VisitorGetSingleFileInfoController
+class VisitorShowFileController
 {
     public function __construct(
         public HelperService $helper,

src/Domain/Files/Controllers/VisitorUploadFileController.php

@@ -12,7 +12,7 @@ use Support\Demo\Actions\FakeUploadFileAction;
 /**
  * guest user upload file into shared folder
  */
-class VisitorUploadFilesController extends Controller
+class VisitorUploadFileController extends Controller
 {
     public function __construct(
         public HelperService $helper,