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 0a6849fe008323aca74f08cf108441a78b59a0c6..4e21832449d5a6ab1068e82e3b136c151bf72f6f 100644 (file)
--- a/app/Auth/User.php
+++ b/app/Auth/User.php
@@ -18,6 +18,7 @@ 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\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\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;


@@ -27,7 +28,7 @@ use Illuminate\Support\Collection;
 /**
  * Class User.
  *
 /**
  * Class User.
  *

- * @property string     $id
+ * @property int        $id

  * @property string     $name
  * @property string     $slug
  * @property string     $email
  * @property string     $name
  * @property string     $slug
  * @property string     $email


@@ -43,6 +44,7 @@ use Illuminate\Support\Collection;
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable
 {
  */
 class User extends Model implements AuthenticatableContract, CanResetPasswordContract, Loggable, Sluggable
 {

+    use HasFactory;

     use Authenticatable;
     use CanResetPassword;
     use Notifiable;
     use Authenticatable;
     use CanResetPassword;
     use Notifiable;


@@ -70,27 +72,25 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
      */
     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',
+        '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 ?Collection

      */
      */

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

 
     /**
      * This holds the default user when loaded.
      *
      * @var null|User
      */
 
     /**
      * This holds the default user when loaded.
      *
      * @var null|User
      */

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

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

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

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


@@ -144,7 +144,7 @@ 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);
         }


@@ -176,7 +176,6 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
             ->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)
             ->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)

-            ->get()

             ->pluck('name');
 
         return $this->permissions;
             ->pluck('name');
 
         return $this->permissions;


@@ -336,7 +335,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     /**
     }
 
     /**

-     * @inheritdoc
+     * {@inheritdoc}

      */
     public function logDescriptor(): string
     {
      */
     public function logDescriptor(): string
     {


@@ -344,7 +343,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
     }
 
     /**
     }
 
     /**

-     * @inheritDoc
+     * {@inheritdoc}

      */
     public function refreshSlug(): string
     {
      */
     public function refreshSlug(): string
     {