Updated laravel to 5.2 and started ldap implementation

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 0266d26716ee9a73b976cff3cb5b57a248454c65..9184b245ef29c0324de3f397c735b4ca346d4042 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,42 +1,46 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
-use Illuminate\Support\Facades\Hash;
-use Oxbow\Http\Requests;
-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;
+    protected $userRepo;
 
     /**
      * 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->userRepo = $userRepo;
         parent::__construct();
     }
 
     /**
      * Display a listing of the users.
-     *
      * @return Response
      */
     public function index()
     {
         $users = $this->user->all();
+        $this->setPageTitle('Users');
         return view('users/index', ['users' => $users]);
     }
 
     /**
      * Show the form for creating a new user.
-     *
      * @return Response
      */
     public function create()
@@ -47,7 +51,6 @@ class UserController extends Controller
 
     /**
      * Store a newly created user in storage.
-     *
      * @param  Request $request
      * @return Response
      */
@@ -56,58 +59,72 @@ class UserController extends Controller
         $this->checkPermission('user-create');
         $this->validate($request, [
             'name'             => 'required',
-            'email'            => 'required|email',
+            'email'            => 'required|email|unique:users,email',
             'password'         => 'required|min:5',
             'password-confirm' => 'required|same:password',
             'role'             => 'required|exists:roles,id'
         ]);
 
         $user = $this->user->fill($request->all());
-        $user->password = Hash::make($request->get('password'));
+        $user->password = bcrypt($request->get('password'));
         $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.
-     *
-     * @param  int $id
+     * @param  int              $id
+     * @param SocialAuthService $socialAuthService
      * @return Response
      */
-    public function edit($id)
+    public function edit($id, SocialAuthService $socialAuthService)
     {
         $this->checkPermissionOr('user-update', function () use ($id) {
             return $this->currentUser->id == $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]);
     }
 
     /**
      * Update the specified user in storage.
-     *
      * @param  Request $request
      * @param  int     $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, [
             'name'             => 'required',
-            'email'            => 'required|email',
-            'password'         => 'min:5',
-            'password-confirm' => 'same:password',
+            'email'            => 'required|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->fill($request->except('password'));
 
         if ($this->currentUser->can('user-update') && $request->has('role')) {
             $user->attachRoleId($request->get('role'));
@@ -115,8 +132,9 @@ class UserController extends Controller
 
         if ($request->has('password') && $request->get('password') != '') {
             $password = $request->get('password');
-            $user->password = Hash::make($password);
+            $user->password = bcrypt($password);
         }
+
         $user->save();
         return redirect('/users');
     }
@@ -131,23 +149,31 @@ class UserController extends Controller
         $this->checkPermissionOr('user-delete', function () use ($id) {
             return $this->currentUser->id == $id;
         });
+
         $user = $this->user->findOrFail($id);
+        $this->setPageTitle('Delete User ' . $user->name);
         return view('users/delete', ['user' => $user]);
     }
 
     /**
      * Remove the specified user from storage.
-     *
      * @param  int $id
      * @return Response
      */
     public function destroy($id)
     {
+        $this->preventAccessForDemoUsers();
         $this->checkPermissionOr('user-delete', function () use ($id) {
             return $this->currentUser->id == $id;
         });
-        $user = $this->user->findOrFail($id);
-        $user->delete();
+
+        $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');
     }
 }