X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/bc802330656256d935557293fa5ee929ce131509..49d823e99f9815fca231b76aceef894531e7b42c:/Controller/DefaultController.php?ds=inline
diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 02e0d16..de4ff4e 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -11,25 +11,17 @@
namespace Rapsys\UserBundle\Controller;
-use Doctrine\Bundle\DoctrineBundle\Registry;
-use Doctrine\ORM\EntityManagerInterface;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
-use Psr\Log\LoggerInterface;
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
use Symfony\Component\Form\FormError;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
-use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Mime\Address;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
-use Rapsys\PackBundle\Util\SluggerUtil;
-
/**
* {@inheritdoc}
*/
@@ -38,24 +30,19 @@ class DefaultController extends AbstractController {
* Confirm account from mail link
*
* @param Request $request The request
- * @param Registry $manager The doctrine registry
- * @param UserPasswordEncoderInterface $encoder The password encoder
- * @param EntityManagerInterface $manager The doctrine entity manager
- * @param SluggerUtil $slugger The slugger
- * @param MailerInterface $mailer The mailer
- * @param string $mail The shorted mail address
* @param string $hash The hashed password
+ * @param string $mail The shorted mail address
* @return Response The response
*/
- public function confirm(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, $mail, $hash): Response {
+ public function confirm(Request $request, string $hash, string $mail): Response {
//With invalid hash
- if ($hash != $slugger->hash($mail)) {
+ if ($hash != $this->slugger->hash($mail)) {
//Throw bad request
throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash]));
}
//Get mail
- $mail = $slugger->unshort($smail = $mail);
+ $mail = $this->slugger->unshort($smail = $mail);
//Without valid mail
if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) {
@@ -65,55 +52,51 @@ class DefaultController extends AbstractController {
}
//Without existing registrant
- if (!($user = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
+ if (!($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
//Add error message mail already exists
//XXX: prevent slugger reverse engineering by not displaying decoded mail
$this->addFlash('error', $this->translator->trans('Account %mail% do not exists', ['%mail%' => $smail]));
//Redirect to register view
- return $this->redirectToRoute($this->config['route']['register']['name'], ['mail' => $smail, 'field' => $sfield = $slugger->serialize([]), 'hash' => $slugger->hash($smail.$sfield)]+$this->config['route']['register']['context']);
+ return $this->redirectToRoute($this->config['route']['register']['name'], ['mail' => $smail, 'field' => $sfield = $this->slugger->serialize([]), 'hash' => $this->slugger->hash($smail.$sfield)]+$this->config['route']['register']['context']);
}
//Set active
$user->setActive(true);
//Persist user
- $manager->persist($user);
+ $this->manager->persist($user);
//Send to database
- $manager->flush();
+ $this->manager->flush();
//Add error message mail already exists
$this->addFlash('notice', $this->translator->trans('Your account has been activated'));
//Redirect to user view
- return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']);
+ return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']);
}
/**
* Edit account by shorted mail
*
* @param Request $request The request
- * @param Registry $manager The doctrine registry
- * @param UserPasswordEncoderInterface $encoder The password encoder
- * @param EntityManagerInterface $manager The doctrine entity manager
- * @param SluggerUtil $slugger The slugger
- * @param string $mail The shorted mail address
* @param string $hash The hashed password
+ * @param string $mail The shorted mail address
* @return Response The response
*/
- public function edit(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, $mail, $hash): Response {
+ public function edit(Request $request, string $hash, string $mail): Response {
//With invalid hash
- if ($hash != $slugger->hash($mail)) {
+ if ($hash != $this->slugger->hash($mail)) {
//Throw bad request
throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash]));
}
//Get mail
- $mail = $slugger->unshort($smail = $mail);
+ $mail = $this->slugger->unshort($smail = $mail);
//With existing subscriber
- if (empty($user = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
+ if (empty($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
//Throw not found
//XXX: prevent slugger reverse engineering by not displaying decoded mail
throw $this->createNotFoundException($this->translator->trans('Unable to find account %mail%', ['%mail%' => $smail]));
@@ -129,11 +112,11 @@ class DefaultController extends AbstractController {
//Create the RegisterType form and give the proper parameters
$edit = $this->createForm($this->config['edit']['view']['edit'], $user, [
//Set action to register route name and context
- 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']),
+ 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']),
//Set civility class
'civility_class' => $this->config['class']['civility'],
//Set civility default
- 'civility_default' => $doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
+ 'civility_default' => $this->doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
//Disable mail
'mail' => $this->isGranted('ROLE_ADMIN'),
//Disable password
@@ -147,7 +130,7 @@ class DefaultController extends AbstractController {
//Create the LoginType form and give the proper parameters
$reset = $this->createForm($this->config['edit']['view']['reset'], $user, [
//Set action to register route name and context
- 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']),
+ 'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']),
//Disable mail
'mail' => false,
//Set method
@@ -165,29 +148,24 @@ class DefaultController extends AbstractController {
$data = $reset->getData();
//Set password
- $data->setPassword($encoder->encodePassword($data, $data->getPassword()));
+ $data->setPassword($this->hasher->hashPassword($data, $data->getPassword()));
//Queue snippet save
- $manager->persist($data);
+ $this->manager->persist($data);
//Flush to get the ids
- $manager->flush();
+ $this->manager->flush();
//Add notice
$this->addFlash('notice', $this->translator->trans('Account %mail% password updated', ['%mail%' => $mail = $data->getMail()]));
//Redirect to cleanup the form
- return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $slugger->short($mail), 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']);
+ return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $this->slugger->short($mail), 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']);
}
}
//Add reset view
$this->config['edit']['view']['context']['reset'] = $reset->createView();
- //Without admin role
- //XXX: prefer a reset on login to force user unspam action
- } else {
- //Add notice
- $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure'));
}
//With post method
@@ -201,24 +179,29 @@ class DefaultController extends AbstractController {
$data = $edit->getData();
//Queue snippet save
- $manager->persist($data);
+ $this->manager->persist($data);
//Try saving in database
try {
//Flush to get the ids
- $manager->flush();
+ $this->manager->flush();
//Add notice
$this->addFlash('notice', $this->translator->trans('Account %mail% updated', ['%mail%' => $mail = $data->getMail()]));
//Redirect to cleanup the form
- return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $slugger->short($mail), 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']);
+ return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $this->slugger->short($mail), 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']);
//Catch double slug or mail
} catch (UniqueConstraintViolationException $e) {
//Add error message mail already exists
- $this->addFlash('error', $this->translator->trans('Account %mail% or with slug %slug% already exists', ['%mail%' => $data->getMail(), '%slug%' => $slug]));
+ $this->addFlash('error', $this->translator->trans('Account %mail% already exists', ['%mail%' => $data->getMail()]));
}
}
+ //Without admin role
+ //XXX: prefer a reset on login to force user unspam action
+ } elseif (!$this->isGranted('ROLE_ADMIN')) {
+ //Add notice
+ $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure'));
}
//Render view
@@ -235,13 +218,11 @@ class DefaultController extends AbstractController {
*
* @param Request $request The request
* @param AuthenticationUtils $authenticationUtils The authentication utils
- * @param RouterInterface $router The router instance
- * @param SluggerUtil $slugger The slugger
- * @param string $mail The shorted mail address
- * @param string $hash The hashed password
+ * @param ?string $hash The hashed password
+ * @param ?string $mail The shorted mail address
* @return Response The response
*/
- public function login(Request $request, AuthenticationUtils $authenticationUtils, RouterInterface $router, SluggerUtil $slugger, $mail, $hash): Response {
+ public function login(Request $request, AuthenticationUtils $authenticationUtils, ?string $hash, ?string $mail): Response {
//Create the LoginType form and give the proper parameters
$login = $this->createForm($this->config['login']['view']['form'], null, [
//Set action to login route name and context
@@ -258,13 +239,13 @@ class DefaultController extends AbstractController {
//With mail
if (!empty($mail) && !empty($hash)) {
//With invalid hash
- if ($hash != $slugger->hash($mail)) {
+ if ($hash != $this->slugger->hash($mail)) {
//Throw bad request
throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash]));
}
//Get mail
- $mail = $slugger->unshort($smail = $mail);
+ $mail = $this->slugger->unshort($smail = $mail);
//Without valid mail
if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) {
@@ -324,17 +305,12 @@ class DefaultController extends AbstractController {
* Recover account
*
* @param Request $request The request
- * @param Registry $manager The doctrine registry
- * @param UserPasswordEncoderInterface $encoder The password encoder
- * @param EntityManagerInterface $manager The doctrine entity manager
- * @param SluggerUtil $slugger The slugger
- * @param MailerInterface $mailer The mailer
- * @param string $mail The shorted mail address
- * @param string $pass The shorted password
- * @param string $hash The hashed password
+ * @param ?string $hash The hashed password
+ * @param ?string $pass The shorted password
+ * @param ?string $mail The shorted mail address
* @return Response The response
*/
- public function recover(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, $mail, $pass, $hash): Response {
+ public function recover(Request $request, ?string $hash, ?string $pass, ?string $mail): Response {
//Without mail, pass and hash
if (empty($mail) && empty($pass) && empty($hash)) {
//Create the LoginType form and give the proper parameters
@@ -347,24 +323,26 @@ class DefaultController extends AbstractController {
'method' => 'POST'
]);
+ //With post method
if ($request->isMethod('POST')) {
//Refill the fields in case the form is not valid.
$form->handleRequest($request);
- if ($form->isValid()) {
+ //With form submitted and valid
+ if ($form->isSubmitted() && $form->isValid()) {
//Set data
$data = $form->getData();
//Find user by data mail
- if ($user = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($data['mail'])) {
+ if ($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($data['mail'])) {
//Set mail shortcut
$recoverMail =& $this->config['recover']['mail'];
//Set mail
- $mail = $slugger->short($user->getMail());
+ $mail = $this->slugger->short($user->getMail());
//Set pass
- $pass = $slugger->hash($user->getPassword());
+ $pass = $this->slugger->hash($user->getPassword());
//Generate each route route
foreach($this->config['recover']['route'] as $route => $tag) {
@@ -373,13 +351,13 @@ class DefaultController extends AbstractController {
//Process for recover mail url
if ($route == 'recover') {
//Set the url in context
- $recoverMail['context'][$tag] = $this->get('router')->generate(
+ $recoverMail['context'][$tag] = $this->router->generate(
$this->config['route'][$route]['name'],
//Prepend recover context with tag
[
'mail' => $mail,
'pass' => $pass,
- 'hash' => $slugger->hash($mail.$pass)
+ 'hash' => $this->slugger->hash($mail.$pass)
]+$this->config['route'][$route]['context'],
UrlGeneratorInterface::ABSOLUTE_URL
);
@@ -391,10 +369,10 @@ class DefaultController extends AbstractController {
$recoverMail['context']['recipient_mail'] = $user->getMail();
//Set recipient_name
- $recoverMail['context']['recipient_name'] = trim($user->getForename().' '.$user->getSurname().($user->getPseudonym()?' ('.$user->getPseudonym().')':''));
+ $recoverMail['context']['recipient_name'] = $user->getRecipientName();
//Init subject context
- $subjectContext = $slugger->flatten(array_replace_recursive($this->config['recover']['view']['context'], $recoverMail['context']), null, '.', '%', '%');
+ $subjectContext = $this->slugger->flatten(array_replace_recursive($this->config['recover']['view']['context'], $recoverMail['context']), null, '.', '%', '%');
//Translate subject
$recoverMail['subject'] = ucfirst($this->translator->trans($recoverMail['subject'], $subjectContext));
@@ -422,7 +400,7 @@ class DefaultController extends AbstractController {
//XXX: mail delivery may silently fail
try {
//Send message
- $mailer->send($message);
+ $this->mailer->send($message);
//Redirect on the same route with sent=1 to cleanup form
return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params'));
@@ -449,13 +427,13 @@ class DefaultController extends AbstractController {
}
//With invalid hash
- if ($hash != $slugger->hash($mail.$pass)) {
+ if ($hash != $this->slugger->hash($mail.$pass)) {
//Throw bad request
throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash]));
}
//Get mail
- $mail = $slugger->unshort($smail = $mail);
+ $mail = $this->slugger->unshort($smail = $mail);
//Without valid mail
if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) {
@@ -465,14 +443,14 @@ class DefaultController extends AbstractController {
}
//With existing subscriber
- if (empty($user = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
+ if (empty($user = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail))) {
//Throw not found
//XXX: prevent slugger reverse engineering by not displaying decoded mail
throw $this->createNotFoundException($this->translator->trans('Unable to find account %mail%', ['%mail%' => $smail]));
}
//With unmatched pass
- if ($pass != $slugger->hash($user->getPassword())) {
+ if ($pass != $this->slugger->hash($user->getPassword())) {
//Throw not found
//XXX: prevent use of outdated recover link
throw $this->createNotFoundException($this->translator->trans('Outdated recover link'));
@@ -488,34 +466,36 @@ class DefaultController extends AbstractController {
'method' => 'POST'
]);
+ //With post method
if ($request->isMethod('POST')) {
//Refill the fields in case the form is not valid.
$form->handleRequest($request);
- if ($form->isValid()) {
+ //With form submitted and valid
+ if ($form->isSubmitted() && $form->isValid()) {
//Set data
$data = $form->getData();
- //Set encoded password
- $encoded = $encoder->encodePassword($user, $user->getPassword());
+ //Set hashed password
+ $hashed = $this->hasher->hashPassword($user, $user->getPassword());
//Update pass
- $pass = $slugger->hash($encoded);
+ $pass = $this->slugger->hash($hashed);
//Set user password
- $user->setPassword($encoded);
+ $user->setPassword($hashed);
//Persist user
- $manager->persist($user);
+ $this->manager->persist($user);
//Send to database
- $manager->flush();
+ $this->manager->flush();
//Add notice
$this->addFlash('notice', $this->translator->trans('Account %mail% password updated', ['%mail%' => $mail]));
//Redirect to user login
- return $this->redirectToRoute($this->config['route']['login']['name'], ['mail' => $smail, 'hash' => $slugger->hash($smail)]+$this->config['route']['login']['context']);
+ return $this->redirectToRoute($this->config['route']['login']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['login']['context']);
}
}
@@ -532,33 +512,27 @@ class DefaultController extends AbstractController {
* Register an account
*
* @param Request $request The request
- * @param Registry $manager The doctrine registry
- * @param UserPasswordEncoderInterface $encoder The password encoder
- * @param EntityManagerInterface $manager The doctrine entity manager
- * @param SluggerUtil $slugger The slugger
- * @param MailerInterface $mailer The mailer
- * @param LoggerInterface $logger The logger
- * @param string $mail The shorted mail address
- * @param string $field The serialized then shorted form field array
- * @param string $hash The hashed serialized field array
+ * @param ?string $hash The hashed serialized field array
+ * @param ?string $field The serialized then shorted form field array
+ * @param ?string $mail The shorted mail address
* @return Response The response
*/
- public function register(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, LoggerInterface $logger, $mail, $field, $hash): Response {
+ public function register(Request $request, ?string $hash, ?string $field, ?string $mail): Response {
//With mail
if (!empty($_POST['register']['mail'])) {
//Log new user infos
- $logger->emergency(
+ $this->logger->emergency(
$this->translator->trans(
'register: mail=%mail% locale=%locale% confirm=%confirm%',
[
'%mail%' => $postMail = $_POST['register']['mail'],
'%locale%' => $request->getLocale(),
- '%confirm%' => $this->get('router')->generate(
+ '%confirm%' => $this->router->generate(
$this->config['route']['confirm']['name'],
//Prepend subscribe context with tag
[
- 'mail' => $postSmail = $slugger->short($postMail),
- 'hash' => $slugger->hash($postSmail)
+ 'mail' => $postSmail = $this->slugger->short($postMail),
+ 'hash' => $this->slugger->hash($postSmail)
]+$this->config['route']['confirm']['context'],
UrlGeneratorInterface::ABSOLUTE_URL
)
@@ -570,7 +544,7 @@ class DefaultController extends AbstractController {
//With mail and field
if (!empty($field) && !empty($hash)) {
//With invalid hash
- if ($hash != $slugger->hash($mail.$field)) {
+ if ($hash != $this->slugger->hash($mail.$field)) {
//Throw bad request
throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'hash', '%value%' => $hash]));
}
@@ -578,7 +552,7 @@ class DefaultController extends AbstractController {
//With mail
if (!empty($mail)) {
//Get mail
- $mail = $slugger->unshort($smail = $mail);
+ $mail = $this->slugger->unshort($smail = $mail);
//Without valid mail
if (filter_var($mail, FILTER_VALIDATE_EMAIL) === false) {
@@ -588,7 +562,7 @@ class DefaultController extends AbstractController {
}
//With existing registrant
- if ($existing = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail)) {
+ if ($existing = $this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail)) {
//With disabled existing
if ($existing->isDisabled()) {
//Render view
@@ -616,12 +590,12 @@ class DefaultController extends AbstractController {
//Process for confirm url
if ($route == 'confirm') {
//Set the url in context
- $activateMail['context'][$tag] = $this->get('router')->generate(
+ $activateMail['context'][$tag] = $this->router->generate(
$this->config['route'][$route]['name'],
//Prepend subscribe context with tag
[
- 'mail' => $smail = $slugger->short($existing->getMail()),
- 'hash' => $slugger->hash($smail)
+ 'mail' => $smail = $this->slugger->short($existing->getMail()),
+ 'hash' => $this->slugger->hash($smail)
]+$this->config['route'][$route]['context'],
UrlGeneratorInterface::ABSOLUTE_URL
);
@@ -633,10 +607,10 @@ class DefaultController extends AbstractController {
$activateMail['context']['recipient_mail'] = $existing->getMail();
//Set recipient name
- $activateMail['context']['recipient_name'] = implode(' ', [$existing->getForename(), $existing->getSurname(), $existing->getPseudonym()?'('.$existing->getPseudonym().')':'']);
+ $activateMail['context']['recipient_name'] = $existing->getRecipientName();
//Init subject context
- $subjectContext = $slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $activateMail['context']), null, '.', '%', '%');
+ $subjectContext = $this->slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $activateMail['context']), null, '.', '%', '%');
//Translate subject
$activateMail['subject'] = ucfirst($this->translator->trans($activateMail['subject'], $subjectContext));
@@ -662,7 +636,7 @@ class DefaultController extends AbstractController {
//XXX: mail delivery may silently fail
try {
//Send message
- $mailer->send($message);
+ $this->mailer->send($message);
//Catch obvious transport exception
} catch(TransportExceptionInterface $e) {
//Add error message mail unreachable
@@ -686,8 +660,8 @@ class DefaultController extends AbstractController {
return $this->redirectToRoute(
$this->config['route']['edit']['name'],
[
- 'mail' => $smail = $slugger->short($existing->getMail()),
- 'hash' => $slugger->hash($smail)
+ 'mail' => $smail = $this->slugger->short($existing->getMail()),
+ 'hash' => $this->slugger->hash($smail)
]+$this->config['route']['edit']['context']
);
}
@@ -700,7 +674,7 @@ class DefaultController extends AbstractController {
//Try
try {
//Unshort then unserialize field
- $field = $slugger->unserialize($sfield = $field);
+ $field = $this->slugger->unserialize($sfield = $field);
//Catch type error
} catch (\Error|\Exception $e) {
//Throw bad request
@@ -737,23 +711,25 @@ class DefaultController extends AbstractController {
//Set civility class
'civility_class' => $this->config['class']['civility'],
//Set civility default
- 'civility_default' => $doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
+ 'civility_default' => $this->doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
//With mail
'mail' => true,
//Set method
'method' => 'POST'
]+$this->config['register']['field']);
+ //With post method
if ($request->isMethod('POST')) {
//Refill the fields in case the form is not valid.
$form->handleRequest($request);
- if ($form->isValid()) {
+ //With form submitted and valid
+ if ($form->isSubmitted() && $form->isValid()) {
//Set data
$data = $form->getData();
//With existing registrant
- if ($doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail = $data->getMail())) {
+ if ($this->doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail = $data->getMail())) {
//Add error message mail already exists
$this->addFlash('warning', $this->translator->trans('Account %mail% already exists', ['%mail%' => $mail]));
@@ -761,8 +737,8 @@ class DefaultController extends AbstractController {
return $this->redirectToRoute(
$this->config['route']['edit']['name'],
[
- 'mail' => $smail = $slugger->short($mail),
- 'hash' => $slugger->hash($smail)
+ 'mail' => $smail = $this->slugger->short($mail),
+ 'hash' => $this->slugger->hash($smail)
]+$this->config['route']['edit']['context']
);
}
@@ -771,21 +747,15 @@ class DefaultController extends AbstractController {
$registerMail =& $this->config['register']['mail'];
//Set password
- $user->setPassword($encoder->encodePassword($user, $user->getPassword()??$data->getMail()));
-
- //Set created
- $user->setCreated(new \DateTime('now'));
-
- //Set updated
- $user->setUpdated(new \DateTime('now'));
+ $user->setPassword($this->hasher->hashPassword($user, $user->getPassword()));
//Persist user
- $manager->persist($user);
+ $this->manager->persist($user);
//Iterate on default group
foreach($this->config['default']['group'] as $i => $groupTitle) {
//Fetch group
- if (($group = $doctrine->getRepository($this->config['class']['group'])->findOneByTitle($groupTitle))) {
+ if (($group = $this->doctrine->getRepository($this->config['class']['group'])->findOneByTitle($groupTitle))) {
//Set default group
//XXX: see vendor/symfony/security-core/Role/Role.php
$user->addGroup($group);
@@ -804,12 +774,12 @@ class DefaultController extends AbstractController {
//Process for confirm url
if ($route == 'confirm') {
//Set the url in context
- $registerMail['context'][$tag] = $this->get('router')->generate(
+ $registerMail['context'][$tag] = $this->router->generate(
$this->config['route'][$route]['name'],
//Prepend subscribe context with tag
[
- 'mail' => $smail = $slugger->short($data->getMail()),
- 'hash' => $slugger->hash($smail)
+ 'mail' => $smail = $this->slugger->short($data->getMail()),
+ 'hash' => $this->slugger->hash($smail)
]+$this->config['route'][$route]['context'],
UrlGeneratorInterface::ABSOLUTE_URL
);
@@ -817,20 +787,14 @@ class DefaultController extends AbstractController {
}
}
- //XXX: DEBUG: remove me
- //die($registerMail['context']['confirm_url']);
-
//Set recipient_name
$registerMail['context']['recipient_mail'] = $data->getMail();
//Set recipient name
- $registerMail['context']['recipient_name'] = '';
-
- //Set recipient name
- $registerMail['context']['recipient_name'] = implode(' ', [$data->getForename(), $data->getSurname(), $data->getPseudonym()?'('.$data->getPseudonym().')':'']);
+ $registerMail['context']['recipient_name'] = $data->getRecipientName();
//Init subject context
- $subjectContext = $slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $registerMail['context']), null, '.', '%', '%');
+ $subjectContext = $this->slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $registerMail['context']), null, '.', '%', '%');
//Translate subject
$registerMail['subject'] = ucfirst($this->translator->trans($registerMail['subject'], $subjectContext));
@@ -855,7 +819,7 @@ class DefaultController extends AbstractController {
//Try saving in database
try {
//Send to database
- $manager->flush();
+ $this->manager->flush();
//Add error message mail already exists
$this->addFlash('notice', $this->translator->trans('Your account has been created'));
@@ -864,7 +828,7 @@ class DefaultController extends AbstractController {
//XXX: mail delivery may silently fail
try {
//Send message
- $mailer->send($message);
+ $this->mailer->send($message);
//Redirect on the same route with sent=1 to cleanup form
return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params'));