Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 06:34:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:invoiceninja/invoiceninja into develop

Browse Source
This commit is contained in:
Hillel Coren 2016-10-26 10:32:44 +03:00
commit 00d7df8850
1 changed files with 3 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
app/Models/User.php
View File

@ -5,19 +5,14 @@ use Event;
use App\Libraries\Utils; use App\Libraries\Utils;
use App\Events\UserSettingsChanged; use App\Events\UserSettingsChanged;
use App\Events\UserSignedUp; use App\Events\UserSignedUp;
use Illuminate\Auth\Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Foundation\Auth\Access\Authorizable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
/** /**
* Class User * Class User
*/ */
class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract { class User extends Authenticatable
{
/** /**
* @var array * @var array
*/ */
@ -27,8 +22,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
'edit_all' => 0b0100, 'edit_all' => 0b0100,
]; ];
use Authenticatable, Authorizable, CanResetPassword;
/** /**
* The database table used by the model. * The database table used by the model.
* *
@ -102,26 +95,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
return PERSON_USER; return PERSON_USER;
} }
/**
* Get the unique identifier for the user.
*
* @return mixed
*/
public function getAuthIdentifier()
{
return $this->getKey();
}
/**
* Get the password for the user.
*
* @return string
*/
public function getAuthPassword()
{
return $this->password;
}
/** /**
* Get the e-mail address where password reminders are sent. * Get the e-mail address where password reminders are sent.
* *
@ -258,31 +231,6 @@ class User extends Model implements AuthenticatableContract, AuthorizableContrac
return MAX_NUM_VENDORS; return MAX_NUM_VENDORS;
} }
/**
* @return mixed
*/
public function getRememberToken()
{
return $this->remember_token;
}
/**
* @param string $value
*/
public function setRememberToken($value)
{
$this->remember_token = $value;
}
/**
* @return string
*/
public function getRememberTokenName()
{
return 'remember_token';
}
public function clearSession() public function clearSession()
{ {
$keys = [ $keys = [