Classes refactored

app/Http/Controllers/Sharing/BrowseShareController.php

@@ -19,6 +19,37 @@ class BrowseShareController extends Controller
         $this->helper = resolve(HelperService::class);
     }
 
+    /**
+     * Browse public folders
+     *
+     * @param $id
+     * @param $token
+     * @return Collection
+     */
+    public function get_public_folders($id, $token)
+    {
+        $shared = get_shared($token);
+
+        // Abort if folder is protected
+        if ((int)$shared->is_protected) {
+            abort(403, "Sorry, you don't have permission");
+        }
+
+        // Check if user can get directory
+        $this->helper->check_item_access($id, $shared);
+
+        // Get files and folders
+        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
+
+        // Set thumbnail links for public files
+        $files->map(function ($file) use ($token) {
+            $file->setPublicUrl($token);
+        });
+
+        // Collect folders and files to single array
+        return collect([$folders, $files])->collapse();
+    }
+
     /**
      * Search public files
      *
@@ -77,11 +108,11 @@ class BrowseShareController extends Controller
     /**
      * Get navigation tree
      *
+     * @param $token
      * @return array
      */
     public function get_public_navigation_tree($token)
     {
-        // Get sharing record
         $shared = get_shared($token);
 
         // Check if user can get directory
@@ -103,35 +134,4 @@ class BrowseShareController extends Controller
             ]
         ];
     }
-
-    /**
-     * Browse public folders
-     *
-     * @param $id
-     * @param $token
-     * @return Collection
-     */
-    public function get_public_folders($id, $token)
-    {
-        $shared = get_shared($token);
-
-        // Abort if folder is protected
-        if ((int)$shared->is_protected) {
-            abort(403, "Sorry, you don't have permission");
-        }
-
-        // Check if user can get directory
-        $this->helper->check_item_access($id, $shared);
-
-        // Get files and folders
-        list($folders, $files) = $this->helper->get_items_under_shared_by_folder_id($id, $shared);
-
-        // Set thumbnail links for public files
-        $files->map(function ($file) use ($token) {
-            $file->setPublicUrl($token);
-        });
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])->collapse();
-    }
 }

app/Http/Controllers/Sharing/FileSharedAccessController.php

@@ -9,7 +9,7 @@ use App\Services\HelperService;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
-class SharedFileAccessContentController extends Controller
+class FileSharedAccessController extends Controller
 {
     private $helper;
 

app/Http/Controllers/Sharing/ServeSharedController.php

@@ -9,7 +9,6 @@ use App\Models\Share;
 use App\Models\Setting;
 use App\Services\HelperService;
 use Illuminate\Support\Facades\Cookie;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Collection;
 use Illuminate\Http\Request;
@@ -19,7 +18,7 @@ use App\Models\File;
 use App\Models\User;
 use Illuminate\Support\Facades\Storage;
 
-class FileSharingController extends Controller
+class ServeSharedController extends Controller
 {
     private $helper;