X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/5e686bb624daff355b34e80a92dada627b3a7cf8..refs/pull/3113/head:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 852d507c1..414bfefeb 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -1,18 +1,22 @@ -checkPermission('users-manage'); $listDetails = [ - 'order' => $request->get('order', 'asc'), + 'order' => $request->get('order', 'asc'), 'search' => $request->get('search', ''), - 'sort' => $request->get('sort', 'name'), + '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]); } @@ -54,30 +60,32 @@ class UserController extends Controller $this->checkPermission('users-manage'); $authMethod = config('auth.method'); $roles = $this->userRepo->getAllRoles(); + return view('users.create', ['authMethod' => $authMethod, 'roles' => $roles]); } /** * Store a newly created user in storage. + * * @throws UserUpdateException - * @throws \Illuminate\Validation\ValidationException + * @throws ValidationException */ public function store(Request $request) { $this->checkPermission('users-manage'); $validationRules = [ - 'name' => 'required', - 'email' => 'required|email|unique:users,email' + 'name' => ['required'], + 'email' => ['required', 'email', 'unique:users,email'], ]; $authMethod = config('auth.method'); $sendInvite = ($request->get('send_invite', 'false') === 'true'); if ($authMethod === 'standard' && !$sendInvite) { - $validationRules['password'] = 'required|min:6'; - $validationRules['password-confirm'] = 'required|same:password'; - } elseif ($authMethod === 'ldap' || $authMethod === 'saml2') { - $validationRules['external_auth_id'] = 'required'; + $validationRules['password'] = ['required', 'min:6']; + $validationRules['password-confirm'] = ['required', 'same:password']; + } elseif ($authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'openid') { + $validationRules['external_auth_id'] = ['required']; } $this->validate($request, $validationRules); @@ -85,10 +93,11 @@ class UserController extends Controller if ($authMethod === 'standard') { $user->password = bcrypt($request->get('password', Str::random(32))); - } elseif ($authMethod === 'ldap' || $authMethod === 'saml2') { + } elseif ($authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'openid') { $user->external_auth_id = $request->get('external_auth_id'); } + $user->refreshSlug(); $user->save(); if ($sendInvite) { @@ -103,6 +112,7 @@ class UserController extends Controller $this->userRepo->downloadAndAssignUserAvatar($user); $this->logActivity(ActivityType::USER_CREATE, $user); + return redirect('/settings/users'); } @@ -113,26 +123,31 @@ class UserController extends Controller { $this->checkPermissionOrCurrentUser('users-manage', $id); - $user = $this->user->newQuery()->with(['apiTokens'])->findOrFail($id); + /** @var User $user */ + $user = $this->user->newQuery()->with(['apiTokens', 'mfaValues'])->findOrFail($id); $authMethod = ($user->system_name) ? 'system' : config('auth.method'); $activeSocialDrivers = $socialAuthService->getActiveDrivers(); + $mfaMethods = $user->mfaValues->groupBy('method'); $this->setPageTitle(trans('settings.user_profile')); $roles = $this->userRepo->getAllRoles(); + return view('users.edit', [ - 'user' => $user, + 'user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, - 'authMethod' => $authMethod, - 'roles' => $roles + 'mfaMethods' => $mfaMethods, + 'authMethod' => $authMethod, + 'roles' => $roles, ]); } /** * Update the specified user in storage. + * * @throws UserUpdateException - * @throws \BookStack\Exceptions\ImageUploadException - * @throws \Illuminate\Validation\ValidationException + * @throws ImageUploadException + * @throws ValidationException */ public function update(Request $request, int $id) { @@ -141,11 +156,11 @@ class UserController extends Controller $this->validate($request, [ 'name' => 'min:2', - 'email' => 'min:2|email|unique:users,email,' . $id, - 'password' => 'min:6|required_with:password_confirm', - 'password-confirm' => 'same:password|required_with:password', + 'email' => ['min:2', 'email', 'unique:users,email,' . $id], + 'password' => ['min:6', 'required_with:password_confirm'], + 'password-confirm' => ['same:password', 'required_with:password'], 'setting' => 'array', - 'profile_image' => 'nullable|' . $this->getImageValidationRules(), + 'profile_image' => array_merge(['nullable'], $this->getImageValidationRules()), ]); $user = $this->userRepo->getById($id); @@ -156,6 +171,11 @@ class UserController extends Controller $user->email = $request->get('email'); } + // Refresh the slug if the user's name has changed + if ($user->isDirty('name')) { + $user->refreshSlug(); + } + // Role updates if (userCan('users-manage') && $request->filled('roles')) { $roles = $request->get('roles'); @@ -198,6 +218,7 @@ class UserController extends Controller $this->logActivity(ActivityType::USER_UPDATE, $user); $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id); + return redirect($redirectUrl); } @@ -210,12 +231,14 @@ class UserController extends Controller $user = $this->userRepo->getById($id); $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name])); + return view('users.delete', ['user' => $user]); } /** * Remove the specified user from storage. - * @throws \Exception + * + * @throws Exception */ public function destroy(Request $request, int $id) { @@ -227,11 +250,13 @@ class UserController extends Controller if ($this->userRepo->isOnlyAdmin($user)) { $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin')); + return redirect($user->getEditUrl()); } if ($user->system_name === 'public') { $this->showErrorNotification(trans('errors.users_cannot_delete_guest')); + return redirect($user->getEditUrl()); } @@ -242,25 +267,6 @@ class UserController extends Controller return redirect('/settings/users'); } - /** - * Show the user profile page - */ - public function showProfilePage($id) - { - $user = $this->userRepo->getById($id); - - $userActivity = $this->userRepo->getActivity($user); - $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5); - $assetCounts = $this->userRepo->getAssetCounts($user); - - return view('users.profile', [ - 'user' => $user, - 'activity' => $userActivity, - 'recentlyCreated' => $recentlyCreated, - 'assetCounts' => $assetCounts - ]); - } - /** * Update the user's preferred book-list display setting. */ @@ -309,10 +315,11 @@ class UserController extends Controller */ public function changeSort(Request $request, string $id, string $type) { - $validSortTypes = ['books', 'bookshelves']; + $validSortTypes = ['books', 'bookshelves', 'shelf_books']; if (!in_array($type, $validSortTypes)) { return redirect()->back(500); } + return $this->changeListSort($id, $request, $type); } @@ -323,6 +330,7 @@ class UserController extends Controller { $enabled = setting()->getForCurrentUser('dark-mode-enabled', false); setting()->putUser(user(), 'dark-mode-enabled', $enabled ? 'false' : 'true'); + return redirect()->back(); } @@ -334,14 +342,15 @@ class UserController extends Controller $this->checkPermissionOrCurrentUser('users-manage', $id); $keyWhitelist = ['home-details']; if (!in_array($key, $keyWhitelist)) { - return response("Invalid key", 500); + return response('Invalid key', 500); } $newState = $request->get('expand', 'false'); $user = $this->user->findOrFail($id); setting()->putUser($user, 'section_expansion#' . $key, $newState); - return response("", 204); + + return response('', 204); } /** @@ -352,7 +361,7 @@ class UserController extends Controller $this->checkPermissionOrCurrentUser('users-manage', $userId); $sort = $request->get('sort'); - if (!in_array($sort, ['name', 'created_at', 'updated_at'])) { + if (!in_array($sort, ['name', 'created_at', 'updated_at', 'default'])) { $sort = 'name'; }