New translations editor.php (Welsh)

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

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

 
 use BookStack\Auth\Access\SocialAuthService;
 
 use BookStack\Auth\Access\SocialAuthService;

+use BookStack\Auth\Queries\AllUsersPaginatedAndSorted;
+use BookStack\Auth\Role;

 use BookStack\Auth\User;
 use BookStack\Auth\UserRepo;
 use BookStack\Auth\User;
 use BookStack\Auth\UserRepo;

+use BookStack\Exceptions\ImageUploadException;
+use BookStack\Exceptions\UserUpdateException;
+use BookStack\Uploads\ImageRepo;
+use Exception;

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

-use Illuminate\Http\Response;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Validation\Rules\Password;
+use Illuminate\Validation\ValidationException;

 
 class UserController extends Controller
 {
 
 class UserController extends Controller
 {

-
-    protected $user;

     protected $userRepo;
     protected $userRepo;

+    protected $imageRepo;

 
     /**
      * UserController constructor.
 
     /**
      * UserController constructor.

-     * @param User     $user
-     * @param \BookStack\Auth\UserRepo $userRepo

      */
      */

-    public function __construct(User $user, UserRepo $userRepo)
+    public function __construct(UserRepo $userRepo, ImageRepo $imageRepo)

     {
     {

-        $this->user = $user;

         $this->userRepo = $userRepo;
         $this->userRepo = $userRepo;

-        parent::__construct();
+        $this->imageRepo = $imageRepo;

     }
 
     /**
      * Display a listing of the users.
     }
 
     /**
      * Display a listing of the users.

-     * @param Request $request
-     * @return Response

      */
     public function index(Request $request)
     {
         $this->checkPermission('users-manage');
         $listDetails = [
      */
     public function index(Request $request)
     {
         $this->checkPermission('users-manage');
         $listDetails = [

-            'order' => $request->get('order', 'asc'),
+            'order'  => $request->get('order', 'asc'),

             'search' => $request->get('search', ''),
             'search' => $request->get('search', ''),

-            'sort' => $request->get('sort', 'name'),
+            'sort'   => $request->get('sort', 'name'),

         ];
         ];

-        $users = $this->userRepo->getAllUsersPaginatedAndSorted(20, $listDetails);
+
+        $users = (new AllUsersPaginatedAndSorted())->run(20, $listDetails);
+

         $this->setPageTitle(trans('settings.users'));
         $users->appends($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,
+        ]);

     }
 
     /**
      * Show the form for creating a new user.
     }
 
     /**
      * Show the form for creating a new user.

-     * @return Response

      */
     public function create()
     {
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');
      */
     public function create()
     {
         $this->checkPermission('users-manage');
         $authMethod = config('auth.method');

-        $roles = $this->userRepo->getAllRoles();
-        return view('users/create', ['authMethod' => $authMethod, 'roles' => $roles]);
+        $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('users-manage');
      */
     public function store(Request $request)
     {
         $this->checkPermission('users-manage');

-        $validationRules = [
-            'name'             => 'required',
-            'email'            => 'required|email|unique:users,email'
-        ];

 
         $authMethod = config('auth.method');
 
         $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());
-
-        if ($authMethod === 'standard') {
-            $user->password = bcrypt($request->get('password'));
-        } elseif ($authMethod === 'ldap') {
-            $user->external_auth_id = $request->get('external_auth_id');
-        }
+        $sendInvite = ($request->get('send_invite', 'false') === 'true');
+        $externalAuth = $authMethod === 'ldap' || $authMethod === 'saml2' || $authMethod === 'oidc';
+        $passwordRequired = ($authMethod === 'standard' && !$sendInvite);

 
 

-        $user->save();
+        $validationRules = [
+            'name'             => ['required'],
+            'email'            => ['required', 'email', 'unique:users,email'],
+            'language'         => ['string'],
+            'roles'            => ['array'],
+            'roles.*'          => ['integer'],
+            'password'         => $passwordRequired ? ['required', Password::default()] : null,
+            'password-confirm' => $passwordRequired ? ['required', 'same:password'] : null,
+            'external_auth_id' => $externalAuth ? ['required'] : null,
+        ];

 
 

-        if ($request->filled('roles')) {
-            $roles = $request->get('roles');
-            $user->roles()->sync($roles);
-        }
+        $validated = $this->validate($request, array_filter($validationRules));

 
 

-        $this->userRepo->downloadGravatarToUserAvatar($user);
+        DB::transaction(function () use ($validated, $sendInvite) {
+            $this->userRepo->create($validated, $sendInvite);
+        });

 
         return redirect('/settings/users');
     }
 
     /**
      * Show the form for editing the specified user.
 
         return redirect('/settings/users');
     }
 
     /**
      * Show the form for editing the specified user.

-     * @param  int              $id
-     * @param \BookStack\Auth\Access\SocialAuthService $socialAuthService
-     * @return Response

      */
      */

-    public function edit($id, SocialAuthService $socialAuthService)
+    public function edit(int $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);
+        /** @var User $user */
+        $user = User::query()->with(['apiTokens', 'mfaValues'])->findOrFail($id);

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

+        $mfaMethods = $user->mfaValues->groupBy('method');

         $this->setPageTitle(trans('settings.user_profile'));
         $this->setPageTitle(trans('settings.user_profile'));

-        $roles = $this->userRepo->getAllRoles();
-        return view('users/edit', ['user' => $user, 'activeSocialDrivers' => $activeSocialDrivers, 'authMethod' => $authMethod, 'roles' => $roles]);
+        $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.
     }
 
     /**
      * 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('users-manage', function () use ($id) {
-            return $this->currentUser->id == $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',
-            'setting'          => 'array'
+        $this->preventAccessInDemoMode();
+        $this->checkPermissionOrCurrentUser('users-manage', $id);
+
+        $validated = $this->validate($request, [
+            'name'             => ['min:2'],
+            'email'            => ['min:2', 'email', 'unique:users,email,' . $id],
+            'password'         => ['required_with:password_confirm', Password::default()],
+            'password-confirm' => ['same:password', 'required_with:password'],
+            'language'         => ['string'],
+            'roles'            => ['array'],
+            'roles.*'          => ['integer'],
+            'external_auth_id' => ['string'],
+            'profile_image'    => array_merge(['nullable'], $this->getImageValidationRules()),

         ]);
 
         ]);
 

-        $user = $this->user->findOrFail($id);
-        $user->fill($request->all());
-
-        // Role updates
-        if (userCan('users-manage') && $request->filled('roles')) {
-            $roles = $request->get('roles');
-            $user->roles()->sync($roles);
-        }
-
-        // Password updates
-        if ($request->filled('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');
+        $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();

         }
 
         }
 

-        // Save an user-specific settings
-        if ($request->filled('setting')) {
-            foreach ($request->get('setting') as $key => $value) {
-                setting()->putUser($user, $key, $value);
-            }
+        // Delete the profile image if reset option is in request
+        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);
     }
 
     /**
      * Show the user delete page.
         return redirect($redirectUrl);
     }
 
     /**
      * Show the user delete page.

-     * @param int $id
-     * @return \Illuminate\View\View

      */
      */

-    public function delete($id)
+    public function delete(int $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]));
         $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.
     }
 
     /**
      * 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('users-manage', function () use ($id) {
-            return $this->currentUser->id == $id;
-        });
+        $this->preventAccessInDemoMode();
+        $this->checkPermissionOrCurrentUser('users-manage', $id);

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

+        $newOwnerId = $request->get('new_owner_id', null);

 
 

-        if ($this->userRepo->isOnlyAdmin($user)) {
-            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));
-            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);
-        session()->flash('success', trans('settings.users_delete_success'));
+        $this->userRepo->destroy($user, $newOwnerId);

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

-     * Show the user profile page
-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
+     * Update the user's preferred book-list display setting.

      */
      */

