0xbd/mail-account-admin
4
0
Fork 0
Code Issues 2 Pull requests Projects Releases 6 Wiki Activity

Implement account edit; add SessionHelper, PasswordHelper and ActionResult

Browse source
This commit is contained in:
Lexi / Zoe 2021-08-15 17:40:35 +02:00
parent 32add30c9d
commit 6ace072841
Signed by: binaryDiv
GPG key ID: F8D4956E224DA232
15 changed files with 637 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/Frontend/Login/LoginController.php
View file

@ -3,6 +3,8 @@ declare(strict_types=1);
namespace MailAccountAdmin\Frontend\Login;
use MailAccountAdmin\Common\PasswordHelper;
use MailAccountAdmin\Common\SessionHelper;
use MailAccountAdmin\Common\UserHelper;
use MailAccountAdmin\Exceptions\AdminUserNotFoundException;
use MailAccountAdmin\Frontend\BaseController;
@ -15,11 +17,15 @@ class LoginController extends BaseController
{
/** @var AdminUserRepository */
private $adminUserRepository;
/** @var PasswordHelper */
private $passwordHelper;
public function __construct(Twig $view, UserHelper $userHelper, AdminUserRepository $adminUserRepository)
public function __construct(Twig $view, SessionHelper $sessionHelper, UserHelper $userHelper, AdminUserRepository $adminUserRepository,
PasswordHelper $passwordHelper)
{
parent::__construct($view, $userHelper);
parent::__construct($view, $sessionHelper, $userHelper);
$this->adminUserRepository = $adminUserRepository;
$this->passwordHelper = $passwordHelper;
}
private function renderLoginPage(Response $response, array $renderData = []): Response
@ -54,19 +60,18 @@ class LoginController extends BaseController
try {
$user = $this->adminUserRepository->getUserByName($loginUsername);
}
catch (AdminUserNotFoundException $e) {
} catch (AdminUserNotFoundException $e) {
$user = null;
}
if ($user === null || !password_verify($loginPassword, $user->getPasswordHash())) {
if ($user === null || !$this->passwordHelper->verifyPassword($loginPassword, $user->getPasswordHash())) {
return $this->renderLoginPage($response, ['error' => 'Wrong username or password!']);
} elseif (!$user->isActive()) {
return $this->renderLoginPage($response, ['error' => 'User is inactive!']);
}
// Set login session
$_SESSION['user_id'] = $user->getId();
$this->sessionHelper->setUserId($user->getId());
return $response
->withHeader('Location', '/')
->withStatus(303);