tracer
/
Spookie
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge_ResetPassword_to_Security #1

Merged
tracer merged 10 commits from merge_ResetPassword_to_Security into master 2022-11-01 16:19:33 +01:00
Conversation 0 Commits 10 Files Changed 10 +7 -10
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7031c5e63 - Show all commits

17
src/Security/LoginFormAuthenticator.php
View File

@ -2,28 +2,21 @@
namespace App\Security; namespace App\Security;
use App\Entity\User; use App\Exception\UserNotVerifiedException;
use App\Form\LoginFormType;
use App\Repository\UserRepository; use App\Repository\UserRepository;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\FormBuilder;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request; use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\RouterInterface; use Symfony\Component\Routing\RouterInterface;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\Security\Core\Exception\UserNotFoundException; use Symfony\Component\Security\Core\Exception\UserNotFoundException;
use Symfony\Component\Security\Core\Security; use Symfony\Component\Security\Core\Security;
use Symfony\Component\Security\Http\Authenticator\AbstractLoginFormAuthenticator; use Symfony\Component\Security\Http\Authenticator\AbstractLoginFormAuthenticator;
use Symfony\Component\Security\Http\Authenticator\Passport\Badge\CsrfTokenBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\CsrfTokenBadge;
use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\RememberMeBadge;
use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge; use Symfony\Component\Security\Http\Authenticator\Passport\Badge\UserBadge;
use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\CustomCredentials;
use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials; use Symfony\Component\Security\Http\Authenticator\Passport\Credentials\PasswordCredentials;
use Symfony\Component\Security\Http\Authenticator\Passport\Passport; use Symfony\Component\Security\Http\Authenticator\Passport\Passport;
use Symfony\Component\Security\Http\EntryPoint\AuthenticationEntryPointInterface;
use Symfony\Component\Security\Http\Util\TargetPathTrait; use Symfony\Component\Security\Http\Util\TargetPathTrait;
/** /**
@ -41,7 +34,7 @@ class LoginFormAuthenticator extends AbstractLoginFormAuthenticator
public function authenticate(Request $request): Passport public function authenticate(Request $request): Passport
{ {
$username = $request->request->get(key: 'username'); $username = $request->request->get(key: 'username');
$password = $request->request->get(key: 'password'); $password = $request->request->get(key: 'password');
$csrfToken = $request->request->get(key: '_csrf_token'); $csrfToken = $request->request->get(key: '_csrf_token');
$request->getSession()->set(name: Security::LAST_USERNAME, value: $username); $request->getSession()->set(name: Security::LAST_USERNAME, value: $username);
@ -58,6 +51,10 @@ class LoginFormAuthenticator extends AbstractLoginFormAuthenticator
throw new UserNotFoundException(); throw new UserNotFoundException();
} }
if (!$user->isVerified()) {
throw new UserNotVerifiedException();
}
return $user; return $user;
}), }),
@ -82,7 +79,7 @@ class LoginFormAuthenticator extends AbstractLoginFormAuthenticator
protected function getLoginUrl(Request $request): string protected function getLoginUrl(Request $request): string
{ {
return $this->router->generate(name: 'app_login'); return $this->router->generate(name: 'security_login');
} }
} }