Admin & User account frontend consolidation

app/Http/Controllers/Admin/UserController.php

@@ -185,7 +185,8 @@ class UserController extends Controller
             'password' => Hash::make($request->password),
         ]);
 
-        // Create settings
+        UserSettings::unguard();
+
         $user
             ->settings()
             ->create([
@@ -194,6 +195,8 @@ class UserController extends Controller
                 'storage_capacity' => $request->storage_capacity,
             ]);
 
+        UserSettings::reguard();
+
         return response(new UserResource($user), 201);
     }
 

app/Http/Controllers/FileManager/BrowseController.php

@@ -48,11 +48,13 @@ class BrowseController extends Controller
         // Get folders and files
         $folders = Folder::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
             ->where('parent_id', $root_id)
+            ->where('user_id', Auth::id())
             ->sortable()
             ->get();
 
         $files = File::with(['parent:id,name', 'shared:token,id,item_id,permission,is_protected,expire_in'])
             ->where('folder_id', $root_id)
+            ->where('user_id', Auth::id())
             ->sortable()
             ->get();
 
@@ -172,6 +174,7 @@ class BrowseController extends Controller
     {
         $folders = Folder::with('folders:id,parent_id,id,name')
             ->where('parent_id', null)
+            ->where('user_id', Auth::id())
             ->sortable()
             ->get(['id', 'parent_id', 'id', 'name']);
 

app/Http/Controllers/Sharing/ServeSharedController.php

@@ -59,7 +59,7 @@ class ServeSharedController extends Controller
 
             $image = File::where('user_id', $shared->user_id)
                 ->where('type', 'image')
-                ->where('unique_id', $shared->item_id)
+                ->where('id', $shared->item_id)
                 ->first();
 
             if ($image) {
@@ -196,7 +196,7 @@ class ServeSharedController extends Controller
 
         // Return record
         return File::where('user_id', $shared->user_id)
-            ->where('unique_id', $shared->item_id)
+            ->where('id', $shared->item_id)
             ->firstOrFail(['name', 'basename', 'thumbnail', 'type', 'filesize', 'mimetype']);
     }
 
@@ -215,16 +215,16 @@ class ServeSharedController extends Controller
         $this->helper->check_item_access($shared->item_id, $shared);
 
         // Get folders
-        $folders = Folder::with('folders:id,parent_id,unique_id,name')
+        $folders = Folder::with('folders:id,parent_id,id,name')
             ->where('parent_id', $shared->item_id)
             ->where('user_id', $shared->user_id)
             ->sortable()
-            ->get(['id', 'parent_id', 'unique_id', 'name']);
+            ->get(['id', 'parent_id', 'id', 'name']);
 
         // Return folder tree
         return [
             [
-                'unique_id' => $shared->item_id,
+                'id' => $shared->item_id,
                 'name'      => __('vuefilemanager.home'),
                 'location'  => 'public',
                 'folders'   => $folders,
@@ -254,7 +254,7 @@ class ServeSharedController extends Controller
             ->get();
 
         // Get all children content
-        $foldersIds = Folder::with('folders:id,parent_id,unique_id,name')
+        $foldersIds = Folder::with('folders:id,parent_id,id,name')
             ->where('user_id', $shared->user_id)
             ->where('parent_id', $shared->item_id)
             ->get();
@@ -269,7 +269,7 @@ class ServeSharedController extends Controller
 
         // Filter folders to only accessible folders
         $folders = $searched_folders->filter(function ($folder) use ($accessible_folder_ids) {
-            return in_array($folder->unique_id, $accessible_folder_ids);
+            return in_array($folder->id, $accessible_folder_ids);
         });
 
         // Collect folders and files to single array