Skip intermediate login page with single provider

[bookstack] / app / Auth / User.php

diff --git a/app/Auth/User.php b/app/Auth/User.php
index 28fb9c7fc2e17482518b8eee7886f151a5342be5..4e21832449d5a6ab1068e82e3b136c151bf72f6f 100644 (file)
--- a/app/Auth/User.php
+++ b/app/Auth/User.php
@@ -1,119 +1,142 @@
-<?php namespace BookStack\Auth;
+<?php

 
 

+namespace BookStack\Auth;
+
+use BookStack\Actions\Favourite;

 use BookStack\Api\ApiToken;
 use BookStack\Api\ApiToken;

+use BookStack\Auth\Access\Mfa\MfaValue;
+use BookStack\Entities\Tools\SlugGenerator;
+use BookStack\Interfaces\Loggable;
+use BookStack\Interfaces\Sluggable;

 use BookStack\Model;
 use BookStack\Notifications\ResetPassword;
 use BookStack\Uploads\Image;
 use Carbon\Carbon;
 use BookStack\Model;
 use BookStack\Notifications\ResetPassword;
 use BookStack\Uploads\Image;
 use Carbon\Carbon;

+use Exception;

 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
 use Illuminate\Auth\Authenticatable;
 use Illuminate\Auth\Passwords\CanResetPassword;
 use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
 use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;

+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;

 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Notifications\Notifiable;

+use Illuminate\Support\Collection;

 
 /**
 
 /**

- * Class User
- * @package BookStack\Auth
- * @property string $id
- * @property string $name
- * @property string $email
- * @property string $password
- * @property Carbon $created_at
- * @property Carbon $updated_at
- * @property bool $email_confirmed
- * @property int $image_id
- * @property string $external_auth_id
- * @property string $system_name
+ * Class User.
+ *
+ * @property int        $id
+ * @property string     $name
+ * @property string     $slug
+ * @property string     $email
+ * @property string     $password
+ * @property Carbon     $created_at
+ * @property Carbon     $updated_at
+ * @property bool       $email_confirmed
+ * @property int        $image_id
+ * @property string     $external_auth_id
+ * @property string     $system_name
+ * @property Collection $roles
+ * @property Collection $mfaValues

  */
  */

