Skip intermediate login page with single provider

[bookstack] / app / Auth / Role.php

diff --git a/app/Auth/Role.php b/app/Auth/Role.php
index b32954767086ed5808a161d527bb586739472201..51b2ce301eae721fd1a7beb7e0d871f6c522836e 100644 (file)
--- a/app/Auth/Role.php
+++ b/app/Auth/Role.php
@@ -1,27 +1,47 @@
-<?php namespace BookStack\Auth;
+<?php
+
+namespace BookStack\Auth;

 
 use BookStack\Auth\Permissions\JointPermission;
 
 use BookStack\Auth\Permissions\JointPermission;

-use BookStack\Model;

 use BookStack\Auth\Permissions\RolePermission;
 use BookStack\Auth\Permissions\RolePermission;

+use BookStack\Interfaces\Loggable;
+use BookStack\Model;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
+use Illuminate\Database\Eloquent\Relations\HasMany;

 
 

-class Role extends Model
+/**
+ * Class Role.
+ *
+ * @property int        $id
+ * @property string     $display_name
+ * @property string     $description
+ * @property string     $external_auth_id
+ * @property string     $system_name
+ * @property bool       $mfa_enforced
+ * @property Collection $users
+ */
+class Role extends Model implements Loggable

 {
 {

+    use HasFactory;

 
     protected $fillable = ['display_name', 'description', 'external_auth_id'];
 
 
     protected $fillable = ['display_name', 'description', 'external_auth_id'];
 

+    protected $hidden = ['pivot'];
+

     /**
      * The roles that belong to the role.
      */
     /**
      * The roles that belong to the role.
      */

-    public function users()
+    public function users(): BelongsToMany

     {
     {

-        return $this->belongsToMany(User::class);
+        return $this->belongsToMany(User::class)->orderBy('name', 'asc');

     }
 
     /**
      * Get all related JointPermissions.
     }
 
     /**
      * Get all related JointPermissions.

-     * @return \Illuminate\Database\Eloquent\Relations\HasMany

      */
      */

-    public function jointPermissions()
+    public function jointPermissions(): HasMany

     {
         return $this->hasMany(JointPermission::class);
     }
     {
         return $this->hasMany(JointPermission::class);
     }


@@ -29,17 +49,15 @@ class Role extends Model
     /**
      * The RolePermissions that belong to the role.
      */
     /**
      * The RolePermissions that belong to the role.
      */

-    public function permissions()
+    public function permissions(): BelongsToMany

     {
     {

-        return $this->belongsToMany(Permissions\RolePermission::class, 'permission_role', 'role_id', 'permission_id');
+        return $this->belongsToMany(RolePermission::class, 'permission_role', 'role_id', 'permission_id');

     }
 
     /**
      * Check if this role has a permission.
     }
 
     /**
      * Check if this role has a permission.

-     * @param $permissionName
-     * @return bool

      */
      */

-    public function hasPermission($permissionName)
+    public function hasPermission(string $permissionName): bool

     {
         $permissions = $this->getRelationValue('permissions');
         foreach ($permissions as $permission) {
     {
         $permissions = $this->getRelationValue('permissions');
         foreach ($permissions as $permission) {


@@ -47,53 +65,66 @@ class Role extends Model
                 return true;
             }
         }
                 return true;
             }
         }

+

         return false;
     }
 
     /**
      * Add a permission to this role.
         return false;
     }
 
     /**
      * Add a permission to this role.

-     * @param \BookStack\Auth\Permissions\RolePermission $permission

      */
      */

-    public function attachPermission(Permissions\RolePermission $permission)
+    public function attachPermission(RolePermission $permission)

     {
         $this->permissions()->attach($permission->id);
     }
 
     /**
      * Detach a single permission from this role.
     {
         $this->permissions()->attach($permission->id);
     }
 
     /**
      * Detach a single permission from this role.

-     * @param \BookStack\Auth\Permissions\RolePermission $permission

      */
      */

-    public function detachPermission(Permissions\RolePermission $permission)
+    public function detachPermission(RolePermission $permission)

     {
     {

-        $this->permissions()->detach($permission->id);
+        $this->permissions()->detach([$permission->id]);

     }
 
     /**
     }
 
     /**

-     * Get the role object for the specified role.
-     * @param $roleName
-     * @return Role
+     * Get the role of the specified display name.

      */
      */

-    public static function getRole($roleName)
+    public static function getRole(string $displayName): ?self

     {
     {

-        return static::where('name', '=', $roleName)->first();
+        return static::query()->where('display_name', '=', $displayName)->first();

     }
 
     /**
      * Get the role object for the specified system role.
     }
 
     /**
      * Get the role object for the specified system role.

-     * @param $roleName
-     * @return Role

      */
      */

-    public static function getSystemRole($roleName)
+    public static function getSystemRole(string $systemName): ?self
+    {
+        return static::query()->where('system_name', '=', $systemName)->first();
+    }
+
+    /**
+     * Get all visible roles.
+     */
+    public static function visible(): Collection
+    {
+        return static::query()->where('hidden', '=', false)->orderBy('name')->get();
+    }
+
+    /**
+     * Get the roles that can be restricted.
+     */
+    public static function restrictable(): Collection

     {
     {

-        return static::where('system_name', '=', $roleName)->first();
+        return static::query()
+            ->where('system_name', '!=', 'admin')
+            ->orderBy('display_name', 'asc')
+            ->get();

     }
 
     /**
     }
 
     /**

-     * Get all visible roles
-     * @return mixed
+     * {@inheritdoc}

      */
      */

-    public static function visible()
+    public function logDescriptor(): string

     {
     {

-        return static::where('hidden', '=', false)->orderBy('name')->get();
+        return "({$this->id}) {$this->display_name}";

     }
 }
     }
 }