added SharedFileAccessContentController

app/Http/Controllers/FileAccessController.php

@@ -88,7 +88,7 @@ class FileAccessController extends Controller
             (int)$file->getRawOriginal('filesize')
         );
 
-        return $this->download_file($file, Auth::id());
+        return $this->helper->download_file($file, Auth::id());
     }
 
     /**
@@ -120,73 +120,6 @@ class FileAccessController extends Controller
         ]);
     }
 
-    /**
-     * Get generated zip for guest
-     *
-     * @param $id
-     * @param $token
-     * @return \Symfony\Component\HttpFoundation\StreamedResponse
-     */
-    public function get_zip_public($id, $token)
-    {
-        $disk = Storage::disk('local');
-
-        $zip = Zip::where('id', $id)
-            ->where('shared_token', $token)
-            ->first();
-
-        $zip
-            ->user
-            ->record_download(
-                $disk->size("zip/$zip->basename")
-            );
-
-        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 file public
-     *
-     * @param $filename
-     * @param $token
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_file_public($filename, $token)
-    {
-        // Get sharing record
-        $shared = get_shared($token);
-
-        // Abort if shared is protected
-        if ((int)$shared->is_protected) {
-            abort(403, "Sorry, you don't have permission");
-        }
-
-        // Get file record
-        $file = UserFile::where('user_id', $shared->user_id)
-            ->where('basename', $filename)
-            ->firstOrFail();
-
-        // Check file access
-        $this->check_file_access($shared, $file);
-
-        // Store user download size
-        $shared
-            ->user
-            ->record_download(
-                (int)$file->getRawOriginal('filesize')
-            );
-
-        return $this->download_file($file, $shared->user_id);
-    }
-
     /**
      * Get image thumbnail
      *
@@ -208,108 +141,6 @@ class FileAccessController extends Controller
             $this->check_file_access($request, $file);
         }*/
 
-        return $this->thumbnail_file($file, Auth::id());
-    }
-
-    /**
-     * Get public image thumbnail
-     *
-     * @param $filename
-     * @param $token
-     * @return mixed
-     * @throws \Illuminate\Contracts\Filesystem\FileNotFoundException
-     */
-    public function get_thumbnail_public($filename, $token)
-    {
-        // Get sharing record
-        $shared = get_shared($token);
-
-        // Abort if thumbnail is protected
-        if ((int)$shared->protected) {
-            abort(403, "Sorry, you don't have permission");
-        }
-
-        // Get file record
-        $file = UserFile::where('user_id', $shared->user_id)
-            ->where('thumbnail', $filename)
-            ->firstOrFail();
-
-        // Check file access
-        $this->check_file_access($shared, $file);
-
-        // Store user download size
-        $shared
-            ->user
-            ->record_download(
-                (int)$file->getRawOriginal('filesize')
-            );
-
-        return $this->thumbnail_file($file, $shared->user_id);
-    }
-
-    /**
-     * Check user file access
-     *
-     * @param $shared
-     * @param $file
-     */
-    protected function check_file_access($shared, $file): void
-    {
-        // Check by parent folder permission
-        if ($shared->type === 'folder') {
-            $this->helper->check_item_access($file->folder_id, $shared);
-        }
-
-        // Check by single file permission
-        if ($shared->type === 'file') {
-            if ($shared->item_id !== $file->id) abort(403);
-        }
-    }
-
-    /**
-     * Call and download file
-     *
-     * @param $file
-     * @param $user_id
-     * @return mixed
-     */
-    private function download_file($file, $user_id)
-    {
-        // Get file path
-        $path = "files/$user_id/$file->basename";
-
-        // Check if file exist
-        if (!Storage::exists($path)) {
-            abort(404);
-        }
-
-        // Get pretty name
-        $pretty_name = get_pretty_name($file->basename, $file->name, $file->mimetype);
-
-        return response()
-            ->download(Storage::path($path), $pretty_name, [
-                "Accept-Ranges"       => "bytes",
-                "Content-Type"        => Storage::mimeType($path),
-                "Content-Length"      => Storage::size($path),
-                "Content-Range"       => "bytes 0-600/" . Storage::size($path),
-                "Content-Disposition" => "attachment; filename=$pretty_name",
-            ]);
-    }
-
-    /**
-     * @param $file
-     * @param $user_id
-     * @return mixed
-     */
-    private function thumbnail_file($file, $user_id)
-    {
-        // Get file path
-        $path = "/files/$user_id/{$file->getRawOriginal('thumbnail')}";
-
-        // Check if file exist
-        if (!Storage::exists($path)) abort(404);
-
-        // Return image thumbnail
-        return Storage::download($path, $file->getRawOriginal('thumbnail'));
+        return $this->helper->download_thumbnail_file($file, Auth::id());
     }
 }