-<?php
-
-namespace BookStack\Http\Controllers;
-
-use BookStack\Activity;
-use Exception;
+<?php namespace BookStack\Http\Controllers;
+
+use BookStack\Auth\Access\SocialAuthService;
+use BookStack\Auth\Access\UserInviteService;
+use BookStack\Auth\User;
+use BookStack\Auth\UserRepo;
+use BookStack\Exceptions\UserUpdateException;
+use BookStack\Uploads\ImageRepo;
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\Str;
class UserController extends Controller
{
protected $user;
protected $userRepo;
+ protected $inviteService;
+ protected $imageRepo;
/**
* UserController constructor.
- * @param User $user
+ * @param User $user
* @param UserRepo $userRepo
+ * @param UserInviteService $inviteService
+ * @param ImageRepo $imageRepo
*/
- public function __construct(User $user, UserRepo $userRepo)
+ public function __construct(User $user, UserRepo $userRepo, UserInviteService $inviteService, ImageRepo $imageRepo)
{
$this->user = $user;
$this->userRepo = $userRepo;
+ $this->inviteService = $inviteService;
+ $this->imageRepo = $imageRepo;
parent::__construct();
}
{
$this->checkPermission('users-manage');
$listDetails = [
- 'order' => $request->has('order') ? $request->get('order') : 'asc',
- 'search' => $request->has('search') ? $request->get('search') : '',
- 'sort' => $request->has('sort') ? $request->get('sort') : 'name',
+ '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]);
+ return view('users.index', ['users' => $users, 'listDetails' => $listDetails]);
}
/**
$this->checkPermission('users-manage');
$authMethod = config('auth.method');
$roles = $this->userRepo->getAllRoles();
- return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
+ return view('users.create', ['authMethod' => $authMethod, 'roles' => $roles]);
}
/**
* Store a newly created user in storage.
* @param Request $request
* @return Response
+ * @throws UserUpdateException
*/
public function store(Request $request)
{
];
$authMethod = config('auth.method');
- if ($authMethod === 'standard') {
- $validationRules['password'] = 'required|min:5';
+ $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') {
$validationRules['external_auth_id'] = 'required';
$user = $this->user->fill($request->all());
if ($authMethod === 'standard') {
- $user->password = bcrypt($request->get('password'));
+ $user->password = bcrypt($request->get('password', Str::random(32)));
} elseif ($authMethod === 'ldap') {
$user->external_auth_id = $request->get('external_auth_id');
}
$user->save();
- if ($request->has('roles')) {
- $roles = $request->get('roles');
- $user->roles()->sync($roles);
+ if ($sendInvite) {
+ $this->inviteService->sendInvitation($user);
}
- // Get avatar from gravatar and save
- if (!config('services.disable_services')) {
- try {
- $avatar = \Images::saveUserGravatar($user);
- $user->avatar()->associate($avatar);
- $user->save();
- } catch (Exception $e) {
- \Log::error('Failed to save user gravatar image');
- }
-
+ if ($request->filled('roles')) {
+ $roles = $request->get('roles');
+ $this->userRepo->setUserRoles($user, $roles);
}
+ $this->userRepo->downloadAndAssignUserAvatar($user);
+
return redirect('/settings/users');
}
/**
* 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)
{
- $this->checkPermissionOr('users-manage', function () use ($id) {
- return $this->currentUser->id == $id;
- });
+ $this->checkPermissionOrCurrentUser('users-manage', $id);
$user = $this->user->findOrFail($id);
$activeSocialDrivers = $socialAuthService->getActiveDrivers();
$this->setPageTitle(trans('settings.user_profile'));
$roles = $this->userRepo->getAllRoles();
- return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
+ return view('users.edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
}
/**
* Update the specified user in storage.
- * @param Request $request
- * @param int $id
+ * @param Request $request
+ * @param int $id
* @return Response
+ * @throws UserUpdateException
+ * @throws \BookStack\Exceptions\ImageUploadException
*/
public function update(Request $request, $id)
{
$this->preventAccessForDemoUsers();
- $this->checkPermissionOr('users-manage', function () use ($id) {
- return $this->currentUser->id == $id;
- });
+ $this->checkPermissionOrCurrentUser('users-manage', $id);
$this->validate($request, [
'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'
+ 'password' => 'min:6|required_with:password_confirm',
+ 'password-confirm' => 'same:password|required_with:password',
+ 'setting' => 'array',
+ 'profile_image' => $this->imageRepo->getImageValidationRules(),
]);
- $user = $this->user->findOrFail($id);
- $user->fill($request->all());
+ $user = $this->userRepo->getById($id);
+ $user->fill($request->except(['email']));
+
+ // Email updates
+ if (userCan('users-manage') && $request->filled('email')) {
+ $user->email = $request->get('email');
+ }
// Role updates
- if (userCan('users-manage') && $request->has('roles')) {
+ if (userCan('users-manage') && $request->filled('roles')) {
$roles = $request->get('roles');
- $user->roles()->sync($roles);
+ $this->userRepo->setUserRoles($user, $roles);
}
// Password updates
- if ($request->has('password') && $request->get('password') != '') {
+ if ($request->filled('password')) {
$password = $request->get('password');
$user->password = bcrypt($password);
}
// External auth id updates
- if ($this->currentUser->can('users-manage') && $request->has('external_auth_id')) {
+ 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);
+ }
+ }
+
+ // Save profile image if in request
+ if ($request->has('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;
+ }
+
+ // Delete the profile image if set to
+ if ($request->has('profile_image_reset')) {
+ $this->imageRepo->destroyImage($user->avatar);
+ }
+
$user->save();
session()->flash('success', trans('settings.users_edit_success'));
- $redirectUrl = userCan('users-manage') ? '/settings/users' : '/settings/users/' . $user->id;
+ $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
return redirect($redirectUrl);
}
*/
public function delete($id)
{
- $this->checkPermissionOr('users-manage', function () use ($id) {
- return $this->currentUser->id == $id;
- });
+ $this->checkPermissionOrCurrentUser('users-manage', $id);
- $user = $this->user->findOrFail($id);
+ $user = $this->userRepo->getById($id);
$this->setPageTitle(trans('settings.users_delete_named', ['userName' => $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)
{
$this->preventAccessForDemoUsers();
- $this->checkPermissionOr('users-manage', function () use ($id) {
- return $this->currentUser->id == $id;
- });
+ $this->checkPermissionOrCurrentUser('users-manage', $id);
$user = $this->userRepo->getById($id);
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', [
+
+ return view('users.profile', [
'user' => $user,
'activity' => $userActivity,
'recentlyCreated' => $recentlyCreated,
'assetCounts' => $assetCounts
]);
}
+
+ /**
+ * 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->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.
+ * @param string $id
+ * @param string $type
+ * @param Request $request
+ * @return \Illuminate\Http\RedirectResponse
+ */
+ public function changeSort(string $id, string $type, Request $request)
+ {
+ $validSortTypes = ['books', 'bookshelves'];
+ if (!in_array($type, $validSortTypes)) {
+ return redirect()->back(500);
+ }
+ return $this->changeListSort($id, $request, $type);
+ }
+
+ /**
+ * Update the stored section expansion preference for the given user.
+ * @param string $id
+ * @param string $key
+ * @param Request $request
+ * @return \Illuminate\Contracts\Routing\ResponseFactory|\Symfony\Component\HttpFoundation\Response
+ */
+ public function updateExpansionPreference(string $id, string $key, Request $request)
+ {
+ $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->user->findOrFail($id);
+ setting()->putUser($user, 'section_expansion#' . $key, $newState);
+ return response("", 204);
+ }
+
+ /**
+ * 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");
+ }
}
projects / bookstack / blobdiff