Replace node-sass with dart-sass

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

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 156256cb94fd4d28ae0aeabbd864baa63f3e4ded..97ec31dcce0b2dfa2a539319afe126f23eb79788 100644 (file)
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -7,7 +7,6 @@ use BookStack\Auth\UserRepo;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;
 use BookStack\Exceptions\UserUpdateException;
 use BookStack\Uploads\ImageRepo;
 use Illuminate\Http\Request;

-use Illuminate\Http\Response;

 use Illuminate\Support\Str;
 
 class UserController extends Controller
 use Illuminate\Support\Str;
 
 class UserController extends Controller


@@ -20,10 +19,6 @@ class UserController extends Controller
 
     /**
      * UserController constructor.
 
     /**
      * UserController constructor.

-     * @param User $user
-     * @param UserRepo $userRepo
-     * @param UserInviteService $inviteService
-     * @param ImageRepo $imageRepo

      */
     public function __construct(User $user, UserRepo $userRepo, UserInviteService $inviteService, ImageRepo $imageRepo)
     {
      */
     public function __construct(User $user, UserRepo $userRepo, UserInviteService $inviteService, ImageRepo $imageRepo)
     {


@@ -36,8 +31,6 @@ class UserController extends Controller
 
     /**
      * Display a listing of the users.
 
     /**
      * Display a listing of the users.

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

      */
     public function index(Request $request)
     {
      */
     public function index(Request $request)
     {


@@ -55,7 +48,6 @@ class UserController extends Controller
 
     /**
      * Show the form for creating a new user.
 
     /**
      * Show the form for creating a new user.

-     * @return Response

      */
     public function create()
     {
      */
     public function create()
     {


@@ -67,9 +59,8 @@ class UserController extends Controller
 
     /**
      * Store a newly created user in storage.
 
     /**
      * Store a newly created user in storage.

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

      * @throws UserUpdateException
      * @throws UserUpdateException

+     * @throws \Illuminate\Validation\ValidationException

      */
     public function store(Request $request)
     {
      */
     public function store(Request $request)
     {


@@ -85,7 +76,7 @@ class UserController extends Controller
         if ($authMethod === 'standard' && !$sendInvite) {
             $validationRules['password'] = 'required|min:6';
             $validationRules['password-confirm'] = 'required|same:password';
         if ($authMethod === 'standard' && !$sendInvite) {
             $validationRules['password'] = 'required|min:6';
             $validationRules['password-confirm'] = 'required|same:password';

-        } elseif ($authMethod === 'ldap') {
+        } elseif ($authMethod === 'ldap' || $authMethod === 'saml2') {

             $validationRules['external_auth_id'] = 'required';
         }
         $this->validate($request, $validationRules);
             $validationRules['external_auth_id'] = 'required';
         }
         $this->validate($request, $validationRules);


@@ -94,7 +85,7 @@ class UserController extends Controller
 
         if ($authMethod === 'standard') {
             $user->password = bcrypt($request->get('password', Str::random(32)));
 
         if ($authMethod === 'standard') {
             $user->password = bcrypt($request->get('password', Str::random(32)));

-        } elseif ($authMethod === 'ldap') {
+        } elseif ($authMethod === 'ldap' || $authMethod === 'saml2') {

             $user->external_auth_id = $request->get('external_auth_id');
         }
 
             $user->external_auth_id = $request->get('external_auth_id');
         }
 


@@ -116,35 +107,35 @@ class UserController extends Controller
 
     /**
      * Show the form for editing the specified user.
 
     /**
      * 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->checkPermissionOrCurrentUser('users-manage', $id);
 
     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 

-        $user = $this->user->findOrFail($id);
+        $user = $this->user->newQuery()->with(['apiTokens'])->findOrFail($id);

 
         $authMethod = ($user->system_name) ? 'system' : config('auth.method');
 
         $activeSocialDrivers = $socialAuthService->getActiveDrivers();
         $this->setPageTitle(trans('settings.user_profile'));
         $roles = $this->userRepo->getAllRoles();
 
         $authMethod = ($user->system_name) ? 'system' : config('auth.method');
 
         $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.
     }
 
     /**
      * Update the specified user in storage.

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

      * @throws UserUpdateException
      * @throws \BookStack\Exceptions\ImageUploadException
      * @throws UserUpdateException
      * @throws \BookStack\Exceptions\ImageUploadException

+     * @throws \Illuminate\Validation\ValidationException

      */
      */

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

     {
     {

-        $this->preventAccessForDemoUsers();
+        $this->preventAccessInDemoMode();

         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $this->validate($request, [
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $this->validate($request, [


@@ -153,7 +144,7 @@ class UserController extends Controller
             'password'         => 'min:6|required_with:password_confirm',
             'password-confirm' => 'same:password|required_with:password',
             'setting'          => 'array',
             'password'         => 'min:6|required_with:password_confirm',
             'password-confirm' => 'same:password|required_with:password',
             'setting'          => 'array',

-            'profile_image'    => $this->imageRepo->getImageValidationRules(),
+            'profile_image'    => 'nullable|' . $this->getImageValidationRules(),

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


@@ -177,7 +168,7 @@ class UserController extends Controller
         }
 
         // External auth id updates
         }
 
         // External auth id updates

-        if ($this->currentUser->can('users-manage') && $request->filled('external_auth_id')) {
+        if (user()->can('users-manage') && $request->filled('external_auth_id')) {

             $user->external_auth_id = $request->get('external_auth_id');
         }
 
             $user->external_auth_id = $request->get('external_auth_id');
         }
 


@@ -189,7 +180,7 @@ class UserController extends Controller
         }
 
         // Save profile image if in request
         }
 
         // Save profile image if in request

-        if ($request->has('profile_image')) {
+        if ($request->hasFile('profile_image')) {

             $imageUpload = $request->file('profile_image');
             $this->imageRepo->destroyImage($user->avatar);
             $image = $this->imageRepo->saveNew($imageUpload, 'user', $user->id);
             $imageUpload = $request->file('profile_image');
             $this->imageRepo->destroyImage($user->avatar);
             $image = $this->imageRepo->saveNew($imageUpload, 'user', $user->id);


@@ -202,7 +193,7 @@ class UserController extends Controller
         }
 
         $user->save();
         }
 
         $user->save();

-        session()->flash('success', trans('settings.users_edit_success'));
+        $this->showSuccessNotification(trans('settings.users_edit_success'));

 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         return redirect($redirectUrl);
 
         $redirectUrl = userCan('users-manage') ? '/settings/users' : ('/settings/users/' . $user->id);
         return redirect($redirectUrl);


@@ -210,10 +201,8 @@ class UserController extends Controller
 
     /**
      * Show the user delete page.
 
     /**
      * Show the user delete page.

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

      */
      */

-    public function delete($id)
+    public function delete(int $id)

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


@@ -224,44 +213,40 @@ class UserController extends Controller
 
     /**
      * Remove the specified user from storage.
 
     /**
      * Remove the specified user from storage.

-     * @param  int $id
-     * @return Response

      * @throws \Exception
      */
      * @throws \Exception
      */

-    public function destroy($id)
+    public function destroy(int $id)

     {
     {

-        $this->preventAccessForDemoUsers();
+        $this->preventAccessInDemoMode();

         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);
 
         if ($this->userRepo->isOnlyAdmin($user)) {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
 
         $user = $this->userRepo->getById($id);
 
         if ($this->userRepo->isOnlyAdmin($user)) {

-            session()->flash('error', trans('errors.users_cannot_delete_only_admin'));
+            $this->showErrorNotification(trans('errors.users_cannot_delete_only_admin'));

             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {
             return redirect($user->getEditUrl());
         }
 
         if ($user->system_name === 'public') {

-            session()->flash('error', trans('errors.users_cannot_delete_guest'));
+            $this->showErrorNotification(trans('errors.users_cannot_delete_guest'));

             return redirect($user->getEditUrl());
         }
 
         $this->userRepo->destroy($user);
             return redirect($user->getEditUrl());
         }
 
         $this->userRepo->destroy($user);

-        session()->flash('success', trans('settings.users_delete_success'));
+        $this->showSuccessNotification(trans('settings.users_delete_success'));

 
         return redirect('/settings/users');
     }
 
     /**
      * Show the user profile page
 
         return redirect('/settings/users');
     }
 
     /**
      * Show the user profile page

-     * @param $id
-     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View

      */
     public function showProfilePage($id)
     {
         $user = $this->userRepo->getById($id);
 
         $userActivity = $this->userRepo->getActivity($user);
      */
     public function showProfilePage($id)
     {
         $user = $this->userRepo->getById($id);
 
         $userActivity = $this->userRepo->getActivity($user);

-        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5, 0);
+        $recentlyCreated = $this->userRepo->getRecentlyCreated($user, 5);

         $assetCounts = $this->userRepo->getAssetCounts($user);
 
         return view('users.profile', [
         $assetCounts = $this->userRepo->getAssetCounts($user);
 
         return view('users.profile', [


@@ -274,34 +259,32 @@ class UserController extends Controller
 
     /**
      * Update the user's preferred book-list display setting.
 
     /**
      * Update the user's preferred book-list display setting.

-     * @param $id
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse

      */
      */

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

     {
         return $this->switchViewType($id, $request, 'books');
     }
 
     /**
      * Update the user's preferred shelf-list display setting.
     {
         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)
+    public function switchShelvesView(Request $request, int $id)

     {
         return $this->switchViewType($id, $request, 'bookshelves');
     }
 
     {
         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.
     /**
      * 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);
 


@@ -319,12 +302,8 @@ class UserController extends Controller
 
     /**
      * Change the stored sort type for a particular view.
 
     /**
      * 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)
+    public function changeSort(Request $request, string $id, string $type)

     {
         $validSortTypes = ['books', 'bookshelves'];
         if (!in_array($type, $validSortTypes)) {
     {
         $validSortTypes = ['books', 'bookshelves'];
         if (!in_array($type, $validSortTypes)) {


@@ -333,14 +312,20 @@ class UserController extends Controller
         return $this->changeListSort($id, $request, $type);
     }
 
         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.
     /**
      * 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)
+    public function updateExpansionPreference(Request $request, string $id, string $key)

     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
         $keyWhitelist = ['home-details'];
     {
         $this->checkPermissionOrCurrentUser('users-manage', $id);
         $keyWhitelist = ['home-details'];


@@ -357,10 +342,6 @@ class UserController extends Controller
 
     /**
      * 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)
     {
      */
     protected function changeListSort(int $userId, Request $request, string $listName)
     {