Rolled tri-layout to page edit and book-create

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index fe25c44aeca69326f9a194409e9229397aa4ce57..92dc3cdaaa9d00f478c46e72a06b70c9f03d3579 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -1,14 +1,10 @@
-<?php
-
-namespace BookStack\Http\Controllers;
+<?php namespace BookStack\Http\Controllers;

 
 

+use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Auth\User;
+use BookStack\Auth\UserRepo;

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

-

 use Illuminate\Http\Response;
 use Illuminate\Http\Response;

-use BookStack\Http\Requests;
-use BookStack\Repos\UserRepo;
-use BookStack\Services\SocialAuthService;
-use BookStack\User;

 
 class UserController extends Controller
 {
 
 class UserController extends Controller
 {


@@ -19,7 +15,7 @@ class UserController extends Controller
     /**
      * UserController constructor.
      * @param User     $user
     /**
      * UserController constructor.
      * @param User     $user

-     * @param UserRepo $userRepo
+     * @param \BookStack\Auth\UserRepo $userRepo

      */
     public function __construct(User $user, UserRepo $userRepo)
     {
      */
     public function __construct(User $user, UserRepo $userRepo)
     {


@@ -30,13 +26,21 @@ class UserController extends Controller
 
     /**
      * Display a listing of the users.
 
     /**
      * Display a listing of the users.

+     * @param Request $request

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

-    public function index()
+    public function index(Request $request)

     {
     {

-        $users = $this->user->all();
-        $this->setPageTitle('Users');
-        return view('users/index', ['users' => $users]);
+        $this->checkPermission('users-manage');
+        $listDetails = [
+            'order' => $request->get('order', 'asc'),
+            'search' => $request->get('search', ''),
+            'sort' => $request->get('sort', 'name'),
+        ];
+        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
+        $this->setPageTitle(trans('settings.users'));
+        $users->appends($listDetails);
+        return view('users/index', ['users' => $users, 'listDetails' => $listDetails]);

     }
 
     /**
     }
 
     /**


@@ -45,8 +49,10 @@ class UserController extends Controller
      */
     public function create()
     {
      */
     public function create()
     {

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

     }
 
     /**
     }
 
     /**


@@ -56,48 +62,61 @@ class UserController extends Controller
      */
     public function store(Request $request)
     {
      */
     public function store(Request $request)
     {

-        $this->checkPermission('user-create');
-        $this->validate($request, [
+        $this->checkPermission('users-manage');
+        $validationRules = [

             'name'             => 'required',
             'name'             => 'required',

-            'email'            => 'required|email|unique:users,email',
-            'password'         => 'required|min:5',
-            'password-confirm' => 'required|same:password',
-            'role'             => 'required|exists:roles,id'
-        ]);
+            'email'            => 'required|email|unique:users,email'
+        ];
+
+        $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 = bcrypt($request->get('password'));
-        $user->save();

 
 

-        $user->attachRoleId($request->get('role'));
+        if ($authMethod === 'standard') {
+            $user->password = bcrypt($request->get('password'));
+        } elseif ($authMethod === 'ldap') {
+            $user->external_auth_id = $request->get('external_auth_id');
+        }
+
+        $user->save();

 
 

-        // Get avatar from gravatar and save
-        if (!env('DISABLE_EXTERNAL_SERVICES', false)) {
-            $avatar = \Images::saveUserGravatar($user);
-            $user->avatar()->associate($avatar);
-            $user->save();
+        if ($request->filled('roles')) {
+            $roles = $request->get('roles');
+            $user->roles()->sync($roles);

         }
 
         }
 

-        return redirect('/users');
-    }
+        $this->userRepo->downloadGravatarToUserAvatar($user);

 
 

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

 
     /**
      * Show the form for editing the specified user.
      * @param  int              $id
 
     /**
      * Show the form for editing the specified user.
      * @param  int              $id

-     * @param SocialAuthService $socialAuthService
+     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService

      * @return Response
      */
     public function edit($id, SocialAuthService $socialAuthService)
     {
      * @return Response
      */
     public function edit($id, SocialAuthService $socialAuthService)
     {

-        $this->checkPermissionOr('user-update', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
         $user = $this->user->findOrFail($id);
             return $this->currentUser->id == $id;
         });
 
         $user = $this->user->findOrFail($id);

+
+        $authMethod = ($user->system_name) ? 'system' : config('auth.method');
+

         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();

-        $this->setPageTitle('User Profile');
-        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers]);
+        $this->setPageTitle(trans('settings.user_profile'));
+        $roles = $this->userRepo->getAllRoles();
+        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);

     }
 
     /**
     }
 
     /**


@@ -109,46 +128,65 @@ class UserController extends Controller
     public function update(Request $request, $id)
     {
         $this->preventAccessForDemoUsers();
     public function update(Request $request, $id)
     {
         $this->preventAccessForDemoUsers();

-        $this->checkPermissionOr('user-update', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
         $this->validate($request, [
             return $this->currentUser->id == $id;
         });
 
         $this->validate($request, [

-            'name'             => 'required',
-            'email'            => 'required|email|unique:users,email,' . $id,
-            'password'         => 'min:5',
-            'password-confirm' => 'same:password',
-            'role'             => 'exists:roles,id'
+            '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',
+            'setting'          => 'array'

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

-        $user->fill($request->except('password'));
+        $user->fill($request->all());

 
 

-        if ($this->currentUser->can('user-update') && $request->has('role')) {
-            $user->attachRoleId($request->get('role'));
+        // Role updates
+        if (userCan('users-manage') && $request->filled('roles')) {
+            $roles = $request->get('roles');
+            $user->roles()->sync($roles);

         }
 
         }
 

-        if ($request->has('password') && $request->get('password') != '') {
+        // Password updates
+        if ($request->filled('password')) {

             $password = $request->get('password');
             $user->password = bcrypt($password);
         }
             $password = $request->get('password');
             $user->password = bcrypt($password);
         }

+
+        // External auth id updates
+        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {
+            $user->external_auth_id = $request->get('external_auth_id');
+        }
+
+        // Save an user-specific settings
+        if ($request->filled('setting')) {
+            foreach ($request->get('setting') as $key => $value) {
+                setting()->putUser($user, $key, $value);
+            }
+        }
+

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

-        return redirect('/users');
+        session()->flash('success', trans('settings.users_edit_success'));
+
+        $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+        return redirect($redirectUrl);

     }
 
     /**
      * Show the user delete page.
     }
 
     /**
      * Show the user delete page.

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

      * @return \Illuminate\View\View
      */
     public function delete($id)
     {
      * @return \Illuminate\View\View
      */
     public function delete($id)
     {

-        $this->checkPermissionOr('user-delete', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
         $user = $this->user->findOrFail($id);
             return $this->currentUser->id == $id;
         });
 
         $user = $this->user->findOrFail($id);

-        $this->setPageTitle('Delete User ' . $user->name);
+        $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name]));

         return view('users/delete', ['user' => $user]);
     }
 
         return view('users/delete', ['user' => $user]);
     }
 


