v1.6 released

app/Http/Controllers/Admin/UserController.php

@@ -5,14 +5,23 @@ namespace App\Http\Controllers\Admin;
 use App\FileManagerFile;
 use App\FileManagerFolder;
 use App\Http\Controllers\Controller;
+use App\Http\Requests\Admin\ChangeRoleRequest;
+use App\Http\Requests\Admin\ChangeStorageCapacityRequest;
+use App\Http\Requests\Admin\CreateUserByAdmin;
+use App\Http\Requests\Admin\DeleteUserRequest;
 use App\Http\Resources\UsersCollection;
 use App\Http\Resources\UserResource;
 use App\Http\Resources\UserStorageResource;
+use App\Http\Tools\Demo;
 use App\Share;
 use App\User;
+use App\UserSettings;
+use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Support\Facades\Password;
 use Illuminate\Support\Str;
 use Storage;
 
@@ -53,16 +62,19 @@ class UserController extends Controller
     /**
      * Change user role
      *
-     * @param Request $request
+     * @param ChangeRoleRequest $request
      * @param $id
      * @return UserResource
      */
-    public function change_role(Request $request, $id)
+    public function change_role(ChangeRoleRequest $request, $id)
     {
-        // TODO: validacia
-
         $user = User::findOrFail($id);
 
+        // Demo preview
+        if (env('APP_DEMO') && $id == 1) {
+            return new UserResource($user);
+        }
+
         $user->update($request->input('attributes'));
 
         return new UserResource($user);
@@ -71,14 +83,12 @@ class UserController extends Controller
     /**
      * Change user storage capacity
      *
-     * @param Request $request
+     * @param ChangeStorageCapacityRequest $request
      * @param $id
      * @return UserStorageResource
      */
-    public function change_storage_capacity(Request $request, $id)
+    public function change_storage_capacity(ChangeStorageCapacityRequest $request, $id)
     {
-        // TODO: validacia
-
         $user = User::findOrFail($id);
 
         $user->settings()->update($request->input('attributes'));
@@ -90,40 +100,91 @@ class UserController extends Controller
      * Send user password reset link
      *
      * @param $id
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     * @return ResponseFactory|\Illuminate\Http\Response
      */
     public function send_password_reset_email($id)
     {
         $user = User::findOrFail($id);
 
-        $user->sendPasswordResetNotification(Str::random(60));
+        // Demo preview
+        if (env('APP_DEMO')) {
+            return response('Done!', 204);
+        }
+
+        // Get password token
+        $token = Password::getRepository()->create($user);
+
+        // Send user email
+        $user->sendPasswordResetNotification($token);
 
         return response('Done!', 204);
     }
 
+    /**
+     * Create new user by admin
+     *
+     * @param CreateUserByAdmin $request
+     * @return UserResource
+     */
+    public function create_user(CreateUserByAdmin $request)
+    {
+        // Store avatar
+        if ($request->hasFile('avatar')) {
+
+            // Update avatar
+            $avatar = store_avatar($request->file('avatar'), 'avatars');
+        }
+
+        // Create user
+        $user = User::create([
+            'avatar'   => $request->hasFile('avatar') ? $avatar : null,
+            'name'     => $request->name,
+            'role'     => $request->role,
+            'email'    => $request->email,
+            'password' => Hash::make($request->password),
+        ]);
+
+        // Create settings
+        $settings = UserSettings::create([
+            'user_id'          => $user->id,
+            'storage_capacity' => $request->storage_capacity,
+        ]);
+
+        return new UserResource($user);
+    }
+
     /**
      * Delete user with all user data
      *
-     * @param Request $request
+     * @param DeleteUserRequest $request
      * @param $id
-     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     * @return ResponseFactory|\Illuminate\Http\Response
      * @throws \Exception
      */
-    public function delete_user(Request $request, $id)
+    public function delete_user(DeleteUserRequest $request, $id)
     {
         $user = User::findOrFail($id);
 
+        // Demo preview
+        if (env('APP_DEMO')) {
+            return response('Done!', 204);
+        }
+
         // 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);
+        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();
+        $files = FileManagerFile::withTrashed()
+            ->where('user_id', $user->id)
+            ->get();
+        $folders = FileManagerFolder::withTrashed()
+            ->where('user_id', $user->id)
+            ->get();
 
         // Remove all files and thumbnails
         $files->each(function ($file) {

app/Http/Controllers/User/AccountController.php

@@ -42,8 +42,8 @@ class AccountController extends Controller
             'tree'       => $tree,
             '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')),
+                'capacity'   => format_gigabytes($user->settings->storage_capacity),
+                'percentage' => get_storage_fill_percentage($user->used_capacity, $user->settings->storage_capacity),
             ],
         ];
     }

app/Http/Requests/Admin/ChangeRoleRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ChangeRoleRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'attributes'      => 'required|array',
+            'attributes.role' => 'required|string'
+        ];
+    }
+}

app/Http/Requests/Admin/ChangeStorageCapacityRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class ChangeStorageCapacityRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'attributes'                  => 'required|array',
+            'attributes.storage_capacity' => 'required|digits_between:1,9'
+        ];
+    }
+}

app/Http/Requests/Admin/CreateUserByAdmin.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CreateUserByAdmin extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'email'            => 'required|string|email|max:255|unique:users',
+            'password'         => 'required|string|min:6|confirmed',
+            'name'             => 'required|string|max:255',
+            'storage_capacity' => 'required|digits_between:1,9',
+            'role'             => 'required|string',
+            'avatar'           => 'sometimes|file',
+        ];
+    }
+}

app/Http/Requests/Admin/DeleteUserRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\Admin;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class DeleteUserRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'name' => 'required|string|max:255',
+        ];
+    }
+}

app/Http/Resources/UserResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use Faker\Factory;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class UserResource extends JsonResource
@@ -14,18 +15,22 @@ class UserResource extends JsonResource
      */
     public function toArray($request)
     {
+        // Faker only for demo purpose
+        $faker = Factory::create();
+
         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,
+                    'name'                 => env('APP_DEMO') ? $faker->name : $this->name,
+                    'email'                => env('APP_DEMO') ? $faker->email : $this->email,
+                    'avatar'               => $this->avatar,
+                    'role'                 => $this->role,
+                    'storage'              => $this->storage,
+                    'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),
+                    'created_at'           => $this->created_at,
+                    'updated_at'           => $this->updated_at,
                 ]
             ]
         ];

app/Http/helpers.php

@@ -221,7 +221,7 @@ function user_storage_percentage()
 {
     $user = Auth::user();
 
-    return get_storage_fill_percentage($user->used_capacity, config('vuefilemanager.user_storage_capacity'));
+    return get_storage_fill_percentage($user->used_capacity, $user->settings->storage_capacity);
 }
 
 /**