Fixes #45

[bookstack] / app / Http / Controllers / UserController.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 07d2cac9d2f1ce315e0d9d6fa6b605d20840ff5c..bf25eafb2d8ad544a4a408f32e4ceec6b75f27a8 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,107 +1,163 @@
 <?php
 
 <?php
 

-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;

 
 use Illuminate\Http\Request;
 
 
 use Illuminate\Http\Request;
 

-use Illuminate\Support\Facades\Hash;
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
-use Oxbow\User;
+use Illuminate\Http\Response;
+use BookStack\Http\Requests;
+use BookStack\Repos\UserRepo;
+use BookStack\Services\SocialAuthService;
+use BookStack\User;

 
 class UserController extends Controller
 {
 
     protected $user;
 
 class UserController extends Controller
 {
 
     protected $user;

+    protected $userRepo;

 
     /**
      * UserController constructor.
 
     /**
      * UserController constructor.

-     * @param $user
+     * @param User     $user
+     * @param UserRepo $userRepo

      */
      */

-    public function __construct(User $user)
+    public function __construct(User $user, UserRepo $userRepo)

     {
         $this->user = $user;
     {
         $this->user = $user;

+        $this->userRepo = $userRepo;
+        parent::__construct();

     }
 
     }
 

-

     /**
      * Display a listing of the users.
     /**
      * Display a listing of the users.

-     *

      * @return Response
      */
     public function index()
     {
         $users = $this->user->all();
      * @return Response
      */
     public function index()
     {
         $users = $this->user->all();

-        return view('users/index', ['users'=> $users]);
+        $this->setPageTitle('Users');
+        return view('users/index', ['users' => $users]);

     }
 
     /**
      * Show the form for creating a new user.
     }
 
     /**
      * Show the form for creating a new user.

-     *

      * @return Response
      */
     public function create()
     {
      * @return Response
      */
     public function create()
     {

-        return view('users/create');
+        $this->checkPermission('user-create');
+        $authMethod = config('auth.method');
+        return view('users/create', ['authMethod' => $authMethod]);

     }
 
     /**
      * Store a newly created user in storage.
     }
 
     /**
      * Store a newly created user in storage.

-     *
-     * @param  Request  $request
+     * @param  Request $request

      * @return Response
      */
     public function store(Request $request)
     {
      * @return Response
      */
     public function store(Request $request)
     {

-        $this->validate($request, [
-            'name' => 'required',
-            'email' => 'required|email',
-            'password' => 'required|min:5',
-            'password-confirm' => 'required|same:password'
-        ]);
+        $this->checkPermission('user-create');
+        $validationRules = [
+            'name'             => 'required',
+            'email'            => 'required|email|unique:users,email',
+            'role'             => 'required|exists:roles,id'
+        ];
+
+        $authMethod = config('auth.method');
+        if ($authMethod === 'standard') {
+            $validationRules['password'] = 'required|min:5';
+            $validationRules['password-confirm'] = 'required|same:password';
+        } elseif ($authMethod === 'ldap') {
+            $validationRules['external_auth_id'] = 'required';
+        }
+        $this->validate($request, $validationRules);
+

 
         $user = $this->user->fill($request->all());
 
         $user = $this->user->fill($request->all());

-        $user->password = Hash::make($request->get('password'));
+
+        if ($authMethod === 'standard') {
+            $user->password = bcrypt($request->get('password'));
+        } elseif ($authMethod === 'ldap') {
+            $user->external_auth_id = $request->get('external_auth_id');
+        }
+

         $user->save();
         $user->save();

+        $user->attachRoleId($request->get('role'));
+
+        // Get avatar from gravatar and save
+        if (!config('services.disable_services')) {
+            $avatar = \Images::saveUserGravatar($user);
+            $user->avatar()->associate($avatar);
+            $user->save();
+        }
+

         return redirect('/users');
     }
 
 
     /**
      * Show the form for editing the specified user.
         return redirect('/users');
     }
 
 
     /**
      * Show the form for editing the specified user.

-     *
-     * @param  int  $id
+     * @param  int              $id
+     * @param SocialAuthService $socialAuthService

      * @return Response
      */
      * @return Response
      */

-    public function edit($id)
+    public function edit($id, SocialAuthService $socialAuthService)

     {
     {

+        $this->checkPermissionOr('user-update', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
+
+        $authMethod = config('auth.method');
+

         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);

-        return view('users/edit', ['user' => $user]);
+        $activeSocialDrivers = $socialAuthService->getActiveDrivers();
+        $this->setPageTitle('User Profile');
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod]);

     }
 
     /**
      * Update the specified user in storage.
     }
 
     /**
      * Update the specified user in storage.

-     *
-     * @param  Request  $request
-     * @param  int  $id
+     * @param  Request $request
+     * @param  int     $id

      * @return Response
      */
     public function update(Request $request, $id)
     {
      * @return Response
      */
     public function update(Request $request, $id)
     {

+        $this->preventAccessForDemoUsers();
+        $this->checkPermissionOr('user-update', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
+

         $this->validate($request, [
         $this->validate($request, [

-            'name' => 'required',
-            'email' => 'required|email',
-            'password' => 'min:5',
-            'password-confirm' => 'same:password'
+            'name'             => 'min:2',
+            'email'            => 'min:2|email|unique:users,email,' . $id,
+            'password'         => 'min:5|required_with:password_confirm',
+            'password-confirm' => 'same:password|required_with:password',
+            'role'             => 'exists:roles,id'
+        ], [
+            'password-confirm.required_with' => 'Password confirmation required'

         ]);
 
         $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 
         ]);
 
         $user = $this->user->findOrFail($id);
         $user->fill($request->all());
 

-        if($request->has('password') && $request->get('password') != '') {
+        // Role updates
+        if ($this->currentUser->can('user-update') && $request->has('role')) {
+            $user->attachRoleId($request->get('role'));
+        }
+
+        // Password updates
+        if ($request->has('password') && $request->get('password') != '') {

             $password = $request->get('password');
             $password = $request->get('password');

-            $user->password = Hash::make($password);
+            $user->password = bcrypt($password);
+        }
+
+        // External auth id updates
+        if ($this->currentUser->can('user-update') && $request->has('external_auth_id')) {
+            $user->external_auth_id = $request->get('external_auth_id');

         }
         }

+

         $user->save();
         return redirect('/users');
     }
         $user->save();
         return redirect('/users');
     }


@@ -113,20 +169,34 @@ class UserController extends Controller
      */
     public function delete($id)
     {
      */
     public function delete($id)
     {

+        $this->checkPermissionOr('user-delete', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
+

         $user = $this->user->findOrFail($id);
         $user = $this->user->findOrFail($id);

+        $this->setPageTitle('Delete User ' . $user->name);

         return view('users/delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.
         return view('users/delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.

-     *
-     * @param  int  $id
+     * @param  int $id

      * @return Response
      */
     public function destroy($id)
     {
      * @return Response
      */
     public function destroy($id)
     {

-        $user = $this->user->findOrFail($id);
-        $user->delete();
+        $this->preventAccessForDemoUsers();
+        $this->checkPermissionOr('user-delete', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
+
+        $user = $this->userRepo->getById($id);
+        if ($this->userRepo->isOnlyAdmin($user)) {
+            session()->flash('error', 'You cannot delete the only admin');
+            return redirect($user->getEditUrl());
+        }
+        $this->userRepo->destroy($user);
+

         return redirect('/users');
     }
 }
         return redirect('/users');
     }
 }