backend refactoring

app/Http/Controllers/FileFunctions/EditItemsController.php

@@ -17,7 +17,7 @@ use App\FileManagerFile;
 use Response;
 
 
-class EditController extends Controller
+class EditItemsController extends Controller
 {
     /**
      * Create new folder
@@ -64,11 +64,10 @@ class EditController extends Controller
      * @param Request $request
      * @return mixed
      */
-    public function rename_item(Request $request)
+    public function rename_item(Request $request, $unique_id)
     {
         // Validate request
         $validator = Validator::make($request->all(), [
-            'unique_id' => 'required|integer',
             'name'      => 'required|string',
             'type'      => 'required|string',
         ]);
@@ -82,7 +81,7 @@ class EditController extends Controller
         // Update folder name
         if ($request->type === 'folder') {
 
-            $item = FileManagerFolder::where('unique_id', $request->unique_id)
+            $item = FileManagerFolder::where('unique_id', $unique_id)
                 ->where('user_id', $user_id)
                 ->firstOrFail();
 
@@ -96,7 +95,7 @@ class EditController extends Controller
 
         } else {
 
-            $item = FileManagerFile::where('unique_id', $request->unique_id)
+            $item = FileManagerFile::where('unique_id', $unique_id)
                 ->where('user_id', $user_id)
                 ->firstOrFail();
 
@@ -117,13 +116,13 @@ class EditController extends Controller
      * Delete item
      *
      * @param Request $request
+     * @param $unique_id
      * @throws \Exception
      */
-    public function delete_item(Request $request)
+    public function delete_item(Request $request, $unique_id)
     {
         // Validate request
         $validator = Validator::make($request->all(), [
-            'unique_id'    => 'required|integer',
             'type'         => 'required|string',
             'force_delete' => 'required|boolean',
         ]);
@@ -141,7 +140,7 @@ class EditController extends Controller
             $folder = FileManagerFolder::withTrashed()
                 ->with(['folders'])
                 ->where('user_id', $user->id)
-                ->where('unique_id', $request->unique_id)
+                ->where('unique_id', $unique_id)
                 ->first();
 
             // Check permission to delete for authenticated public editor
@@ -158,7 +157,7 @@ class EditController extends Controller
                 // Get children files
                 $files = FileManagerFile::onlyTrashed()
                     ->where('user_id', $user->id)
-                    ->whereIn('folder_id', Arr::flatten([$request->unique_id, $child_folders]))
+                    ->whereIn('folder_id', Arr::flatten([$unique_id, $child_folders]))
                     ->get();
 
                 // Remove all children files
@@ -180,7 +179,7 @@ class EditController extends Controller
             } else {
 
                 // Remove folder from user favourites
-                $user->favourites()->detach($request->unique_id);
+                $user->favourites()->detach($unique_id);
 
                 // Soft delete folder record
                 $folder->delete();
@@ -189,7 +188,7 @@ class EditController extends Controller
 
             $file = FileManagerFile::withTrashed()
                 ->where('user_id', $user->id)
-                ->where('unique_id', $request->unique_id)
+                ->where('unique_id', $unique_id)
                 ->first();
 
             // Check permission to delete for authenticated public editor
@@ -298,13 +297,13 @@ class EditController extends Controller
      * Move item
      *
      * @param Request $request
+     * @param $unique_id
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function move_item(Request $request)
+    public function move_item(Request $request, $unique_id)
     {
         // Validate request
         $validator = Validator::make($request->all(), [
-            'from_unique_id' => 'required|integer',
             'to_unique_id'   => 'required|integer',
             'from_type'      => 'required|string',
         ]);
@@ -319,7 +318,7 @@ class EditController extends Controller
 
             // Move folder
             $item = FileManagerFolder::where('user_id', $user_id)
-                ->where('unique_id', $request->from_unique_id)
+                ->where('unique_id', $unique_id)
                 ->firstOrFail();
 
             $item->parent_id = $request->to_unique_id;
@@ -328,7 +327,7 @@ class EditController extends Controller
 
             // Move file under new folder
             $item = FileManagerFile::where('user_id', $user_id)
-                ->where('unique_id', $request->from_unique_id)
+                ->where('unique_id', $unique_id)
                 ->firstOrFail();
 
             $item->folder_id = $request->to_unique_id;

app/Http/Controllers/FileFunctions/FavouriteController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\FileFunctions;
 
+use App\FileManagerFolder;
 use Illuminate\Support\Facades\Validator;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
@@ -15,7 +16,7 @@ class FavouriteController extends Controller
      * @param Request $request
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function add_to_favourites(Request $request)
+    public function store(Request $request)
     {
         // Validate request
         $validator = Validator::make($request->all(), [
@@ -25,8 +26,12 @@ class FavouriteController extends Controller
         // Return error
         if ($validator->fails()) abort(400, 'Bad input');
 
-        // Get user
+        // Get user & folder
         $user = Auth::user();
+        $folder = FileManagerFolder::where('unique_id', $request->unique_id)->first();
+
+        // Check ownership
+        if ($folder->user_id !== $user->id) abort(403);
 
         // Add folder to user favourites
         $user->favourites()->attach($request->unique_id);
@@ -38,24 +43,16 @@ class FavouriteController extends Controller
     /**
      * Remove folder from user favourites
      *
-     * @param Request $request
+     * @param $unique_id
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function remove_from_favourites(Request $request)
+    public function destroy($unique_id)
     {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'unique_id' => 'required|integer',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
         // Get user
         $user = Auth::user();
 
         // Remove folder from user favourites
-        $user->favourites()->detach($request->unique_id);
+        $user->favourites()->detach($unique_id);
 
         // Return updated favourites
         return $user->favourites->makeHidden(['pivot']);

app/Http/Controllers/FileFunctions/ShareController.php

@@ -2,29 +2,42 @@
 
 namespace App\Http\Controllers\FileFunctions;
 
+use App\Http\Requests\Share\CreateShareRequest;
+use App\Http\Requests\Share\UpdateShareRequest;
+use App\Http\Resources\ShareResource;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use App\Share;
 
 class ShareController extends Controller
 {
+    /**
+     * Get shared record
+     *
+     * @return ShareResource
+     */
+    public function show($token)
+    {
+        // Get record
+        $shared = Share::where(DB::raw('BINARY `token`'), $token)
+            ->firstOrFail();
+
+        return new ShareResource($shared);
+    }
 
     /**
      * Generate file share link
      *
-     * @param Request $request
-     * @return array
+     * @param CreateShareRequest $request
+     * @return ShareResource
      */
-    public function store(Request $request)
+    public function store(CreateShareRequest $request)
     {
-        // TODO: validation
-
         do {
             // Generate unique token
             $token = Str::random(16);
@@ -33,61 +46,61 @@ class ShareController extends Controller
 
         // Create shared options
         $options = [
-            'token'      => $token,
-            'user_id'    => Auth::id(),
-            'item_id'    => $request->unique_id,
-            'permission' => $request->permission,
-            'protected'  => $request->isPassword,
-            'type'       => $request->type === 'folder' ? 'folder' : 'file',
             'password'   => $request->has('password') ? Hash::make($request->password) : null,
+            'type'       => $request->type === 'folder' ? 'folder' : 'file',
+            'protected'  => $request->isPassword,
+            'permission' => $request->permission,
+            'item_id'    => $request->unique_id,
+            'user_id'    => Auth::id(),
+            'token'      => $token,
         ];
 
-        // Store shared item
-        $shared = Share::create($options);
-
-        // Return shared record
-        return Arr::except($shared, ['password', 'user_id', 'updated_at', 'created_at']);
+        // Return created shared record
+        return new ShareResource(Share::create($options));
     }
 
     /**
      * Update sharing
      *
-     * @param Request $request
-     * @return mixed
+     * @param UpdateShareRequest $request
+     * @param $token
+     * @return ShareResource
      */
-    public function update(Request $request)
+    public function update(UpdateShareRequest $request, $token)
     {
-        // TODO: validacia
-
         // Get sharing record
-        $shared = Share::where('token', $request->get('token'))->firstOrFail();
+        $shared = Share::where('token', $token)
+            ->where('user_id', Auth::id())
+            ->firstOrFail();
 
         // Update sharing record
         $shared->update([
             'permission' => $request->permission,
-            'protected'  => $request->isProtected,
-            'password'   => $request->has('password') ? Hash::make($request->password) : $shared->password,
+            'protected'  => $request->protected,
+            'password'   => $request->password ? Hash::make($request->password) : $shared->password,
         ]);
 
         // Return shared record
-        return Arr::except($shared, ['password', 'user_id', 'updated_at', 'created_at']);
+        return new ShareResource($shared);
     }
 
     /**
      * Delete sharing item
      *
-     * @param Request $request
+     * @param $token
      * @return ResponseFactory|\Illuminate\Http\Response
      */
-    public function delete(Request $request)
+    public function destroy($token)
     {
         // Get sharing record
-        $shared = Share::where('token', $request->get('token'))->firstOrFail();
+        $shared = Share::where('token', $token)
+            ->where('user_id', Auth::id())
+            ->firstOrFail();
 
         // Delete shared record
         $shared->delete();
 
         // Done
-        return response('Done!', 202);
+        return response('Done!', 204);
     }
 }

app/Http/Controllers/FileFunctions/TrashController.php

@@ -51,13 +51,13 @@ class TrashController extends Controller
      * Restore item from trash
      *
      * @param Request $request
+     * @param $unique_id
      * @return ResponseFactory|\Illuminate\Http\Response
      */
-    public function restore(Request $request)
+    public function restore(Request $request, $unique_id)
     {
         // Validate request
         $validator = Validator::make($request->all(), [
-            'unique_id' => 'required|integer',
             'type'      => 'required|string',
             'to_home'   => 'boolean',
         ]);
@@ -72,7 +72,10 @@ class TrashController extends Controller
         if ($request->type === 'folder') {
 
             // Get folder
-            $item = FileManagerFolder::onlyTrashed()->where('user_id', $user_id)->where('unique_id', $request->unique_id)->first();
+            $item = FileManagerFolder::onlyTrashed()
+                ->where('user_id', $user_id)
+                ->where('unique_id', $unique_id)
+                ->first();
 
             // Restore item to home directory
             if ($request->has('to_home') && $request->to_home) {
@@ -82,7 +85,10 @@ class TrashController extends Controller
         } else {
 
             // Get item
-            $item = FileManagerFile::onlyTrashed()->where('user_id', $user_id)->where('unique_id', $request->unique_id)->first();
+            $item = FileManagerFile::onlyTrashed()
+                ->where('user_id', $user_id)
+                ->where('unique_id', $unique_id)
+                ->first();
 
             // Restore item to home directory
             if ($request->has('to_home') && $request->to_home) {