V 1.1 Beta

app/Http/Controllers/AppFunctionsController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
+use Response;
+
+class AppFunctionsController extends Controller
+{
+    /**
+     * Show index page
+     *
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function index()
+    {
+        return view("index");
+    }
+
+    /**
+     * Get file
+     *
+     * @param $filename
+     * @return mixed
+     */
+    public function get_avatar($basename)
+    {
+        // Get file path
+        $path = storage_path() . '/app/avatars/' . $basename;
+
+        // Check if file exist
+        if (!File::exists($path)) abort(404);
+
+        $file = File::get($path);
+        $type = File::mimeType($path);
+
+        // Create response
+        $response = Response::make($file, 200);
+        $response->header("Content-Type", $type);
+
+        return $response;
+    }
+}

app/Http/Controllers/Auth/AuthController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\ClientProfile;
 use App\Models\User\UserAttribute;
@@ -10,6 +10,7 @@ use App\User;
 use GuzzleHttp\Client;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cookie;
 use Illuminate\Support\Facades\Hash;
@@ -54,9 +55,15 @@ class AuthController extends Controller
     {
         $response = Route::dispatch(self::make_request($request));
 
-        $data = json_decode($response->content(), true);
+        if ($response->isSuccessful()) {
 
-        return response('Login Successfull!', 200)->cookie('token', $data['access_token'], 43200);
+            $data = json_decode($response->content(), true);
+
+            return response('Login Successfull!', 200)->cookie('token', $data['access_token'], 43200);
+        } else {
+
+            return $response;
+        }
     }
 
     /**
@@ -67,6 +74,9 @@ class AuthController extends Controller
      */
     public function register(Request $request)
     {
+        // Check if account registration is enabled
+        if (! config('vuefilemanager.registration') ) abort(401);
+
         // Validate request
         $request->validate([
             'name' => ['required', 'string', 'max:255'],
@@ -81,9 +91,17 @@ class AuthController extends Controller
             'password' => Hash::make($request->password),
         ]);
 
-        $token = Route::dispatch(self::make_request($request));
+        $response = Route::dispatch(self::make_request($request));
 
-        return $token;
+        if ($response->isSuccessful()) {
+
+            $data = json_decode($response->content(), true);
+
+            return response('Register Successfull!', 200)->cookie('token', $data['access_token'], 43200);
+        } else {
+
+            return $response;
+        }
     }
 
     /**

app/Http/Controllers/Auth/ConfirmPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

app/Http/Controllers/Auth/ForgotPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Mail\TestMail;

app/Http/Controllers/Auth/LoginController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

app/Http/Controllers/Auth/RegisterController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

app/Http/Controllers/Auth/VerificationController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;

app/Http/Controllers/FileManagerController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers;
 
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Auth;
@@ -19,16 +19,6 @@ use Response;
 
 class FileManagerController extends Controller
 {
-    /**
-     * Show index page
-     *
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
-     */
-    public function index() {
-
-        return view("index");
-    }
-
     /**
      * Get trashed files
      *
@@ -230,17 +220,20 @@ class FileManagerController extends Controller
         if ($validator->fails()) abort(400, 'Bad input');
 
         // Get user id
-        $user_id = Auth::id();
+        $user = Auth::user();
 
         // Delete folder
         if ($request->type === 'folder') {
 
             $item = FileManagerFolder::withTrashed()
                 ->with('folders')
-                ->where('user_id', $user_id)
+                ->where('user_id', $user->id)
                 ->where('unique_id', $request->unique_id)
                 ->first();
 
+            // Remove folder from user favourites
+            $user->favourites()->detach($request->unique_id);
+
             foreach ($item->files as $file) {
 
                 if ($request->force_delete) {
@@ -273,7 +266,7 @@ class FileManagerController extends Controller
         if ($request->type === 'file' || $request->type === 'image') {
 
             $item = FileManagerFile::withTrashed()
-                ->where('user_id', $user_id)
+                ->where('user_id', $user->id)
                 ->where('unique_id', $request->unique_id)
                 ->first();
 
@@ -302,17 +295,18 @@ class FileManagerController extends Controller
      */
     public function empty_trash()
     {
-        // TODO: validacia
-
         // Get user id
         $user_id = Auth::id();
 
+        // Get files and folders
         $folders = FileManagerFolder::onlyTrashed()->where('user_id', $user_id)->get();
         $files = FileManagerFile::onlyTrashed()->where('user_id', $user_id)->get();
 
+        // Force delete every item
         $folders->each->forceDelete();
         $files->each->forceDelete();
 
+        // Return response
         return response('Done!', 200);
     }
 
