github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-11-30 13:36:10 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

No need to set a remember cookie if only logging in for session

Browse Source
This commit is contained in:
Toby Zerner 2017-10-07 17:51:30 +10:30
parent 659b25bbfd
commit 9a8433d02c
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/core/src/Forum/Controller/LogInController.php
View File

@ -81,7 +81,9 @@ class LogInController implements ControllerInterface
event(new UserLoggedIn($this->users->findOrFail($data->userId), $token));
$response = $this->rememberer->remember($response, $token, ! array_get($body, 'remember'));
if (array_get($body, 'remember')) {
$response = $this->rememberer->remember($response, $token);
}
}
return $response;

11
framework/core/src/Http/Rememberer.php
View File

@ -24,7 +24,6 @@ class Rememberer
protected $cookie;
/**
* Rememberer constructor.
* @param CookieFactory $cookie
*/
public function __construct(CookieFactory $cookie)
@ -32,18 +31,16 @@ class Rememberer
$this->cookie = $cookie;
}
public function remember(ResponseInterface $response, AccessToken $token, $session = false)
public function remember(ResponseInterface $response, AccessToken $token)
{
$lifetime = null;
if (! $session) {
$token->lifetime = $lifetime = 5 * 365 * 24 * 60 * 60; // 5 years
$token->save();
}
$token->lifetime = 5 * 365 * 24 * 60 * 60; // 5 years
$token->save();
return FigResponseCookies::set(
$response,
$this->cookie->make(self::COOKIE_NAME, $token->id, $lifetime)
$this->cookie->make(self::COOKIE_NAME, $token->id, $token->lifetime)
);
}