Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Added new 'Auth::viaRemember method to determine if user was authed v…
…ia 'remember me' cookie.
- Loading branch information
|
@@ -16,6 +16,13 @@ class Guard { |
|
|
*/ |
|
|
protected $user; |
|
|
|
|
|
/** |
|
|
* Indicates if the user was authenticated via a recaller cookie. |
|
|
* |
|
|
* @var bool |
|
|
*/ |
|
|
protected $viaRemember = false; |
|
|
|
|
|
/** |
|
|
* The user provider implementation. |
|
|
* |
|
@@ -131,6 +138,8 @@ public function user() |
|
|
if (is_null($user) and ! is_null($recaller)) |
|
|
{ |
|
|
$user = $this->provider->retrieveByID($recaller); |
|
|
|
|
|
$this->viaRemember = ! is_null($user); |
|
|
} |
|
|
|
|
|
return $this->user = $user; |
|
@@ -578,4 +587,14 @@ public function getRecallerName() |
|
|
return 'remember_'.md5(get_class($this)); |
|
|
} |
|
|
|
|
|
/** |
|
|
* Determine if the user was authenticated via "remember me" cookie. |
|
|
* |
|
|
* @return bool |
|
|
*/ |
|
|
public function viaRemember() |
|
|
{ |
|
|
return $this->viaRemember; |
|
|
} |
|
|
|
|
|
} |
|
@@ -30,7 +30,8 @@ |
|
|
{"message": "Added 'whereNotBetween' support to the query builder.", "backport": null}, |
|
|
{"message": "Added App::middleware method to inject middlewares onto Stack.", "backport": null}, |
|
|
{"message": "Deprecate 'close' application hooks, Stack middlewares should be used instead.", "backport": null}, |
|
|
{"message": "A new packages directory within `lang` can now override package language files.", "backport": null} |
|
|
{"message": "A new packages directory within `lang` can now override package language files.", "backport": null}, |
|
|
{"message": "Added new 'Auth::viaRemember method to determine if user was authed via 'remember me' cookie.", "backport": null} |
|
|
], |
|
|
"4.0.x": [ |
|
|
{"message": "Added implode method to query builder and Collection class.", "backport": null}, |
|
|
|
@@ -226,6 +226,7 @@ public function testUserUsesRememberCookieIfItExists() |
|
|
$user = m::mock('Illuminate\Auth\UserInterface'); |
|
|
$guard->getProvider()->shouldReceive('retrieveById')->once()->with('recaller')->andReturn($user); |
|
|
$this->assertEquals($user, $guard->user()); |
|
|
$this->assertTrue($guard->viaRemember()); |
|
|
} |
|
|
|
|
|
|
|
|