Private
Public Access
1
0

chg: dev: refactor all forms to have Symfony Form Types & Validation Constrainsts - & implement Google ReCapthca v3 #4

This commit is contained in:
2026-04-12 08:49:47 +02:00
parent e2b227ed7a
commit acbe9c7f63
21 changed files with 1253 additions and 351 deletions

View File

@@ -11,6 +11,9 @@
namespace App\Controller;
use App\Entity\User;
use App\Form\ForgotPasswordFormType;
use App\Form\RegistrationFormType;
use App\Form\ResetPasswordFormType;
use App\Repository\UserRepository;
use DateTime;
use Doctrine\ORM\EntityManagerInterface;
@@ -68,75 +71,45 @@ class SecurityController extends AbstractController
return $this->redirectToRoute('MineSeekerBundle_homepage');
}
$errors = [];
$user = new User();
$form = $this->createForm(RegistrationFormType::class, $user);
$form->handleRequest($request);
if ($request->isMethod('POST')) {
$username = trim((string) $request->request->get('_username', ''));
$email = trim((string) $request->request->get('_email', ''));
$password = (string) $request->request->get('_password', '');
$passwordConfirm = (string) $request->request->get('_password_confirm', '');
if ($form->isSubmitted() && $form->isValid()) {
$token = bin2hex(random_bytes(32));
if (mb_strlen($username) < 3) {
$errors['username'] = 'Username must be at least 3 characters.';
} elseif ($em->getRepository(User::class)->findOneBy(['username' => $username])) {
$errors['username'] = 'This username is already taken.';
}
$user
->setIsVerified(false)
->setVerificationToken($token)
->setPassword($hasher->hashPassword($user, $form->get('plainPassword')->getData()));
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
$errors['email'] = 'Please enter a valid email address.';
} elseif ($em->getRepository(User::class)->findOneBy(['email' => $email])) {
$errors['email'] = 'This email address is already registered.';
}
$em->persist($user);
$em->flush();
if (mb_strlen($password) < 6) {
$errors['password'] = 'Password must be at least 6 characters.';
} elseif ($password !== $passwordConfirm) {
$errors['password_confirm'] = 'Passwords do not match.';
}
$activationUrl = $this->generateUrl(
'MineSeekerBundle_activate',
['token' => $token],
UrlGeneratorInterface::ABSOLUTE_URL,
);
if (empty($errors)) {
$token = bin2hex(random_bytes(32));
$mailer->send(
new TemplatedEmail()
->from('noreply@mineseeker.ninja')
->to($user->getEmail())
->subject('Activate your MineSeeker account')
->htmlTemplate('emails/activation.html.twig')
->context([
'username' => $user->getUsername(),
'activation_url' => $activationUrl,
])
);
$user = new User()
->setUsername($username)
->setEmail($email)
->setIsVerified(false)
->setVerificationToken($token);
$this->addFlash('verify_email', $user->getEmail());
$user->setPassword($hasher->hashPassword($user, $password));
$em->persist($user);
$em->flush();
$activationUrl = $this->generateUrl(
'MineSeekerBundle_activate',
['token' => $token],
UrlGeneratorInterface::ABSOLUTE_URL,
);
$mailer->send(
new TemplatedEmail()
->from('noreply@mineseeker.ninja')
->to($email)
->subject('Activate your MineSeeker account')
->htmlTemplate('emails/activation.html.twig')
->context([
'username' => $username,
'activation_url' => $activationUrl,
])
);
$this->addFlash('verify_email', $email);
return $this->redirectToRoute('MineSeekerBundle_register');
}
return $this->redirectToRoute('MineSeekerBundle_register');
}
return $this->render('Security/register.html.twig', [
'errors' => $errors,
'last_username' => $request->request->get('_username', ''),
'last_email' => $request->request->get('_email', ''),
]);
return $this->render('Security/register.html.twig', ['form' => $form]);
}
#[Route('/forgot-password', name: 'MineSeekerBundle_forgot_password')]
@@ -150,8 +123,11 @@ class SecurityController extends AbstractController
return $this->redirectToRoute('MineSeekerBundle_homepage');
}
if ($request->isMethod('POST')) {
$email = trim((string) $request->request->get('_email', ''));
$form = $this->createForm(ForgotPasswordFormType::class);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$email = $form->get('email')->getData();
$user = $userRepository->findOneByEmail($email);
if ($user && $user->isVerified()) {
@@ -186,7 +162,7 @@ class SecurityController extends AbstractController
return $this->redirectToRoute('MineSeekerBundle_forgot_password');
}
return $this->render('Security/forgot_password.html.twig');
return $this->render('Security/forgot_password.html.twig', ['form' => $form]);
}
#[Route('/reset-password/{token}', name: 'MineSeekerBundle_reset_password')]
@@ -204,32 +180,22 @@ class SecurityController extends AbstractController
return $this->redirectToRoute('MineSeekerBundle_forgot_password');
}
$errors = [];
$form = $this->createForm(ResetPasswordFormType::class);
$form->handleRequest($request);
if ($request->isMethod('POST')) {
$password = (string) $request->request->get('_password', '');
$passwordConfirm = (string) $request->request->get('_password_confirm', '');
if ($form->isSubmitted() && $form->isValid()) {
$user
->setPassword($hasher->hashPassword($user, $form->get('plainPassword')->getData()))
->setResetToken(null)
->setResetTokenExpiresAt(null);
$em->flush();
if (mb_strlen($password) < 6) {
$errors['password'] = 'Password must be at least 6 characters.';
} elseif ($password !== $passwordConfirm) {
$errors['password_confirm'] = 'Passwords do not match.';
}
$this->addFlash('success', 'Your password has been reset. You can now sign in.');
if (empty($errors)) {
$user
->setPassword($hasher->hashPassword($user, $password))
->setResetToken(null)
->setResetTokenExpiresAt(null);
$em->flush();
$this->addFlash('success', 'Your password has been reset. You can now sign in.');
return $this->redirectToRoute('MineSeekerBundle_login');
}
return $this->redirectToRoute('MineSeekerBundle_login');
}
return $this->render('Security/reset_password.html.twig', ['errors' => $errors]);
return $this->render('Security/reset_password.html.twig', ['form' => $form]);
}
#[Route('/activate/{token}', name: 'MineSeekerBundle_activate')]