Added custom meta titles to many pages. Closes #30.

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 07d2cac9d2f1ce315e0d9d6fa6b605d20840ff5c..ed9deab2da824aecfe8228da5b29822cd8b47622 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,29 +1,32 @@
 <?php
 
-namespace Oxbow\Http\Controllers;
+namespace BookStack\Http\Controllers;
 
 use Illuminate\Http\Request;
 
 use Illuminate\Support\Facades\Hash;
-use Oxbow\Http\Requests;
-use Oxbow\Http\Controllers\Controller;
-use Oxbow\User;
+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
      */
-    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.
      *
@@ -32,7 +35,8 @@ class UserController extends Controller
     public function index()
     {
         $users = $this->user->all();
-        return view('users/index', ['users'=> $users]);
+        $this->setPageTitle('Users');
+        return view('users/index', ['users' => $users]);
     }
 
     /**
@@ -42,27 +46,32 @@ class UserController extends Controller
      */
     public function create()
     {
+        $this->checkPermission('user-create');
         return view('users/create');
     }
 
     /**
      * Store a newly created user in storage.
      *
-     * @param  Request  $request
+     * @param  Request $request
      * @return Response
      */
     public function store(Request $request)
     {
+        $this->checkPermission('user-create');
         $this->validate($request, [
-            'name' => 'required',
-            'email' => 'required|email',
-            'password' => 'required|min:5',
-            'password-confirm' => 'required|same:password'
+            'name'             => 'required',
+            'email'            => 'required|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'));
         return redirect('/users');
     }
 
@@ -70,37 +79,52 @@ class UserController extends Controller
     /**
      * 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
+     * @param  Request $request
+     * @param  int     $id
      * @return Response
      */
     public function update(Request $request, $id)
     {
+        $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'
+            'name'             => 'required',
+            'email'            => 'required|email|unique:users,email,' . $id,
+            'password'         => 'min:5',
+            'password-confirm' => 'same:password',
+            'role'             => 'exists:roles,id'
         ]);
 
         $user = $this->user->findOrFail($id);
-        $user->fill($request->all());
+        $user->fill($request->except('password'));
 
-        if($request->has('password') && $request->get('password') != '') {
+        if ($this->currentUser->can('user-update') && $request->has('role')) {
+            $user->attachRoleId($request->get('role'));
+        }
+
+        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');
@@ -113,19 +137,32 @@ class UserController extends Controller
      */
     public function delete($id)
     {
+        $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
+     * @param  int $id
      * @return Response
      */
     public function destroy($id)
     {
-        $user = $this->user->findOrFail($id);
+        $this->checkPermissionOr('user-delete', function () use ($id) {
+            return $this->currentUser->id == $id;
+        });
+        $user = $this->userRepo->getById($id);
+        // Delete social accounts
+        if($this->userRepo->isOnlyAdmin($user)) {
+            session()->flash('error', 'You cannot delete the only admin');
+            return redirect($user->getEditUrl());
+        }
+        $user->socialAccounts()->delete();
         $user->delete();
         return redirect('/users');
     }