Fixed OIDC Logout

[bookstack] / app / Users / Controllers / UserPreferencesController.php

diff --git a/app/Users/Controllers/UserPreferencesController.php b/app/Users/Controllers/UserPreferencesController.php
index faa99629b349db365b1f39918f7d91944657bc7c..503aeaeb0c9d23032746cf72fd67634678f2aa43 100644 (file)
--- a/app/Users/Controllers/UserPreferencesController.php
+++ b/app/Users/Controllers/UserPreferencesController.php
@@ -2,7 +2,9 @@
 
 namespace BookStack\Users\Controllers;
 
 
 namespace BookStack\Users\Controllers;
 

+use BookStack\Activity\Models\Watch;

 use BookStack\Http\Controller;
 use BookStack\Http\Controller;

+use BookStack\Permissions\PermissionApplicator;

 use BookStack\Settings\UserNotificationPreferences;
 use BookStack\Settings\UserShortcutMap;
 use BookStack\Users\UserRepo;
 use BookStack\Settings\UserNotificationPreferences;
 use BookStack\Settings\UserShortcutMap;
 use BookStack\Users\UserRepo;


@@ -15,6 +17,14 @@ class UserPreferencesController extends Controller
     ) {
     }
 
     ) {
     }
 

+    /**
+     * Show the overview for user preferences.
+     */
+    public function index()
+    {
+        return view('users.preferences.index');
+    }
+

     /**
      * Show the user-specific interface shortcuts.
      */
     /**
      * Show the user-specific interface shortcuts.
      */


@@ -23,6 +33,8 @@ class UserPreferencesController extends Controller
         $shortcuts = UserShortcutMap::fromUserPreferences();
         $enabled = setting()->getForCurrentUser('ui-shortcuts-enabled', false);
 
         $shortcuts = UserShortcutMap::fromUserPreferences();
         $enabled = setting()->getForCurrentUser('ui-shortcuts-enabled', false);
 

+        $this->setPageTitle(trans('preferences.shortcuts_interface'));
+

         return view('users.preferences.shortcuts', [
             'shortcuts' => $shortcuts,
             'enabled' => $enabled,
         return view('users.preferences.shortcuts', [
             'shortcuts' => $shortcuts,
             'enabled' => $enabled,


@@ -49,12 +61,21 @@ class UserPreferencesController extends Controller
     /**
      * Show the notification preferences for the current user.
      */
     /**
      * Show the notification preferences for the current user.
      */

-    public function showNotifications()
+    public function showNotifications(PermissionApplicator $permissions)

     {
     {

+        $this->checkPermission('receive-notifications');
+        $this->preventGuestAccess();
+

         $preferences = (new UserNotificationPreferences(user()));
 
         $preferences = (new UserNotificationPreferences(user()));
 

+        $query = Watch::query()->where('user_id', '=', user()->id);
+        $query = $permissions->restrictEntityRelationQuery($query, 'watches', 'watchable_id', 'watchable_type');
+        $watches = $query->with('watchable')->paginate(20);
+
+        $this->setPageTitle(trans('preferences.notifications'));

         return view('users.preferences.notifications', [
             'preferences' => $preferences,
         return view('users.preferences.notifications', [
             'preferences' => $preferences,

+            'watches' => $watches,

         ]);
     }
 
         ]);
     }
 


@@ -63,6 +84,8 @@ class UserPreferencesController extends Controller
      */
     public function updateNotifications(Request $request)
     {
      */
     public function updateNotifications(Request $request)
     {

+        $this->checkPermission('receive-notifications');
+        $this->preventGuestAccess();

         $data = $this->validate($request, [
            'preferences' => ['required', 'array'],
            'preferences.*' => ['required', 'string'],
         $data = $this->validate($request, [
            'preferences' => ['required', 'array'],
            'preferences.*' => ['required', 'string'],