Revert "auth"
This reverts commit e0b2e00a. # Conflicts: # app/Http/Controllers/AuthenticateController.php # config/jwt.php # public/files/js/interface.js
Showing
1 changed file
with
24 additions
and
22 deletions
| 1 | <? | 1 | <?php |
| 2 | |||
| 2 | namespace App; | 3 | namespace App; |
| 3 | use Illuminate\Auth\Authenticatable; use Illuminate\Database\Eloquent\Model; use Illuminate\Auth\Passwords\CanResetPassword; use Illuminate\Foundation\Auth\Access\Authorizable; use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; | ||
| 4 | class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract { use Authenticatable, Authorizable, CanResetPassword; | ||
| 5 | /** | ||
| 6 | * The database table used by the model. | ||
| 7 | * | ||
| 8 | * @var string | ||
| 9 | */ | ||
| 10 | protected $table = 'users'; | ||
| 11 | 4 | ||
| 12 | /** | ||
| 13 | * The attributes that are mass assignable. | ||
| 14 | * | ||
| 15 | * @var array | ||
| 16 | */ | ||
| 17 | protected $fillable = ['first_name', 'last_name', 'username', 'email', 'password']; | ||
| 18 | /** | ||
| 19 | * The attributes excluded from the model's JSON form. | ||
| 20 | * | ||
| 21 | * @var array | ||
| 22 | */ | ||
| 23 | protected $hidden = ['password']; | ||
| 24 | } | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 5 | use Illuminate\Foundation\Auth\User as Authenticatable; | ||
| 6 | |||
| 7 | class User extends Authenticatable | ||
| 8 | { | ||
| 9 | /** | ||
| 10 | * The attributes that are mass assignable. | ||
| 11 | * | ||
| 12 | * @var array | ||
| 13 | */ | ||
| 14 | protected $fillable = [ | ||
| 15 | 'name', 'email', 'password', | ||
| 16 | ]; | ||
| 17 | |||
| 18 | /** | ||
| 19 | * The attributes that should be hidden for arrays. | ||
| 20 | * | ||
| 21 | * @var array | ||
| 22 | */ | ||
| 23 | protected $hidden = [ | ||
| 24 | 'password', 'remember_token', | ||
| 25 | ]; | ||
| 26 | } | ... | ... |
-
Please register or sign in to post a comment