-    public function showProfilePage($id)
+    public function switchBooksView(Request $request, int $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 $this->switchViewType($id, $request, 'books');

     }
 
     /**
     }
 
     /**

-     * Update the user's preferred book-list display setting.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
+     * Update the user's preferred shelf-list display setting.

      */
      */

-    public function switchBookView($id, Request $request)
+    public function switchShelvesView(Request $request, int $id)

     {
     {

-        return $this->switchViewType($id, $request, 'books');
+        return $this->switchViewType($id, $request, 'bookshelves');

     }
 
     /**
     }
 
     /**

-     * Update the user's preferred shelf-list display setting.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
+     * Update the user's preferred shelf-view book list display setting.

      */
      */

-    public function switchShelfView($id, Request $request)
+    public function switchShelfView(Request $request, int $id)

     {
     {

-        return $this->switchViewType($id, $request, 'bookshelves');
+        return $this->switchViewType($id, $request, 'bookshelf');

     }
 
     /**
      * For a type of list, switch with stored view type for a user.
     }
 
     /**
      * 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)
+    protected function switchViewType(int $userId, Request $request, string $listName)

     {
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 
     {
         $this->checkPermissionOrCurrentUser('users-manage', $userId);
 


@@ -277,7 +239,7 @@ class UserController extends Controller
             $viewType = 'list';
         }
 
             $viewType = 'list';
         }
 

-        $user = $this->user->findOrFail($userId);
+        $user = $this->userRepo->getById($userId);

         $key = $listName . '_view_type';
         setting()->putUser($user, $key, $viewType);
 
         $key = $listName . '_view_type';
         setting()->putUser($user, $key, $viewType);
 


@@ -285,30 +247,57 @@ class UserController extends Controller
     }
 
     /**
     }
 
     /**

-     * Change the stored sort type for the books view.
-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
+     * Change the stored sort type for a particular view.
+     */
+    public function changeSort(Request $request, string $id, string $type)
+    {
+        $validSortTypes = ['books', 'bookshelves', 'shelf_books'];
+        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 changeBooksSort($id, Request $request)
+    public function updateExpansionPreference(Request $request, string $id, string $key)

     {
     {

-        // TODO - Test this endpoint
-        return $this->changeListSort($id, $request, 'books');
+        $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);

     }
 
     /**
      * Changed the stored preference for a list sort order.
     }
 
     /**
      * 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');
      */
     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'])) {
+        if (!in_array($sort, ['name', 'created_at', 'updated_at', 'default'])) {

             $sort = 'name';
         }
 
             $sort = 'name';
         }
 


@@ -317,7 +306,7 @@ class UserController extends Controller
             $order = 'asc';
         }
 
             $order = 'asc';
         }
 

-        $user = $this->user->findOrFail($userId);
+        $user = $this->userRepo->getById($userId);

         $sortKey = $listName . '_sort';
         $orderKey = $listName . '_sort_order';
         setting()->putUser($user, $sortKey, $sort);
         $sortKey = $listName . '_sort';
         $orderKey = $listName . '_sort_order';
         setting()->putUser($user, $sortKey, $sort);


@@ -325,5 +314,4 @@ class UserController extends Controller
 
         return redirect()->back(302, [], "/settings/users/$userId");
     }
 
         return redirect()->back(302, [], "/settings/users/$userId");
     }

-

 }
 }