Merged in feature_users (pull request #2)

Web login form bug fix.
This commit is contained in:
Alexey Eschenko 2018-06-27 23:23:28 +00:00
commit 9d957d5800

View file

@ -8,20 +8,19 @@ use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\Form\{FormError, FormInterface}; use Symfony\Component\Form\{FormError, FormInterface};
use Symfony\Component\HttpFoundation\{Request, Response}; use Symfony\Component\HttpFoundation\{Request, Response};
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils; use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
use Symfony\Component\Translation\TranslatorInterface;
class SecurityController extends Controller class SecurityController extends Controller
{ {
public function login(Request $request, AuthenticationUtils $authenticationUtils, TranslatorInterface $translator): Response public function login(Request $request, AuthenticationUtils $authenticationUtils): Response
{ {
$lastError = $authenticationUtils->getLastAuthenticationError() ? $authenticationUtils->getLastAuthenticationError()->getMessage() : ''; $lastError = $authenticationUtils->getLastAuthenticationError();
$lastUsername = $authenticationUtils->getLastUsername(); $lastUsername = $authenticationUtils->getLastUsername();
$form = $this->createLoginForm($lastUsername); $form = $this->createLoginForm($lastUsername);
$form->handleRequest($request); $form->handleRequest($request);
if ($lastError) { if ($lastError) {
$form->addError(new FormError($lastError)); $form->addError(new FormError($lastError->getMessage()));
} }
return $this->render('Security/login.html.twig', ['form' => $form->createView()]); return $this->render('Security/login.html.twig', ['form' => $form->createView()]);