mirror of
https://github.com/flarum/core.git
synced 2025-07-31 13:40:20 +02:00
Rework sessions, remember cookies, and auth again
- Use Symfony's Session component to work with sessions, instead of a custom database model. Separate the concept of access tokens from sessions once again. - Extract common session/remember cookie logic into SessionAuthenticator and Rememberer classes. - Extract AuthenticateUserTrait into a new AuthenticationResponseFactory class. - Fix forgot password process.
This commit is contained in:
@@ -14,6 +14,7 @@ use Flarum\Core\PasswordToken;
|
||||
use Flarum\Core\Command\EditUser;
|
||||
use Flarum\Forum\UrlGenerator;
|
||||
use Flarum\Http\Controller\ControllerInterface;
|
||||
use Flarum\Http\SessionAuthenticator;
|
||||
use Psr\Http\Message\ServerRequestInterface as Request;
|
||||
use Zend\Diactoros\Response\RedirectResponse;
|
||||
|
||||
@@ -25,11 +26,18 @@ class SavePasswordController implements ControllerInterface
|
||||
protected $url;
|
||||
|
||||
/**
|
||||
* @param UrlGenerator $url
|
||||
* @var SessionAuthenticator
|
||||
*/
|
||||
public function __construct(UrlGenerator $url)
|
||||
protected $authenticator;
|
||||
|
||||
/**
|
||||
* @param UrlGenerator $url
|
||||
* @param SessionAuthenticator $authenticator
|
||||
*/
|
||||
public function __construct(UrlGenerator $url, SessionAuthenticator $authenticator)
|
||||
{
|
||||
$this->url = $url;
|
||||
$this->authenticator = $authenticator;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,7 +48,7 @@ class SavePasswordController implements ControllerInterface
|
||||
{
|
||||
$input = $request->getParsedBody();
|
||||
|
||||
$token = PasswordToken::findOrFail(array_get($input, 'token'));
|
||||
$token = PasswordToken::findOrFail(array_get($input, 'passwordToken'));
|
||||
|
||||
$password = array_get($input, 'password');
|
||||
$confirmation = array_get($input, 'password_confirmation');
|
||||
@@ -54,6 +62,9 @@ class SavePasswordController implements ControllerInterface
|
||||
|
||||
$token->delete();
|
||||
|
||||
$session = $request->getAttribute('session');
|
||||
$this->authenticator->logIn($session, $token->user->id);
|
||||
|
||||
return new RedirectResponse($this->url->toBase());
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user