@@ -160,17 +198,132 @@ class UserController extends Controller
     public function destroy($id)
     {
         $this->preventAccessForDemoUsers();
     public function destroy($id)
     {
         $this->preventAccessForDemoUsers();

-        $this->checkPermissionOr('user-delete', function () use ($id) {
+        $this->checkPermissionOr('users-manage', function () use ($id) {

             return $this->currentUser->id == $id;
         });
 
         $user = $this->userRepo->getById($id);
             return $this->currentUser->id == $id;
         });
 
         $user = $this->userRepo->getById($id);

+

         if ($this->userRepo->isOnlyAdmin($user)) {
         if ($this->userRepo->isOnlyAdmin($user)) {

-            session()->flash('error', 'You cannot delete the only admin');
+            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));

             return redirect($user->getEditUrl());
         }
             return redirect($user->getEditUrl());
         }

+
+        if ($user->system_name === 'public') {
+            session()->flash('error', trans('errors.users_cannot_delete_guest'));
+            return redirect($user->getEditUrl());
+        }
+

         $this->userRepo->destroy($user);
         $this->userRepo->destroy($user);

+        session()->flash('success', trans('settings.users_delete_success'));
+
+        return redirect('/settings/users');
+    }
+
+    /**
+     * Show the user profile page
+     * @param $id
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     */
+    public function showProfilePage($id)
+    {
+        $user = $this->userRepo->getById($id);
+        $userActivity = $this->userRepo->getActivity($user);
+        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
+        $assetCounts = $this->userRepo->getAssetCounts($user);
+        return view('users/profile', [
+            'user' => $user,
+            'activity' => $userActivity,
+            'recentlyCreated' => $recentlyCreated,
+            'assetCounts' => $assetCounts
+        ]);
+    }

 
 

-        return redirect('/users');
+    /**
+     * Update the user's preferred book-list display setting.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function switchBookView($id, Request $request)
+    {
+        return $this->switchViewType($id, $request, 'books');
+    }
+
+    /**
+     * Update the user's preferred shelf-list display setting.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function switchShelfView($id, Request $request)
+    {
+        return $this->switchViewType($id, $request, 'bookshelves');
+    }
+
+    /**
+     * For a type of list, switch with stored view type for a user.
+     * @param integer $userId
+     * @param Request $request
+     * @param string $listName
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function switchViewType($userId, Request $request, string $listName)
+    {
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+
+        $viewType = $request->get('view_type');
+        if (!in_array($viewType, ['grid', 'list'])) {
+            $viewType = 'list';
+        }
+
+        $user = $this->user->findOrFail($userId);
+        $key = $listName . '_view_type';
+        setting()->putUser($user, $key, $viewType);
+
+        return redirect()->back(302, [], "/settings/users/$userId");

     }
     }

+
+    /**
+     * Change the stored sort type for the books view.
+     * @param $id
+     * @param Request $request
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    public function changeBooksSort($id, Request $request)
+    {
+        // TODO - Test this endpoint
+        return $this->changeListSort($id, $request, 'books');
+    }
+
+    /**
+     * Changed the stored preference for a list sort order.
+     * @param int $userId
+     * @param Request $request
+     * @param string $listName
+     * @return \Illuminate\Http\RedirectResponse
+     */
+    protected function changeListSort(int $userId, Request $request, string $listName)
+    {
+        $this->checkPermissionOrCurrentUser('users-manage', $userId);
+
+        $sort = $request->get('sort');
+        if (!in_array($sort, ['name', 'created_at', 'updated_at'])) {
+            $sort = 'name';
+        }
+
+        $order = $request->get('order');
+        if (!in_array($order, ['asc', 'desc'])) {
+            $order = 'asc';
+        }
+
+        $user = $this->user->findOrFail($userId);
+        $sortKey = $listName . '_sort';
+        $orderKey = $listName . '_sort_order';
+        setting()->putUser($user, $sortKey, $sort);
+        setting()->putUser($user, $orderKey, $order);
+
+        return redirect()->back(302, [], "/settings/users/$userId");
+    }
+

 }
 }