Tiny header

[bookstack] / app / Auth / User.php

diff --git a/app/Auth/User.php b/app/Auth/User.php
index 540a8d7abbe0d5ebd7f49ed34bd8957ec2b93e79..4e21832449d5a6ab1068e82e3b136c151bf72f6f 100644 (file)
--- a/app/Auth/User.php
+++ b/app/Auth/User.php
@@ -72,22 +72,20 @@ 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.


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