geolba/tethys
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity

my changes

Browse source
This commit is contained in:
Arno Kaimbacher 2018-08-06 14:30:51 +02:00
parent 28301e4312
commit 8dc1f1b048
263 changed files with 36882 additions and 4453 deletions
Download patch file Download diff file Expand all files Collapse all files

114
app/User.php
View file

@ -1,70 +1,88 @@
<?php namespace App;
<?php
namespace App;
use Illuminate\Auth\Authenticatable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
#use Illuminate\Foundation\Auth\User as Authenticatable;
use Spatie\Permission\Traits\HasRoles;
use Illuminate\Support\Facades\Hash;
class User extends Model implements AuthenticatableContract, CanResetPasswordContract {
class User extends Model implements AuthenticatableContract, CanResetPasswordContract, AuthorizableContract
{
use Authenticatable, CanResetPassword;
use Authenticatable, CanResetPassword, Authorizable;
use HasRoles;
/**
* The database table used by the model.
*
* @var string
*/
protected $table = 'users';
/**
* The database table used by the model.
*
* @var string
*/
protected $table = 'accounts';
public $timestamps = false;
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = ['name', 'email', 'password'];
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = ['login', 'email', 'password'];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
protected $hidden = ['password', 'remember_token'];
/**
* The attributes excluded from the model's JSON form.
*
* @var array
*/
protected $hidden = ['password', 'remember_token'];
public function roles()
public function setPasswordAttribute($password)
{
return $this->belongsToMany('App\Role');
if ($password) {
$this->attributes['password'] = app('hash')->needsRehash($password) ? Hash::make($password) : $password;
}
}
public function assignRole($role)
//public function roles()
//{
// return $this->belongsToMany(\App\Role::class, 'link_accounts_roles', 'account_id', 'role_id');
//}
public function is($roleName)
{
return $this->roles()->attach($role);
}
public function revokeRole($role)
{
return $this->roles()->detach($role);
}
public function hasRole($name)
{
foreach ($this->roles as $role) {
if ($role->name === $name) {
foreach ($this->roles()->get() as $role) {
if ($role->name == $roleName) {
return true;
}
return false;
}
return false;
}
// public function assignRole($role)
// {
// return $this->roles()->attach($role);
// }
// public function revokeRole($role)
// {
// return $this->roles()->detach($role);
// }
// public function hasRole($name)
// {
// foreach ($this->roles as $role)
// {
// if ($role->name === $name)
// {
// return true;
// }
// return false;
// }
// return false;
// }
}