Extend /users API endpoint

[bookstack] / app / Entities / Tools / SearchRunner.php

diff --git a/app/Entities/Tools/SearchRunner.php b/app/Entities/Tools/SearchRunner.php
index acfe8d9565fdf1ea2884d337e31e0402270f6cb9..fc127f9068a49075d8cd14c2ad0e87968f96dd5b 100644 (file)
--- a/app/Entities/Tools/SearchRunner.php
+++ b/app/Entities/Tools/SearchRunner.php
@@ -1,6 +1,7 @@
 <?php namespace BookStack\Entities\Tools;
 
 use BookStack\Auth\Permissions\PermissionService;
 <?php namespace BookStack\Entities\Tools;
 
 use BookStack\Auth\Permissions\PermissionService;

+use BookStack\Auth\User;

 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
 use Illuminate\Database\Connection;
 use BookStack\Entities\EntityProvider;
 use BookStack\Entities\Models\Entity;
 use Illuminate\Database\Connection;


@@ -178,7 +179,7 @@ class SearchRunner
             }
         }
 
             }
         }
 

-        return $this->permissionService->enforceEntityRestrictions($entityType, $entitySelect, $action);
+        return $this->permissionService->enforceEntityRestrictions($entity, $entitySelect, $action);

     }
 
     /**
     }
 
     /**


@@ -270,24 +271,29 @@ class SearchRunner
 
     protected function filterCreatedBy(EloquentBuilder $query, Entity $model, $input)
     {
 
     protected function filterCreatedBy(EloquentBuilder $query, Entity $model, $input)
     {

-        if (!is_numeric($input) && $input !== 'me') {
-            return;
-        }
-        if ($input === 'me') {
-            $input = user()->id;
+        $userSlug = $input === 'me' ? user()->slug : trim($input);
+        $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
+        if ($user) {
+            $query->where('created_by', '=', $user->id);

         }
         }

-        $query->where('created_by', '=', $input);

     }
 
     protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, $input)
     {
     }
 
     protected function filterUpdatedBy(EloquentBuilder $query, Entity $model, $input)
     {

-        if (!is_numeric($input) && $input !== 'me') {
-            return;
+        $userSlug = $input === 'me' ? user()->slug : trim($input);
+        $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
+        if ($user) {
+            $query->where('updated_by', '=', $user->id);

         }
         }

-        if ($input === 'me') {
-            $input = user()->id;
+    }
+
+    protected function filterOwnedBy(EloquentBuilder $query, Entity $model, $input)
+    {
+        $userSlug = $input === 'me' ? user()->slug : trim($input);
+        $user = User::query()->where('slug', '=', $userSlug)->first(['id']);
+        if ($user) {
+            $query->where('owned_by', '=', $user->id);

         }
         }

-        $query->where('updated_by', '=', $input);

     }
 
     protected function filterInName(EloquentBuilder $query, Entity $model, $input)
     }
 
     protected function filterInName(EloquentBuilder $query, Entity $model, $input)