Merge branch 'authentication' into user_management

This commit is contained in:
Michal Kváček
2016-01-21 11:53:24 +01:00
5 changed files with 25 additions and 21 deletions
+6 -7
View File
@@ -2,25 +2,24 @@
namespace App\Models;
use App\Http\Requests\Request;
use Illuminate\Auth\Authenticatable;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticableInterface;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\Validator;
use Illuminate\Validation\ValidationException;
use Symfony\Component\Process\Exception\InvalidArgumentException;
use Illuminate\Foundation\Auth\Access\Authorizable;
/**
* Class User
*/
class User extends Model
class User extends Model implements AuthenticableInterface
{
use Authenticatable, Authorizable, CanResetPassword;
public $timestamps = false;
protected $fillable = [
'email',
'username',
'password',
'role',
'name',
'status'
];
protected $guarded = [];
/**