@@ -327,6 +321,7 @@ class FileManagerController extends Controller
         $validator = Validator::make($request->all(), [
             'unique_id' => 'required|integer',
             'type'      => 'required|string',
+            'to_home'   => 'boolean',
         ]);
 
         // Return error
@@ -347,6 +342,12 @@ class FileManagerController extends Controller
 
             // Get item
             $item = FileManagerFile::withTrashed()->where('user_id', $user_id)->where('unique_id', $request->unique_id)->first();
+
+            // Restore item to home directory
+            if ($request->has('to_home') && $request->to_home) {
+                $item->folder_id = 0;
+                $item->save();
+            }
         }
 
         // Restore Item
@@ -400,6 +401,10 @@ class FileManagerController extends Controller
      */
     public function upload_item(Request $request)
     {
+        // Check if user can upload
+        if (config('vuefilemanager.limit_storage_by_capacity') && user_storage_percentage() >= 100)
+            abort(423, 'You exceed your storage limit!');
+
         // Validate request
         $validator = Validator::make($request->all(), [
             'parent_id' => 'required|integer',
@@ -447,7 +452,7 @@ class FileManagerController extends Controller
 
         // Store file
         $new_file = FileManagerFile::create([
-            'user_id'  => Auth::id(),
+            'user_id'   => Auth::id(),
             'name'      => pathinfo($file->getClientOriginalName())['filename'],
             'basename'  => $filename,
             'folder_id' => $folder_id,
@@ -514,7 +519,7 @@ class FileManagerController extends Controller
         // Get user id
         $user_id = Auth::id();
 
-        return FileManagerFile::where('user_id', $user_id)->where('unique_id', $unique_id)->first();
+        return FileManagerFile::where('user_id', $user_id)->where('unique_id', $unique_id)->firstOrFail();
     }
 
     /**
@@ -525,8 +530,17 @@ class FileManagerController extends Controller
      */
     public function get_file($filename)
     {
+        // Get user id
+        $user_id = Auth::id();
+
+        // Get file record
+        $file = FileManagerFile::withTrashed()->where('user_id', $user_id)
+            ->where('basename', $filename)
+            ->orWhere('thumbnail', $filename)
+            ->firstOrFail();
+
         // Get file path
-        $path = storage_path() . '/app/file-manager/' . $filename;
+        $path = storage_path() . '/app/file-manager/' . $file->basename;
 
         // Check if file exist
         if (!File::exists($path)) abort(404);
@@ -544,30 +558,6 @@ class FileManagerController extends Controller
         return $response;
     }
 
-    /**
-     * Get file
-     *
-     * @param $filename
-     * @return mixed
-     */
-    public function get_avatar($basename)
-    {
-        // Get file path
-        $path = storage_path() . '/app/avatars/' . $basename;
-
-        // Check if file exist
-        if (!File::exists($path)) abort(404);
-
-        $file = File::get($path);
-        $type = File::mimeType($path);
-
-        // Create response
-        $response = Response::make($file, 200);
-        $response->header("Content-Type", $type);
-
-        return $response;
-    }
-
     /**
      * Get unique id
      *

app/Http/Controllers/PublicCloud/FileManagerController.php

@@ -1,505 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Support\Arr;
-use Intervention\Image\ImageManagerStatic as Image;
-use Illuminate\Support\Facades\Validator;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\File;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use App\FileManagerFolder;
-use App\FileManagerFile;
-use Response;
-
-class FileManagerController extends Controller
-{
-    /**
-     * Get trashed files
-     *
-     * @param Request $request
-     * @return FileManagerFile[]|\Illuminate\Database\Eloquent\Builder[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Database\Query\Builder[]|\Illuminate\Support\Collection
-     */
-    public function trash() {
-
-        // Get folders and files
-        $folders_trashed = FileManagerFolder::onlyTrashed()->with(['trashed_folders'])->get(['parent_id', 'unique_id', 'name']);
-        $folders = FileManagerFolder::onlyTrashed()->whereIn('unique_id', filter_folders_ids($folders_trashed))->get();
-
-        // Get files trashed
-        $files_trashed = FileManagerFile::onlyTrashed()->whereNotIn('folder_id', array_values(array_unique(recursiveFind($folders_trashed->toArray(), 'unique_id'))))->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files_trashed])->collapse();
-    }
-
-    /**
-     * Get directory with files
-     *
-     * @return \Illuminate\Support\Collection
-     */
-    public function folder(Request $request, $unique_id)
-    {
-        // Get folder trash items
-        if ( $request->query('trash') ) {
-
-            // Get folders and files
-            $folders = FileManagerFolder::onlyTrashed()->with('parent')->where('parent_id', $unique_id)->get();
-            $files = FileManagerFile::onlyTrashed()->with('parent')->where('folder_id', $unique_id)->get();
-
-            // Collect folders and files to single array
-            return collect([$folders, $files])->collapse();
-        }
-
-        // Get folders and files
-        $folders = FileManagerFolder::with('parent')->where('parent_id', $unique_id)->get();
-        $files = FileManagerFile::with('parent')->where('folder_id', $unique_id)->get();
-
-        // Collect folders and files to single array
-        return collect([$folders, $files])->collapse();
-    }
-
-    /**
-     * Search files
-     *
-     * @param Request $request
-     * @return \Illuminate\Database\Eloquent\Collection
-     */
-    public function search(Request $request)
-    {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'query' => 'required|string',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        // Search files id db
-        $searched_files = FileManagerFile::search($request->input('query'))->get();
-        $searched_folders = FileManagerFolder::search($request->input('query'))->get();
-
-        // Collect folders and files to single array
-        return collect([$searched_folders, $searched_files])->collapse();
-    }
-
-    /**
-     * Create new folder
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function create_folder(Request $request)
-    {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'parent_id' => 'required|integer',
-            'name'      => 'string',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        // Get parent_id from request
-        $parent_id = $request->parent_id === 0 ? 0 : $request->parent_id;
-
-        // Create folder
-        $folder = FileManagerFolder::create([
-            'parent_id' => $parent_id,
-            'name'      => $request->has('name') ? $request->input('name') : 'New Folder',
-            'type'      => 'folder',
-            'unique_id' => $this->get_unique_id(),
-        ]);
-
-        // Return new folder
-        return $folder;
-    }
-
-    /**
-     * Rename item name
-     *
-     * @param Request $request
-     * @return mixed
-     */
-    public function rename_item(Request $request)
-    {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'unique_id' => 'required|integer',
-            'name'      => 'required|string',
-            'type'      => 'required|string',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        // Update folder name
-        if ($request->type === 'folder') {
-
-            $item = FileManagerFolder::where('unique_id', $request->unique_id)->first();
-
-            $item->name = $request->name;
-            $item->save();
-
-        } else {
-
-            $item = FileManagerFile::where('unique_id', $request->unique_id)->first();
-
-            $item->name = $request->name;
-            $item->save();
-        }
-
-        // Return updated item
-        return $item;
-    }
-
-    /**
-     * Delete item
-     *
-     * @param Request $request
-     * @throws \Exception
-     */
-    public function delete_item(Request $request)
-    {
-
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'unique_id'    => 'required|integer',
-            'type'         => 'required|string',
-            'force_delete' => 'required|boolean',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        // Delete folder
-        if ($request->type === 'folder') {
-
-            $item = FileManagerFolder::withTrashed()->with('folders')->where('unique_id', $request->unique_id)->first();
-
-            foreach ($item->files as $file) {
-
-                if ($request->force_delete) {
-
-                    // Delete file
-                    Storage::disk('local')->delete('/file-manager/' . $file->basename);
-
-                    // Delete thumbnail if exist
-                    if (!is_null($file->thumbnail)) Storage::disk('local')->delete('/file-manager/' . $file->getOriginal('thumbnail'));
-
-                    // Delete file permanently
-                    $file->forceDelete();
-                } else {
-
-                    // Delete file from visibility
-                    $file->delete();
-                }
-            }
-
-            // Delete record
-            if ($request->force_delete) {
-
-                $item->forceDelete();
-            } else {
-
-                $item->delete();
-            }
-        }
-
-        if ($request->type === 'file' || $request->type === 'image') {
-
-            $item = FileManagerFile::withTrashed()->where('unique_id', $request->unique_id)->first();
-
-            if ($request->force_delete) {
-
-                // Delete file
-                Storage::disk('local')->delete('/file-manager/' . $item->basename);
-
-                // Delete thumbnail if exist
-                if (!is_null($item->thumbnail)) Storage::disk('local')->delete('/file-manager/' . $item->thumbnail);
-
-                // Delete file permanently
-                $item->forceDelete();
-            } else {
-
-                // Delete file from visibility
-                $item->delete();
-            }
-        }
-    }
-
-    /**
-     * Empty user trash
-     *
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
-     */
-    public function empty_trash() {
-        // TODO: validacia
-
-        $folders = FileManagerFolder::onlyTrashed()->get();
-        $files = FileManagerFile::onlyTrashed()->get();
-
-        $folders->each->forceDelete();
-        $files->each->forceDelete();
-
-        return response('Done!', 200);
-    }
-
-    /**
-     * Restore item from trash
-     *
-     * @param Request $request
-     */
-    public function restore_item(Request $request) {
-
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'unique_id'    => 'required|integer',
-            'type'         => 'required|string',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        // Get folder
-        if ($request->type === 'folder') {
-
-            // Get folder
-            $item = FileManagerFolder::withTrashed()->where('unique_id', $request->unique_id)->first();
-        }
-
-        // Get file
-        if ($request->type === 'file' || $request->type === 'image') {
-
-            // Get item
-            $item = FileManagerFile::withTrashed()->where('unique_id', $request->unique_id)->first();
-        }
-
-        // Restore Item
-        $item->restore();
-    }
-
-    /**
-     * Delete Item
-     *
-     * @param Request $request
-     */
-    public function delete_items(Request $request)
-    {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'items' => 'required|json',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        foreach ($request->input('items') as $file) {
-
-            if ($file['type'] === 'file' || $file['type'] === 'image') {
-
-                $item = FileManagerFile::where('unique_id', $file['unique_id'])->first();
-
-            } else {
-
-                $item = FileManagerFolder::where('unique_id', $file['unique_id'])->first();
-            }
-
-            // Delete file
-            Storage::disk('local')->delete('/file-manager/' . $item->basename);
-
-            // Delete thumbnail if exist
-            if (!is_null($item->thumbnail)) {
-                Storage::disk('local')->delete('/file-manager/' . $item->thumbnail);
-            }
-
-            // Permanently delete file
-            $item->forceDelete();
-        }
-    }
-
-    /**
-     * Upload items
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function upload_item(Request $request)
-    {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'parent_id' => 'required|integer',
-            'file'      => 'required|file',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        // Get parent_id from request
-        $folder_id = $request->parent_id === 0 ? 0 : $request->parent_id;
-        $file = $request->file('file');
-
-        // File
-        $filename = Str::random() . '-' . str_replace(' ', '', $file->getClientOriginalName());
-        $filetype = 'file';
-        $thumbnail = null;
-        $filesize = $file->getSize();
-        $directory = 'file-manager';
-
-        // create directory if not exist
-        if (!Storage::disk('local')->exists($directory)) {
-            Storage::disk('local')->makeDirectory($directory);
-        }
-
-        // Store to disk
-        Storage::disk('local')->putFileAs($directory, $file, $filename, 'public');
-
-        // Create image thumbnail
-        if (substr($file->getMimeType(), 0, 5) == 'image') {
-
-            $filetype = 'image';
-            $thumbnail = 'thumbnail-' . $filename;
-
-            // Create intervention image
-            $image = Image::make($file->getRealPath());
-
-            $image->resize(256, null, function ($constraint) {
-                $constraint->aspectRatio();
-            })->save(null, 90);
-
-            // Store thumbnail to s3
-            Storage::disk('local')->put($directory . '/' . $thumbnail, $image);
-        }
-
-        // Store file
-        $new_file = FileManagerFile::create([
-            'name'      => pathinfo($file->getClientOriginalName())['filename'],
-            'basename'  => $filename,
-            'folder_id' => $folder_id,
-            'mimetype'  => $file->getClientOriginalExtension(),
-            'filesize'  => $filesize,
-            'type'      => $filetype,
-            'thumbnail' => $thumbnail,
-            'unique_id' => $this->get_unique_id(),
-        ]);
-
-        return $new_file;
-    }
-
-    /**
-     * Move item
-     *
-     * @param Request $request
-     */
-    public function move_item(Request $request)
-    {
-        // Validate request
-        $validator = Validator::make($request->all(), [
-            'from_unique_id' => 'required|integer',
-            'to_unique_id'   => 'required|integer',
-            'from_type'      => 'required|string',
-        ]);
-
-        // Return error
-        if ($validator->fails()) abort(400, 'Bad input');
-
-        if ($request->from_type === 'folder') {
-
-            // Move folder
-            $item = FileManagerFolder::where('unique_id', $request->from_unique_id)->first();
-            $item->parent_id = $request->to_unique_id;
-
-        } else {
-
-            // Move file under new folder
-            $item = FileManagerFile::where('unique_id', $request->from_unique_id)->first();
-            $item->folder_id = $request->to_unique_id;
-        }
-
-        $item->update();
-    }
-
-    /**
-     * Get file record
-     *
-     * @param $unique_id
-     * @return mixed
-     */
-    public function get_file_detail($unique_id)
-    {
-        return FileManagerFile::where('unique_id', $unique_id)->first();
-    }
-
-    /**
-     * Get file
-     *
-     * @param $filename
-     * @return mixed
-     */
-    public function get_file($filename)
-    {
-        // Get file path
-        $path = storage_path() . '/app/file-manager/' . $filename;
-
-        // Check if file exist
-        if (!File::exists($path)) abort(404);
-
-        $file = File::get($path);
-        $type = File::mimeType($path);
-        $size = File::size($path);
-
-        // Create response
-        $response = Response::make($file, 200);
-        $response->header("Content-Type", $type);
-        $response->header("Content-Disposition", 'attachment; filename=' . $filename);
-        $response->header("Content-Length", $size);
-
-        return $response;
-    }
-
-    /**
-     * Get file
-     *
-     * @param $filename
-     * @return mixed
-     */
-    public function get_avatar($basename)
-    {
-        // Get file path
-        $path = storage_path() . '/app/avatars/' . $basename;
-
-        // Check if file exist
-        if (!File::exists($path)) abort(404);
-
-        $file = File::get($path);
-        $type = File::mimeType($path);
-
-        // Create response
-        $response = Response::make($file, 200);
-        $response->header("Content-Type", $type);
-
-        return $response;
-    }
-
-    /**
-     * Get unique id
-     *
-     * @return int
-     */
-    private function get_unique_id(): int
-    {
-        // Get files and folders
-        $folders = FileManagerFolder::withTrashed()->get();
-        $files = FileManagerFile::withTrashed()->get();
-
-        // Get last ids
-        $folders_unique = $folders->isEmpty() ? 0 : $folders->last()->unique_id;
-        $files_unique = $files->isEmpty() ? 0 : $files->last()->unique_id;
-
-        // Count new unique id
-        $unique_id = $folders_unique > $files_unique ? $folders_unique + 1 : $files_unique + 1;
-
-        return $unique_id;
-    }
-}

app/Http/Controllers/UserAccountController.php

@@ -1,17 +1,43 @@
 <?php
 
-namespace App\Http\Controllers\PrivateCLoud;
+namespace App\Http\Controllers;
 
 use App\User;
 use ByteUnits\Metric;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Hash;
 use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Validator;
 
 
 class UserAccountController extends Controller
 {
+    /**
+     * Get all user data to frontend
+     *
+     * @return array|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|object|null
+     */
+    public function user()
+    {
+        $user_id = Auth::id();
+
+        // Get User
+        $user = User::with(['favourites', 'latest_uploads'])->where('id', $user_id)->first();
+
+        return [
+            'user'           => $user->only(['name', 'email', 'avatar']),
+            'favourites'     => $user->favourites->makeHidden(['pivot']),
+            'latest_uploads' => $user->latest_uploads->makeHidden(['user_id', 'basename']),
+
+            'storage'        => [
+                'used'       => Metric::bytes($user->used_capacity)->format(),
+                'capacity'   => format_gigabytes(config('vuefilemanager.user_storage_capacity')),
+                'percentage' => get_storage_fill_percentage($user->used_capacity, config('vuefilemanager.user_storage_capacity')),
+            ],
+        ];
+    }
 
     /**
      * Update user profile
@@ -19,9 +45,20 @@ class UserAccountController extends Controller
      * @param Request $request
      * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
      */
-    public function update_profile(Request $request) {
-        // TODO: validacia
+    public function update_profile(Request $request)
+    {
+        // Validate request
+        $validator = Validator::make($request->all(), [
+            'avatar'  => 'file',
+            '_method' => 'string',
+            'name'    => 'string',
+            'value'   => 'string',
+        ]);
 
+        // Return error
+        if ($validator->fails()) abort(400, 'Bad input');
+
+        // Get user
         $user = Auth::user();
 
         if ($request->hasFile('avatar')) {
@@ -54,36 +91,12 @@ class UserAccountController extends Controller
             'password' => ['required', 'string', 'min:6', 'confirmed'],
         ]);
 
+        // Get user
         $user = Auth::user();
 
+        // Change and store new password
         $user->password = Hash::make($request->input('password'));
         $user->save();
-
-    }
-
-    /**
-     * Get all user data to frontend
-     *
-     * @return array|\Illuminate\Database\Eloquent\Builder|\Illuminate\Database\Eloquent\Model|object|null
-     */
-    public function user(Request $request)
-    {
-        // Get User
-        $user = User::with(['favourites', 'latest_uploads'])
-            ->where('id', Auth::id())
-            ->first();
-
-        // TODO: dat do configu maximalnu kapacitu pre usera
-        return [
-            'user'           => $user->only(['name', 'email', 'avatar']),
-            'favourites'     => $user->favourites->makeHidden(['pivot']),
-            'latest_uploads' => $user->latest_uploads->makeHidden(['user_id', 'basename']),
-            'storage'        => [
-                'used'       => Metric::bytes($user->used_capacity)->format(),
-                'capacity'   => format_gigabytes(10),
-                'percentage' => get_storage_fill_percentage($user->used_capacity, 10),
-            ],
-        ];
     }
 
     /**
@@ -94,7 +107,13 @@ class UserAccountController extends Controller
      */
     public function add_to_favourites(Request $request)
     {
-        // TODO: validation
+        // 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();
@@ -114,7 +133,13 @@ class UserAccountController extends Controller
      */
     public function remove_from_favourites(Request $request)
     {
-        // TODO: validation
+        // 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();