user management v1.6-alpha.1

app/Console/Commands/SetupDevEnvironment.php

@@ -109,9 +109,9 @@ class SetupDevEnvironment extends Command
         $user = User::create([
             'name'     => 'Jane Doe',
             'email'    => 'howdy@hi5ve.digital',
-            'password' => \Hash::make('secret'),
+            'password' => \Hash::make('vuefilemanager'),
         ]);
 
-        $this->info('Test user created. Email: ' . $user->email . ' Password: secret');
+        $this->info('Test user created. Email: ' . $user->email . ' Password: vuefilemanager');
     }
 }

app/Console/Commands/UpgradeApp.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\User;
+use App\UserSettings;
+use Illuminate\Console\Command;
+
+class UpgradeApp extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'upgrade:app {version}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Upgrade application to new version';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $this->info('Upgrading your application to version ' . $this->argument('version'));
+
+        // Version 1.6
+        if ($this->argument('version') === 'v1.6') {
+            $this->version_1_6();
+        }
+
+        $this->info('Your application was upgraded! 🥳🥳🥳');
+    }
+
+    /**
+     * Upgrade script to version 1.6
+     */
+    public function version_1_6() {
+
+        // Migrate new tables and changes
+        $this->call('migrate');
+
+        // Create user settings records
+        $this->info('Updating users options...');
+
+        User::all()->each(function ($user) {
+            $this->info('Update user with id: ' . $user->id);
+            UserSettings::create(['user_id' => $user->id]);
+        });
+
+        $this->info('Updating user options is done!');
+
+        // Set up admin
+        $email = $this->ask('Which user would you like set up as admin? Please type user email');
+
+        $admin = User::where('email', $email)->first();
+
+        if (! $admin) {
+            $email = $this->ask('We can\'t find user with this email, please try it again');
+            $admin = User::where('email', $email)->first();
+        }
+
+        // Save new role for selected user
+        $admin->role = 'admin';
+        $admin->save();
+
+        $this->info('Admin was set up successfully');
+    }
+}

app/Console/Kernel.php

@@ -5,6 +5,7 @@ namespace App\Console;
 use App\Console\Commands\Deploy;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProductionEnvironment;
+use App\Console\Commands\UpgradeApp;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 
@@ -18,6 +19,7 @@ class Kernel extends ConsoleKernel
     protected $commands = [
         SetupProductionEnvironment::class,
         SetupDevEnvironment::class,
+        UpgradeApp::class,
         Deploy::class,
     ];
 

app/Http/Controllers/Admin/UserController.php

@@ -0,0 +1,161 @@
+<?php
+
+namespace App\Http\Controllers\Admin;
+
+use App\FileManagerFile;
+use App\FileManagerFolder;
+use App\Http\Controllers\Controller;
+use App\Http\Resources\UsersCollection;
+use App\Http\Resources\UserResource;
+use App\Http\Resources\UserStorageResource;
+use App\Share;
+use App\User;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Str;
+use Storage;
+
+class UserController extends Controller
+{
+    /**
+     * Get user details
+     *
+     * @param $id
+     * @return UserResource
+     */
+    public function details($id)
+    {
+        return new UserResource(User::findOrFail($id));
+    }
+
+    /**
+     * Get user storage details
+     *
+     * @param $id
+     * @return UserStorageResource
+     */
+    public function storage($id)
+    {
+        return new UserStorageResource(User::findOrFail($id));
+    }
+
+    /**
+     * Get all users
+     *
+     * @return UsersCollection
+     */
+    public function users()
+    {
+        return new UsersCollection(User::all());
+    }
+
+    /**
+     * Change user role
+     *
+     * @param Request $request
+     * @param $id
+     * @return UserResource
+     */
+    public function change_role(Request $request, $id)
+    {
+        // TODO: validacia
+
+        $user = User::findOrFail($id);
+
+        $user->update($request->input('attributes'));
+
+        return new UserResource($user);
+    }
+
+    /**
+     * Change user storage capacity
+     *
+     * @param Request $request
+     * @param $id
+     * @return UserStorageResource
+     */
+    public function change_storage_capacity(Request $request, $id)
+    {
+        // TODO: validacia
+
+        $user = User::findOrFail($id);
+
+        $user->settings()->update($request->input('attributes'));
+
+        return new UserStorageResource($user);
+    }
+
+    /**
+     * Send user password reset link
+     *
+     * @param $id
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function send_password_reset_email($id)
+    {
+        $user = User::findOrFail($id);
+
+        $user->sendPasswordResetNotification(Str::random(60));
+
+        return response('Done!', 204);
+    }
+
+    /**
+     * Delete user with all user data
+     *
+     * @param Request $request
+     * @param $id
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     * @throws \Exception
+     */
+    public function delete_user(Request $request, $id)
+    {
+        $user = User::findOrFail($id);
+
+        // Check for self deleted account
+        if ($user->id === Auth::id()) {
+            abort(406, 'You can\'t delete your account');
+        }
+
+        // Validate user name
+        if ( $user->name !== $request->name) abort(403);
+
+        $files = FileManagerFile::where('user_id', $user->id)->get();
+        $shares = Share::where('user_id', $user->id)->get();
+        $folders = FileManagerFolder::where('user_id', $user->id)->get();
+
+        // Remove all files and thumbnails
+        $files->each(function ($file) {
+
+            // Delete file
+            Storage::delete('/file-manager/' . $file->basename);
+
+            // Delete thumbnail if exist
+            if (!is_null($file->thumbnail)) {
+                Storage::delete('/file-manager/' . $file->getOriginal('thumbnail'));
+            }
+
+            // Delete file permanently
+            $file->forceDelete();
+        });
+
+        // Remove avatar
+        if ($user->avatar) {
+            Storage::delete('/avatars/' . $user->avatar);
+        }
+
+        // Remove folders & shares
+        $folders->each->forceDelete();
+        $shares->each->forceDelete();
+
+        // Remove favourites
+        $user->settings->delete();
+        $user->favourites()->sync([]);
+
+        // Delete user
+        $user->delete();
+
+        return response('Done!', 204);
+    }
+}

