X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/98b59a10249afeccbf25bdd5eadf35f43a19cf67..refs/pull/4191/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index bd69aa8f5..cd95f7220 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -3,13 +3,13 @@ namespace BookStack\Http\Controllers; use BookStack\Auth\Access\SocialAuthService; -use BookStack\Auth\Queries\AllUsersPaginatedAndSorted; +use BookStack\Auth\Queries\UsersAllPaginatedAndSorted; use BookStack\Auth\Role; -use BookStack\Auth\User; use BookStack\Auth\UserRepo; use BookStack\Exceptions\ImageUploadException; use BookStack\Exceptions\UserUpdateException; use BookStack\Uploads\ImageRepo; +use BookStack\Util\SimpleListOptions; use Exception; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -21,9 +21,6 @@ class UserController extends Controller protected UserRepo $userRepo; protected ImageRepo $imageRepo; - /** - * UserController constructor. - */ public function __construct(UserRepo $userRepo, ImageRepo $imageRepo) { $this->userRepo = $userRepo; @@ -36,20 +33,23 @@ class UserController extends Controller public function index(Request $request) { $this->checkPermission('users-manage'); - $listDetails = [ - 'search' => $request->get('search', ''), - 'sort' => setting()->getForCurrentUser('users_sort', 'name'), - 'order' => setting()->getForCurrentUser('users_sort_order', 'asc'), - ]; - $users = (new AllUsersPaginatedAndSorted())->run(20, $listDetails); + $listOptions = SimpleListOptions::fromRequest($request, 'users')->withSortOptions([ + 'name' => trans('common.sort_name'), + 'email' => trans('auth.email'), + 'created_at' => trans('common.sort_created_at'), + 'updated_at' => trans('common.sort_updated_at'), + 'last_activity_at' => trans('settings.users_latest_activity'), + ]); + + $users = (new UsersAllPaginatedAndSorted())->run(20, $listOptions); $this->setPageTitle(trans('settings.users')); - $users->appends(['search' => $listDetails['search']]); + $users->appends($listOptions->getPaginationAppends()); return view('users.index', [ 'users' => $users, - 'listDetails' => $listDetails, + 'listOptions' => $listOptions, ]); } @@ -107,9 +107,8 @@ class UserController extends Controller { $this->checkPermissionOrCurrentUser('users-manage', $id); - /** @var User $user */ - $user = User::query()->with(['apiTokens', 'mfaValues'])->findOrFail($id); - + $user = $this->userRepo->getById($id); + $user->load(['apiTokens', 'mfaValues']); $authMethod = ($user->system_name) ? 'system' : config('auth.method'); $activeSocialDrivers = $socialAuthService->getActiveDrivers(); @@ -165,6 +164,8 @@ class UserController extends Controller // Delete the profile image if reset option is in request if ($request->has('profile_image_reset')) { $this->imageRepo->destroyImage($user->avatar); + $user->image_id = 0; + $user->save(); } $redirectUrl = userCan('users-manage') ? '/settings/users' : "/settings/users/{$user->id}"; @@ -196,149 +197,10 @@ class UserController extends Controller $this->checkPermissionOrCurrentUser('users-manage', $id); $user = $this->userRepo->getById($id); - $newOwnerId = $request->get('new_owner_id', null); + $newOwnerId = intval($request->get('new_owner_id')) ?: null; $this->userRepo->destroy($user, $newOwnerId); return redirect('/settings/users'); } - - /** - * Update the user's preferred book-list display setting. - */ - public function switchBooksView(Request $request, int $id) - { - return $this->switchViewType($id, $request, 'books'); - } - - /** - * Update the user's preferred shelf-list display setting. - */ - public function switchShelvesView(Request $request, int $id) - { - return $this->switchViewType($id, $request, 'bookshelves'); - } - - /** - * Update the user's preferred shelf-view book list display setting. - */ - public function switchShelfView(Request $request, int $id) - { - return $this->switchViewType($id, $request, 'bookshelf'); - } - - /** - * For a type of list, switch with stored view type for a user. - */ - protected function switchViewType(int $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->userRepo->getById($userId); - $key = $listName . '_view_type'; - setting()->putUser($user, $key, $viewType); - - return redirect()->back(302, [], "/settings/users/$userId"); - } - - /** - * Change the stored sort type for a particular view. - */ - public function changeSort(Request $request, string $id, string $type) - { - $validSortTypes = ['books', 'bookshelves', 'shelf_books', 'users', 'roles']; - if (!in_array($type, $validSortTypes)) { - return redirect()->back(500); - } - - return $this->changeListSort($id, $request, $type); - } - - /** - * Toggle dark mode for the current user. - */ - public function toggleDarkMode() - { - $enabled = setting()->getForCurrentUser('dark-mode-enabled', false); - setting()->putUser(user(), 'dark-mode-enabled', $enabled ? 'false' : 'true'); - - return redirect()->back(); - } - - /** - * Update the stored section expansion preference for the given user. - */ - public function updateExpansionPreference(Request $request, string $id, string $key) - { - $this->checkPermissionOrCurrentUser('users-manage', $id); - $keyWhitelist = ['home-details']; - if (!in_array($key, $keyWhitelist)) { - return response('Invalid key', 500); - } - - $newState = $request->get('expand', 'false'); - - $user = $this->userRepo->getById($id); - setting()->putUser($user, 'section_expansion#' . $key, $newState); - - return response('', 204); - } - - public function updateCodeLanguageFavourite(Request $request) - { - $validated = $this->validate($request, [ - 'language' => ['required', 'string', 'max:20'], - 'active' => ['required', 'bool'], - ]); - - $currentFavoritesStr = setting()->getForCurrentUser('code-language-favourites', ''); - $currentFavorites = array_filter(explode(',', $currentFavoritesStr)); - - $isFav = in_array($validated['language'], $currentFavorites); - if (!$isFav && $validated['active']) { - $currentFavorites[] = $validated['language']; - } elseif ($isFav && !$validated['active']) { - $index = array_search($validated['language'], $currentFavorites); - array_splice($currentFavorites, $index, 1); - } - - setting()->putUser(user(), 'code-language-favourites', implode(',', $currentFavorites)); - } - - /** - * Changed the stored preference for a list sort order. - */ - protected function changeListSort(int $userId, Request $request, string $listName) - { - $this->checkPermissionOrCurrentUser('users-manage', $userId); - - $sort = $request->get('sort'); - // TODO - Need to find a better way to validate sort options - // Probably better to do a simple validation here then validate at usage. - $validSorts = [ - 'name', 'created_at', 'updated_at', 'default', 'email', 'last_activity_at', 'display_name', - 'users_count', 'permissions_count', - ]; - if (!in_array($sort, $validSorts)) { - $sort = 'name'; - } - - $order = $request->get('order'); - if (!in_array($order, ['asc', 'desc'])) { - $order = 'asc'; - } - - $user = $this->userRepo->getById($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"); - } }