-class User extends Model implements AuthenticatableContract, CanResetPasswordContract
+class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable

 {
 {

-    use Authenticatable, CanResetPassword, Notifiable;
+    use HasFactory;
+    use Authenticatable;
+    use CanResetPassword;
+    use Notifiable;

 
     /**
      * The database table used by the model.
 
     /**
      * The database table used by the model.

+     *

      * @var string
      */
     protected $table = 'users';
 
     /**
      * The attributes that are mass assignable.
      * @var string
      */
     protected $table = 'users';
 
     /**
      * The attributes that are mass assignable.

+     *

      * @var array
      */
     protected $fillable = ['name', 'email'];
 
      * @var array
      */
     protected $fillable = ['name', 'email'];
 

+    protected $casts = ['last_activity_at' => 'datetime'];
+

     /**
      * The attributes excluded from the model's JSON form.
     /**
      * The attributes excluded from the model's JSON form.

+     *

      * @var array
      */
      * @var array
      */

-    protected $hidden = ['password', 'remember_token', 'system_name', 'email_confirmed', 'external_auth_id', 'email'];
+    protected $hidden = [
+        'password', 'remember_token', 'system_name', 'email_confirmed', 'external_auth_id', 'email',
+        'created_at', 'updated_at', 'image_id', 'roles', 'avatar', 'user_id',
+    ];

 
     /**
      * This holds the user's permissions when loaded.
 
     /**
      * This holds the user's permissions when loaded.

-     * @var array

      */
      */

-    protected $permissions;
+    protected ?Collection $permissions;

 
     /**
      * This holds the default user when loaded.
 
     /**
      * This holds the default user when loaded.

+     *

      * @var null|User
      */
      * @var null|User
      */

-    protected static $defaultUser = null;
+    protected static ?User $defaultUser = null;

 
     /**
      * Returns the default public user.
 
     /**
      * Returns the default public user.

-     * @return User

      */
      */

-    public static function getDefault()
+    public static function getDefault(): self

     {
         if (!is_null(static::$defaultUser)) {
             return static::$defaultUser;
         }
     {
         if (!is_null(static::$defaultUser)) {
             return static::$defaultUser;
         }

-        
-        static::$defaultUser = static::where('system_name', '=', 'public')->first();
+
+        static::$defaultUser = static::query()->where('system_name', '=', 'public')->first();
+

         return static::$defaultUser;
     }
 
     /**
      * Check if the user is the default public user.
         return static::$defaultUser;
     }
 
     /**
      * Check if the user is the default public user.

-     * @return bool

      */
      */

-    public function isDefault()
+    public function isDefault(): bool

     {
         return $this->system_name === 'public';
     }
 
     /**
      * The roles that belong to the user.
     {
         return $this->system_name === 'public';
     }
 
     /**
      * The roles that belong to the user.

+     *

      * @return BelongsToMany
      */
     public function roles()
     {
         if ($this->id === 0) {
      * @return BelongsToMany
      */
     public function roles()
     {
         if ($this->id === 0) {

-            return ;
+            return;

         }
         }

+

         return $this->belongsToMany(Role::class);
     }
 
     /**
      * Check if the user has a role.
         return $this->belongsToMany(Role::class);
     }
 
     /**
      * Check if the user has a role.

-     * @param $role
-     * @return mixed

      */
      */

-    public function hasRole($role)
+    public function hasRole($roleId): bool

     {
     {

-        return $this->roles->pluck('name')->contains($role);
+        return $this->roles->pluck('id')->contains($roleId);

     }
 
     /**
      * Check if the user has a role.
     }
 
     /**
      * Check if the user has a role.

-     * @param $role
-     * @return mixed

      */
      */

-    public function hasSystemRole($role)
+    public function hasSystemRole(string $roleSystemName): bool

     {
     {

-        return $this->roles->pluck('system_name')->contains($role);
+        return $this->roles->pluck('system_name')->contains($roleSystemName);

     }
 
     /**
     }
 
     /**


@@ -121,46 +144,53 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function attachDefaultRole(): void
     {
      */
     public function attachDefaultRole(): void
     {

-        $roleId = setting('registration-role');
+        $roleId = intval(setting('registration-role'));

         if ($roleId && $this->roles()->where('id', '=', $roleId)->count() === 0) {
             $this->roles()->attach($roleId);
         }
     }
 
         if ($roleId && $this->roles()->where('id', '=', $roleId)->count() === 0) {
             $this->roles()->attach($roleId);
         }
     }
 

+    /**
+     * Check if the user has a particular permission.
+     */
+    public function can(string $permissionName): bool
+    {
+        if ($this->email === 'guest') {
+            return false;
+        }
+
+        return $this->permissions()->contains($permissionName);
+    }
+

     /**
      * Get all permissions belonging to a the current user.
     /**
      * Get all permissions belonging to a the current user.

-     * @param bool $cache
-     * @return \Illuminate\Database\Eloquent\Relations\HasManyThrough

      */
      */

-    public function permissions($cache = true)
+    protected function permissions(): Collection

     {
     {

-        if (isset($this->permissions) && $cache) {
+        if (isset($this->permissions)) {

             return $this->permissions;
         }
             return $this->permissions;
         }

-        $this->load('roles.permissions');
-        $permissions = $this->roles->map(function ($role) {
-            return $role->permissions;
-        })->flatten()->unique();
-        $this->permissions = $permissions;
-        return $permissions;
+
+        $this->permissions = $this->newQuery()->getConnection()->table('role_user', 'ru')
+            ->select('role_permissions.name as name')->distinct()
+            ->leftJoin('permission_role', 'ru.role_id', '=', 'permission_role.role_id')
+            ->leftJoin('role_permissions', 'permission_role.permission_id', '=', 'role_permissions.id')
+            ->where('ru.user_id', '=', $this->id)
+            ->pluck('name');
+
+        return $this->permissions;

     }
 
     /**
     }
 
     /**

-     * Check if the user has a particular permission.
-     * @param $permissionName
-     * @return bool
+     * Clear any cached permissions on this instance.

      */
      */

-    public function can($permissionName)
+    public function clearPermissionCache()

     {
     {

-        if ($this->email === 'guest') {
-            return false;
-        }
-        return $this->permissions()->pluck('name')->contains($permissionName);
+        $this->permissions = null;

     }
 
     /**
      * Attach a role to this user.
     }
 
     /**
      * Attach a role to this user.

-     * @param Role $role

      */
     public function attachRole(Role $role)
     {
      */
     public function attachRole(Role $role)
     {


@@ -169,9 +199,8 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     /**
      * Get the social account associated with this user.
 
     /**
      * Get the social account associated with this user.

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

      */
      */

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

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


@@ -179,7 +208,9 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     /**
      * Check if the user has a social account,
      * If a driver is passed it checks for that single account type.
     /**
      * Check if the user has a social account,
      * If a driver is passed it checks for that single account type.

+     *

      * @param bool|string $socialDriver
      * @param bool|string $socialDriver

+     *

      * @return bool
      */
     public function hasSocialAccount($socialDriver = false)
      * @return bool
      */
     public function hasSocialAccount($socialDriver = false)


@@ -192,11 +223,9 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     /**
     }
 
     /**

-     * Returns the user's avatar,
-     * @param int $size
-     * @return string
+     * Returns a URL to the user's avatar.

      */
      */

-    public function getAvatar($size = 50)
+    public function getAvatar(int $size = 50): string

     {
         $default = url('/user_avatar.png');
         $imageId = $this->image_id;
     {
         $default = url('/user_avatar.png');
         $imageId = $this->image_id;


@@ -206,17 +235,17 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
         try {
             $avatar = $this->avatar ? url($this->avatar->getThumb($size, $size, false)) : $default;
 
         try {
             $avatar = $this->avatar ? url($this->avatar->getThumb($size, $size, false)) : $default;

-        } catch (\Exception $err) {
+        } catch (Exception $err) {

             $avatar = $default;
         }
             $avatar = $default;
         }

+

         return $avatar;
     }
 
     /**
      * Get the avatar for the user.
         return $avatar;
     }
 
     /**
      * Get the avatar for the user.

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

      */
      */

-    public function avatar()
+    public function avatar(): BelongsTo

     {
         return $this->belongsTo(Image::class, 'image_id');
     }
     {
         return $this->belongsTo(Image::class, 'image_id');
     }


@@ -229,12 +258,42 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
         return $this->hasMany(ApiToken::class);
     }
 
         return $this->hasMany(ApiToken::class);
     }
 

+    /**
+     * Get the favourite instances for this user.
+     */
+    public function favourites(): HasMany
+    {
+        return $this->hasMany(Favourite::class);
+    }
+
+    /**
+     * Get the MFA values belonging to this use.
+     */
+    public function mfaValues(): HasMany
+    {
+        return $this->hasMany(MfaValue::class);
+    }
+
+    /**
+     * Get the last activity time for this user.
+     */
+    public function scopeWithLastActivityAt(Builder $query)
+    {
+        $query->addSelect(['activities.created_at as last_activity_at'])
+            ->leftJoinSub(function (\Illuminate\Database\Query\Builder $query) {
+                $query->from('activities')->select('user_id')
+                    ->selectRaw('max(created_at) as created_at')
+                    ->groupBy('user_id');
+            }, 'activities', 'users.id', '=', 'activities.user_id');
+    }
+

     /**
      * Get the url for editing this user.
      */
     public function getEditUrl(string $path = ''): string
     {
         $uri = '/settings/users/' . $this->id . '/' . trim($path, '/');
     /**
      * Get the url for editing this user.
      */
     public function getEditUrl(string $path = ''): string
     {
         $uri = '/settings/users/' . $this->id . '/' . trim($path, '/');

+

         return url(rtrim($uri, '/'));
     }
 
         return url(rtrim($uri, '/'));
     }
 


@@ -243,15 +302,13 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     public function getProfileUrl(): string
     {
      */
     public function getProfileUrl(): string
     {

-        return url('/user/' . $this->id);
+        return url('/user/' . $this->slug);

     }
 
     /**
      * Get a shortened version of the user's name.
     }
 
     /**
      * Get a shortened version of the user's name.

-     * @param int $chars
-     * @return string

      */
      */

-    public function getShortName($chars = 8)
+    public function getShortName(int $chars = 8): string

     {
         if (mb_strlen($this->name) <= $chars) {
             return $this->name;
     {
         if (mb_strlen($this->name) <= $chars) {
             return $this->name;


@@ -267,11 +324,31 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
 
     /**
      * Send the password reset notification.
 
     /**
      * Send the password reset notification.

-     * @param  string  $token
+     *
+     * @param string $token
+     *

      * @return void
      */
     public function sendPasswordResetNotification($token)
     {
         $this->notify(new ResetPassword($token));
     }
      * @return void
      */
     public function sendPasswordResetNotification($token)
     {
         $this->notify(new ResetPassword($token));
     }

+
+    /**
+     * {@inheritdoc}
+     */
+    public function logDescriptor(): string
+    {
+        return "({$this->id}) {$this->name}";
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function refreshSlug(): string
+    {
+        $this->slug = app(SlugGenerator::class)->generate($this);
+
+        return $this->slug;
+    }

 }
 }