Fixed issue where default user was over-fetched

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
index 8461ed0ba18365574911168e9a3e091a1504f2ac..b7801668882cd5726c2adad97312228d7c14913b 100644 (file)
--- a/app/Http/Middleware/Authenticate.php
+++ b/app/Http/Middleware/Authenticate.php
@@ -4,8 +4,6 @@ namespace BookStack\Http\Middleware;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;

-use BookStack\Exceptions\UserRegistrationException;
-use Setting;

 
 class Authenticate
 {
 
 class Authenticate
 {

diff --git a/app/Services/ViewService.php b/app/Services/ViewService.php
index 1a9ee5f707fa8a2eae3264ad284d5a77c96df3f3..73b353d8f0a989cb40f93b9269e5dcdbb1d0b8bf 100644 (file)
--- a/app/Services/ViewService.php
+++ b/app/Services/ViewService.php
@@ -5,9 +5,7 @@ use BookStack\View;
 
 class ViewService
 {
 
 class ViewService
 {

-

     protected $view;
     protected $view;

-    protected $user;

     protected $permissionService;
 
     /**
     protected $permissionService;
 
     /**


@@ -18,7 +16,6 @@ class ViewService
     public function __construct(View $view, PermissionService $permissionService)
     {
         $this->view = $view;
     public function __construct(View $view, PermissionService $permissionService)
     {
         $this->view = $view;

-        $this->user = user();

         $this->permissionService = $permissionService;
     }
 
         $this->permissionService = $permissionService;
     }
 


@@ -29,8 +26,9 @@ class ViewService
      */
     public function add(Entity $entity)
     {
      */
     public function add(Entity $entity)
     {

-        if ($this->user === null) return 0;
-        $view = $entity->views()->where('user_id', '=', $this->user->id)->first();
+        $user = user();
+        if ($user === null || $user->isDefault()) return 0;
+        $view = $entity->views()->where('user_id', '=', $user->id)->first();

         // Add view if model exists
         if ($view) {
             $view->increment('views');
         // Add view if model exists
         if ($view) {
             $view->increment('views');


@@ -39,7 +37,7 @@ class ViewService
 
         // Otherwise create new view count
         $entity->views()->save($this->view->create([
 
         // Otherwise create new view count
         $entity->views()->save($this->view->create([

-            'user_id' => $this->user->id,
+            'user_id' => user()->id,

             'views' => 1
         ]));
 
             'views' => 1
         ]));
 


@@ -78,13 +76,14 @@ class ViewService
      */
     public function getUserRecentlyViewed($count = 10, $page = 0, $filterModel = false)
     {
      */
     public function getUserRecentlyViewed($count = 10, $page = 0, $filterModel = false)
     {

-        if ($this->user === null) return collect();
+        $user = user();
+        if ($user === null || $user->isDefault()) return collect();

 
         $query = $this->permissionService
             ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
 
         if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));
 
         $query = $this->permissionService
             ->filterRestrictedEntityRelations($this->view, 'views', 'viewable_id', 'viewable_type');
 
         if ($filterModel) $query = $query->where('viewable_type', '=', get_class($filterModel));

-        $query = $query->where('user_id', '=', user()->id);
+        $query = $query->where('user_id', '=', $user->id);

 
         $viewables = $query->with('viewable')->orderBy('updated_at', 'desc')
             ->skip($count * $page)->take($count)->get()->pluck('viewable');
 
         $viewables = $query->with('viewable')->orderBy('updated_at', 'desc')
             ->skip($count * $page)->take($count)->get()->pluck('viewable');