app/Http/Controllers/Auth/AuthController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Auth;
 
 use App\Http\Requests\Auth\CheckAccountRequest;
 use App\User;
+use App\UserSettings;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
@@ -73,12 +74,17 @@ class AuthController extends Controller
         ]);
 
         // Create user
-        User::create([
+        $user = User::create([
             'name'     => $request->name,
             'email'    => $request->email,
             'password' => Hash::make($request->password),
         ]);
 
+        // Create settings
+        $settings = UserSettings::create([
+            'user_id' => $user->id
+        ]);
+
         $response = Route::dispatch(self::make_request($request));
 
         if ($response->isSuccessful()) {

app/Http/Controllers/User/AccountController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\User;
 use App\FileManagerFile;
 use App\FileManagerFolder;
 use App\Http\Resources\StorageDetailResource;
+use App\Http\Resources\UserStorageResource;
 use App\Http\Tools\Demo;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Support\Facades\Validator;
@@ -36,7 +37,7 @@ class AccountController extends Controller
             ->get();
 
         return [
-            'user'       => $user->only(['name', 'email', 'avatar']),
+            'user'       => $user->only(['name', 'email', 'avatar', 'role']),
             'favourites' => $user->favourites->makeHidden(['pivot']),
             'tree'       => $tree,
             'storage'    => [
@@ -50,84 +51,11 @@ class AccountController extends Controller
     /**
      * Get storage details
      *
-     * @return array
+     * @return UserStorageResource
      */
     public function storage()
     {
-        $document_mimetypes = [
-            'pdf', 'numbers', 'xlsx', 'xls', 'txt', 'md', 'rtf', 'pptx', 'ppt', 'odt', 'ods', 'odp', 'epub', 'docx', 'doc', 'csv', 'pages'
-        ];
-
-        $user = Auth::user();
-        $storage_capacity = config('vuefilemanager.user_storage_capacity');
-
-        $images = FileManagerFile::where('user_id', $user->id)
-            ->where('type', 'image')->get()->map(function ($item) {
-                return (int)$item->getOriginal('filesize');
-            })->sum();
-
-        $audios = FileManagerFile::where('user_id', $user->id)
-            ->where('type', 'audio')->get()->map(function ($item) {
-                return (int)$item->getOriginal('filesize');
-            })->sum();
-
-        $videos = FileManagerFile::where('user_id', $user->id)
-            ->where('type', 'video')->get()->map(function ($item) {
-                return (int)$item->getOriginal('filesize');
-            })->sum();
-
-        $documents = FileManagerFile::where('user_id', $user->id)
-            ->whereIn('mimetype', $document_mimetypes)->get()->map(function ($item) {
-                return (int)$item->getOriginal('filesize');
-            })->sum();
-
-        $others = FileManagerFile::where('user_id', $user->id)
-            ->whereNotIn('mimetype', $document_mimetypes)
-            ->whereNotIn('type', ['audio', 'video', 'image'])
-            ->get()->map(function ($item) {
-                return (int)$item->getOriginal('filesize');
-            })->sum();
-
-        $usage = collect([
-            'images'    => [
-                'used'       => $images,
-                'percentage' => get_storage_fill_percentage($images, $storage_capacity),
-            ],
-            'audios'    => [
-                'used'       => $audios,
-                'percentage' => get_storage_fill_percentage($audios, $storage_capacity),
-            ],
-            'videos'    => [
-                'used'       => $videos,
-                'percentage' => get_storage_fill_percentage($videos, $storage_capacity),
-            ],
-            'documents' => [
-                'used'       => $documents,
-                'percentage' => get_storage_fill_percentage($documents, $storage_capacity),
-            ],
-            'others'    => [
-                'used'       => $others,
-                'percentage' => get_storage_fill_percentage($others, $storage_capacity),
-            ],
-        ]);
-
-        return [
-            'data' => [
-                'id'            => '1',
-                'type'          => 'disk',
-                'attributes'    => [
-                    'used'       => Metric::bytes($user->used_capacity)->format(),
-                    'capacity'   => format_gigabytes($storage_capacity),
-                    'percentage' => get_storage_fill_percentage($user->used_capacity, $storage_capacity),
-                ],
-                'relationships' => $usage->map(function ($item) {
-                    return [
-                        'used'       => Metric::bytes($item['used'])->format(),
-                        'percentage' => $item['percentage']
-                    ];
-                })
-            ]
-        ];
+        return new UserStorageResource(Auth::user());
     }
 
     /**
@@ -151,10 +79,15 @@ class AccountController extends Controller
         // Get user
         $user = Auth::user();
 
+        // Check if is demo
         if (is_demo($user->id)) {
             return Demo::response_204();
         }
 
+        // Check role
+        if ($request->has('role')) abort(403);
+
+        // Update data
         if ($request->hasFile('avatar')) {
 
             // Update avatar

app/Http/Kernel.php

@@ -2,6 +2,7 @@
 
 namespace App\Http;
 
+use App\Http\Middleware\AdminCheck;
 use App\Http\Middleware\CookieAuth;
 use App\Http\Middleware\LastCheck;
 use App\Http\Middleware\SharedAuth;
@@ -58,6 +59,7 @@ class Kernel extends HttpKernel
     protected $routeMiddleware = [
         'auth.master'      => CookieAuth::class,
         'auth.shared'      => SharedAuth::class,
+        'auth.admin'       => AdminCheck::class,
         'auth'             => \App\Http\Middleware\Authenticate::class,
         'auth.basic'       => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
         'bindings'         => \Illuminate\Routing\Middleware\SubstituteBindings::class,

app/Http/Middleware/AdminCheck.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Support\Facades\Gate;
+
+class AdminCheck
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // Check if user have access to administration settings
+        if ( ! Gate::allows('admin-settings')) {
+            abort(403, 'You don\'t have access for this operation!');
+        }
+
+        return $next($request);
+    }
+}

app/Http/Resources/UserResource.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'data' => [
+                'id'         => (string)$this->id,
+                'type'       => 'user',
+                'attributes' => [
+                    'name'       => $this->name,
+                    'email'      => $this->email,
+                    'avatar'     => $this->avatar,
+                    'role'       => $this->role,
+                    'storage'    => $this->storage,
+                    'created_at' => $this->created_at,
+                    'updated_at' => $this->updated_at,
+                ]
+            ]
+        ];
+    }
+}

app/Http/Resources/UserStorageResource.php

@@ -0,0 +1,89 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\FileManagerFile;
+use ByteUnits\Metric;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserStorageResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $document_mimetypes = [
+            'pdf', 'numbers', 'xlsx', 'xls', 'txt', 'md', 'rtf', 'pptx', 'ppt', 'odt', 'ods', 'odp', 'epub', 'docx', 'doc', 'csv', 'pages'
+        ];
+
+        // Get all images
+        $images = FileManagerFile::where('user_id', $this->id)
+            ->where('type', 'image')->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        // Get all audios
+        $audios = FileManagerFile::where('user_id', $this->id)
+            ->where('type', 'audio')->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        // Get all videos
+        $videos = FileManagerFile::where('user_id', $this->id)
+            ->where('type', 'video')->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        // Get all documents
+        $documents = FileManagerFile::where('user_id', $this->id)
+            ->whereIn('mimetype', $document_mimetypes)->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        // Get all other files
+        $others = FileManagerFile::where('user_id', $this->id)
+            ->whereNotIn('mimetype', $document_mimetypes)
+            ->whereNotIn('type', ['audio', 'video', 'image'])
+            ->get()->map(function ($item) {
+                return (int)$item->getOriginal('filesize');
+            })->sum();
+
+        return [
+            'data' => [
+                'id'            => (string)$this->id,
+                'type'          => 'user-storage',
+                'attributes'    => [
+                    'used'       => Metric::bytes($this->used_capacity)->format(),
+                    'capacity'   => format_gigabytes($this->settings->storage_capacity),
+                    'percentage' => (float)get_storage_fill_percentage($this->used_capacity, $this->settings->storage_capacity),
+                ],
+                'meta' => [
+                    'images'    => [
+                        'used'       => Metric::bytes($images)->format(),
+                        'percentage' => (float)get_storage_fill_percentage($images, $this->settings->storage_capacity),
+                    ],
+                    'audios'    => [
+                        'used'       => Metric::bytes($audios)->format(),
+                        'percentage' => (float)get_storage_fill_percentage($audios, $this->settings->storage_capacity),
+                    ],
+                    'videos'    => [
+                        'used'       => Metric::bytes($videos)->format(),
+                        'percentage' => (float)get_storage_fill_percentage($videos, $this->settings->storage_capacity),
+                    ],
+                    'documents' => [
+                        'used'       => Metric::bytes($documents)->format(),
+                        'percentage' => (float)get_storage_fill_percentage($documents, $this->settings->storage_capacity),
+                    ],
+                    'others'    => [
+                        'used'       => Metric::bytes($others)->format(),
+                        'percentage' => (float)get_storage_fill_percentage($others, $this->settings->storage_capacity),
+                    ],
+                ]
+            ]
+        ];
+    }
+}

app/Http/Resources/UsersCollection.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class UsersCollection extends ResourceCollection
+{
+    public $collects = UserResource::class;
+
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'data' => $this->collection,
+        ];
+    }
+}

app/Http/helpers.php

@@ -188,9 +188,9 @@ function make_single_input($request)
  * @param $gigabytes
  * @return string
  */
-function format_gigabytes($megabytes)
+function format_gigabytes($gigabytes)
 {
-    return Metric::megabytes($megabytes)->format();
+    return Metric::gigabytes($gigabytes)->format();
 }
 
 /**
@@ -203,7 +203,7 @@ function format_gigabytes($megabytes)
 function get_storage_fill_percentage($used, $capacity)
 {
     // Format gigabytes to bytes
-    $total = intval(Metric::megabytes($capacity)->numberOfBytes());
+    $total = intval(Metric::gigabytes($capacity)->numberOfBytes());
 
     // Count progress
     $progress = ($used * 100) / $total;

app/Providers/AuthServiceProvider.php

@@ -26,6 +26,11 @@ class AuthServiceProvider extends ServiceProvider
     {
         $this->registerPolicies();
 
+        // Define admin settings gate
+        Gate::define('admin-settings', function ($user) {
+            return $user->role === 'admin';
+        });
+
         Passport::routes();
 
         Passport::tokensCan([

app/User.php

@@ -63,7 +63,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password', 'avatar',
+        'name', 'email', 'password', 'avatar', 'role',
     ];
 
     /**
@@ -86,9 +86,23 @@ class User extends Authenticatable
     ];
 
     protected $appends = [
-        'used_capacity'
+        'used_capacity', 'storage'
     ];
 
+    /**
+     * Get user used storage details
+     *
+     * @return mixed
+     */
+    public function getStorageAttribute() {
+
+        return [
+            'used' => (float) get_storage_fill_percentage($this->used_capacity, $this->settings->storage_capacity),
+            'capacity' => $this->settings->storage_capacity,
+            'capacity_formatted' => Metric::gigabytes($this->settings->storage_capacity)->format(),
+        ];
+    }
+
     /**
      * Get user used storage capacity in bytes
      *
@@ -167,4 +181,14 @@ class User extends Authenticatable
 
         return $this->hasMany(FileManagerFile::class)->withTrashed();
     }
+
+    /**
+     * Get user attributes
+     *
+     * @return \Illuminate\Database\Eloquent\Relations\HasOne
+     */
+    public function settings() {
+
+        return $this->hasOne(UserSettings::class);
+    }
 }

app/UserSettings.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class UserSettings extends Model
+{
+    public $timestamps = false;
+
+    protected $guarded = ['id'];
+}