X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/d6739c1158e486b02885cd010f70ab4494a0404c..1dbc3588cf11c12fde3da0ca4cb951c55ce810d9:/app/Http/Controllers/UserController.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index b81be16f6..f69f00cf7 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -2,178 +2,203 @@ namespace BookStack\Http\Controllers; +use BookStack\Auth\Access\SocialAuthService; +use BookStack\Auth\Queries\UsersAllPaginatedAndSorted; +use BookStack\Auth\Role; +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\Http\Response; -use BookStack\Http\Requests; -use BookStack\Repos\UserRepo; -use BookStack\Services\SocialAuthService; -use BookStack\User; +use Illuminate\Support\Facades\DB; +use Illuminate\Validation\Rules\Password; +use Illuminate\Validation\ValidationException; class UserController extends Controller { + protected UserRepo $userRepo; + protected ImageRepo $imageRepo; - protected $user; - protected $userRepo; - - /** - * UserController constructor. - * @param User $user - * @param UserRepo $userRepo - */ - public function __construct(User $user, UserRepo $userRepo) + public function __construct(UserRepo $userRepo, ImageRepo $imageRepo) { - $this->user = $user; $this->userRepo = $userRepo; - parent::__construct(); + $this->imageRepo = $imageRepo; } /** * Display a listing of the users. - * @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'); + + $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($listOptions->getPaginationAppends()); + + return view('users.index', [ + 'users' => $users, + 'listOptions' => $listOptions, + ]); } /** * Show the form for creating a new user. - * @return Response */ public function create() { - $this->checkPermission('user-create'); - return view('users/create'); + $this->checkPermission('users-manage'); + $authMethod = config('auth.method'); + $roles = Role::query()->orderBy('display_name', 'asc')->get(); + $this->setPageTitle(trans('settings.users_add_new')); + + return view('users.create', ['authMethod' => $authMethod, 'roles' => $roles]); } /** - * Store a newly created user in storage. - * @param Request $request - * @return Response + * Store a new user in storage. + * + * @throws ValidationException */ public function store(Request $request) { - $this->checkPermission('user-create'); - $this->validate($request, [ - 'name' => 'required', - '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 = bcrypt($request->get('password')); - $user->save(); - - $user->attachRoleId($request->get('role')); - - // Get avatar from gravatar and save - if (!env('DISABLE_EXTERNAL_SERVICES', false)) { - $avatar = \Images::saveUserGravatar($user); - $user->avatar()->associate($avatar); - $user->save(); - } + $this->checkPermission('users-manage'); + + $authMethod = config('auth.method'); + $sendInvite = ($request->get('send_invite', 'false') === 'true'); + $externalAuth = $authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'oidc'; + $passwordRequired = ($authMethod === 'standard' && !$sendInvite); + + $validationRules = [ + 'name' => ['required', 'max:100'], + 'email' => ['required', 'email', 'unique:users,email'], + 'language' => ['string', 'max:15', 'alpha_dash'], + 'roles' => ['array'], + 'roles.*' => ['integer'], + 'password' => $passwordRequired ? ['required', Password::default()] : null, + 'password-confirm' => $passwordRequired ? ['required', 'same:password'] : null, + 'external_auth_id' => $externalAuth ? ['required'] : null, + ]; + + $validated = $this->validate($request, array_filter($validationRules)); + + DB::transaction(function () use ($validated, $sendInvite) { + $this->userRepo->create($validated, $sendInvite); + }); - return redirect('/users'); + return redirect('/settings/users'); } - /** * Show the form for editing the specified user. - * @param int $id - * @param SocialAuthService $socialAuthService - * @return Response */ - public function edit($id, SocialAuthService $socialAuthService) + public function edit(int $id, SocialAuthService $socialAuthService) { - $this->checkPermissionOr('user-update', function () use ($id) { - return $this->currentUser->id == $id; - }); + $this->checkPermissionOrCurrentUser('users-manage', $id); + + $user = $this->userRepo->getById($id); + $user->load(['apiTokens', 'mfaValues']); + $authMethod = ($user->system_name) ? 'system' : config('auth.method'); - $user = $this->user->findOrFail($id); $activeSocialDrivers = $socialAuthService->getActiveDrivers(); - $this->setPageTitle('User Profile'); - return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers]); + $mfaMethods = $user->mfaValues->groupBy('method'); + $this->setPageTitle(trans('settings.user_profile')); + $roles = Role::query()->orderBy('display_name', 'asc')->get(); + + return view('users.edit', [ + 'user' => $user, + 'activeSocialDrivers' => $activeSocialDrivers, + 'mfaMethods' => $mfaMethods, + 'authMethod' => $authMethod, + 'roles' => $roles, + ]); } /** * Update the specified user in storage. - * @param Request $request - * @param int $id - * @return Response + * + * @throws UserUpdateException + * @throws ImageUploadException + * @throws ValidationException */ - public function update(Request $request, $id) + public function update(Request $request, int $id) { - $this->preventAccessForDemoUsers(); - $this->checkPermissionOr('user-update', function () use ($id) { - return $this->currentUser->id == $id; - }); - - $this->validate($request, [ - 'name' => 'required', - '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' + $this->preventAccessInDemoMode(); + $this->checkPermissionOrCurrentUser('users-manage', $id); + + $validated = $this->validate($request, [ + 'name' => ['min:2', 'max:100'], + 'email' => ['min:2', 'email', 'unique:users,email,' . $id], + 'password' => ['required_with:password_confirm', Password::default()], + 'password-confirm' => ['same:password', 'required_with:password'], + 'language' => ['string', 'max:15', 'alpha_dash'], + 'roles' => ['array'], + 'roles.*' => ['integer'], + 'external_auth_id' => ['string'], + 'profile_image' => array_merge(['nullable'], $this->getImageValidationRules()), ]); - $user = $this->user->findOrFail($id); - $user->fill($request->except('password')); - - if ($this->currentUser->can('user-update') && $request->has('role')) { - $user->attachRoleId($request->get('role')); + $user = $this->userRepo->getById($id); + $this->userRepo->update($user, $validated, userCan('users-manage')); + + // Save profile image if in request + if ($request->hasFile('profile_image')) { + $imageUpload = $request->file('profile_image'); + $this->imageRepo->destroyImage($user->avatar); + $image = $this->imageRepo->saveNew($imageUpload, 'user', $user->id); + $user->image_id = $image->id; + $user->save(); } - if ($request->has('password') && $request->get('password') != '') { - $password = $request->get('password'); - $user->password = bcrypt($password); + // Delete the profile image if reset option is in request + if ($request->has('profile_image_reset')) { + $this->imageRepo->destroyImage($user->avatar); } - $user->save(); - return redirect('/users'); + $redirectUrl = userCan('users-manage') ? '/settings/users' : "/settings/users/{$user->id}"; + + return redirect($redirectUrl); } /** * Show the user delete page. - * @param $id - * @return \Illuminate\View\View */ - public function delete($id) + public function delete(int $id) { - $this->checkPermissionOr('user-delete', function () use ($id) { - return $this->currentUser->id == $id; - }); + $this->checkPermissionOrCurrentUser('users-manage', $id); + + $user = $this->userRepo->getById($id); + $this->setPageTitle(trans('settings.users_delete_named', ['userName' => $user->name])); - $user = $this->user->findOrFail($id); - $this->setPageTitle('Delete User ' . $user->name); - return view('users/delete', ['user' => $user]); + return view('users.delete', ['user' => $user]); } /** * Remove the specified user from storage. - * @param int $id - * @return Response + * + * @throws Exception */ - public function destroy($id) + public function destroy(Request $request, int $id) { - $this->preventAccessForDemoUsers(); - $this->checkPermissionOr('user-delete', function () use ($id) { - return $this->currentUser->id == $id; - }); + $this->preventAccessInDemoMode(); + $this->checkPermissionOrCurrentUser('users-manage', $id); $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); + $newOwnerId = $request->get('new_owner_id', null); + + $this->userRepo->destroy($user, $newOwnerId); - return redirect('/users'); + return redirect('/settings/users'); } }