Added OIDC group sync functionality

[bookstack] / app / Entities / Models / Entity.php

diff --git a/app/Entities/Models/Entity.php b/app/Entities/Models/Entity.php
index b5533429517e12f8263cd02f8dfae328b5403c36..17f018a566a01f76db1e39d64557b71cf2671c1e 100644 (file)
--- a/app/Entities/Models/Entity.php
+++ b/app/Entities/Models/Entity.php
@@ -9,9 +9,10 @@ use BookStack\Actions\Tag;
 use BookStack\Actions\View;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\JointPermission;
 use BookStack\Actions\View;
 use BookStack\Auth\Permissions\EntityPermission;
 use BookStack\Auth\Permissions\JointPermission;

+use BookStack\Auth\Permissions\JointPermissionBuilder;
+use BookStack\Auth\Permissions\PermissionApplicator;

 use BookStack\Entities\Tools\SearchIndex;
 use BookStack\Entities\Tools\SlugGenerator;
 use BookStack\Entities\Tools\SearchIndex;
 use BookStack\Entities\Tools\SlugGenerator;

-use BookStack\Facades\Permissions;

 use BookStack\Interfaces\Deletable;
 use BookStack\Interfaces\Favouritable;
 use BookStack\Interfaces\Loggable;
 use BookStack\Interfaces\Deletable;
 use BookStack\Interfaces\Favouritable;
 use BookStack\Interfaces\Loggable;


@@ -36,13 +37,13 @@ use Illuminate\Database\Eloquent\SoftDeletes;
  * @property string     $slug
  * @property Carbon     $created_at
  * @property Carbon     $updated_at
  * @property string     $slug
  * @property Carbon     $created_at
  * @property Carbon     $updated_at

+ * @property Carbon     $deleted_at

  * @property int        $created_by
  * @property int        $updated_by
  * @property bool       $restricted
  * @property Collection $tags
  *
  * @method static Entity|Builder visible()
  * @property int        $created_by
  * @property int        $updated_by
  * @property bool       $restricted
  * @property Collection $tags
  *
  * @method static Entity|Builder visible()

- * @method static Entity|Builder hasPermission(string $permission)

  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */
  * @method static Builder withLastView()
  * @method static Builder withViewCount()
  */


@@ -67,15 +68,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function scopeVisible(Builder $query): Builder
     {
      */
     public function scopeVisible(Builder $query): Builder
     {

-        return $this->scopeHasPermission($query, 'view');
-    }
-
-    /**
-     * Scope the query to those entities that the current user has the given permission for.
-     */
-    public function scopeHasPermission(Builder $query, string $permission)
-    {
-        return Permissions::restrictEntityQuery($query, $permission);
+        return app()->make(PermissionApplicator::class)->restrictEntityQuery($query);

     }
 
     /**
     }
 
     /**


@@ -283,8 +276,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function rebuildPermissions()
     {
      */
     public function rebuildPermissions()
     {

-        /** @noinspection PhpUnhandledExceptionInspection */
-        Permissions::buildJointPermissionsForEntity(clone $this);
+        app()->make(JointPermissionBuilder::class)->rebuildForEntity(clone $this);

     }
 
     /**
     }
 
     /**


@@ -292,7 +284,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function indexForSearch()
     {
      */
     public function indexForSearch()
     {

-        app(SearchIndex::class)->indexEntity(clone $this);
+        app()->make(SearchIndex::class)->indexEntity(clone $this);

     }
 
     /**
     }
 
     /**


@@ -300,7 +292,7 @@ abstract class Entity extends Model implements Sluggable, Favouritable, Viewable
      */
     public function refreshSlug(): string
     {
      */
     public function refreshSlug(): string
     {

-        $this->slug = app(SlugGenerator::class)->generate($this);
+        $this->slug = app()->make(SlugGenerator::class)->generate($this);

 
         return $this->slug;
     }
 
         return $this->slug;
     }