]> Raphaƫl G. Git Repositories - userbundle/blobdiff - Controller/DefaultController.php
Cleanup
[userbundle] / Controller / DefaultController.php
index 272f7bb19615efec101f9b50661e7a4b92cb8538..3a6571267e4400c807c471715f1c92c3290c6de4 100644 (file)
@@ -24,12 +24,8 @@ 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\Exception\MethodNotAllowedException;
-use Symfony\Component\Routing\Exception\ResourceNotFoundException;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
-use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouterInterface;
-use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Encoder\UserPasswordEncoderInterface;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
 use Symfony\Component\Translation\TranslatorInterface;
@@ -277,9 +273,6 @@ class DefaultController extends AbstractController {
                //Set active
                $user->setActive(true);
 
-               //Set updated
-               $user->setUpdated(new \DateTime('now'));
-
                //Persist user
                $manager->persist($user);
 
@@ -329,22 +322,6 @@ class DefaultController extends AbstractController {
                        throw $this->createAccessDeniedException($this->translator->trans('Unable to access user: %mail%', ['%mail%' => $smail]));
                }
 
-               //Create the RegisterType form and give the proper parameters
-               $editForm = $this->createForm($this->config['register']['view']['form'], $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']),
-                       //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']),
-                       //Disable mail
-                       'mail' => $this->isGranted('ROLE_ADMIN'),
-                       //Disable password
-                       'password' => false,
-                       //Set method
-                       'method' => 'POST'
-               ]);
-
                //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
@@ -386,9 +363,6 @@ class DefaultController extends AbstractController {
                                        //Set password
                                        $data->setPassword($encoder->encodePassword($data, $data->getPassword()));
 
-                                       //Set updated
-                                       $data->setUpdated(new \DateTime('now'));
-
                                        //Queue snippet save
                                        $manager->persist($data);
 
@@ -399,7 +373,6 @@ class DefaultController extends AbstractController {
                                        $this->addFlash('notice', $this->translator->trans('Account %mail% password updated', ['%mail%' => $mail = $data->getMail()]));
 
                                        //Redirect to cleanup the form
-                                       //TODO: extract referer ??? or useless ???
                                        return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $slugger->short($mail), 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']);
                                }
                        }
@@ -423,9 +396,6 @@ class DefaultController extends AbstractController {
                                //Set data
                                $data = $edit->getData();
 
-                               //Set updated
-                               $data->setUpdated(new \DateTime('now'));
-
                                //Queue snippet save
                                $manager->persist($data);
 
@@ -436,7 +406,6 @@ class DefaultController extends AbstractController {
                                $this->addFlash('notice', $this->translator->trans('Account %mail% updated', ['%mail%' => $mail = $data->getMail()]));
 
                                //Redirect to cleanup the form
-                               //TODO: extract referer ??? or useless ???
                                return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $slugger->short($mail), 'hash' => $slugger->hash($smail)]+$this->config['route']['edit']['context']);
                        }
                }
@@ -528,7 +497,6 @@ class DefaultController extends AbstractController {
                        $context['recover'] = $recover->createView();
                } else {
                        //Add notice
-                       //TODO: drop it if referer route is recover ?
                        $this->addFlash('notice', $this->translator->trans('To change your password login with your mail and any password then follow the procedure'));
                }
 
@@ -726,9 +694,6 @@ class DefaultController extends AbstractController {
                                //Set user password
                                $user->setPassword($encoded);
 
-                               //Set updated
-                               $user->setUpdated(new \DateTime('now'));
-
                                //Persist user
                                $manager->persist($user);
 
@@ -768,11 +733,28 @@ class DefaultController extends AbstractController {
         * @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 {
-               //Init reflection
-               $reflection = new \ReflectionClass($this->config['class']['user']);
-
-               //Create new user
-               $user = $reflection->newInstance();
+               //With mail
+               if (!empty($_POST['register']['mail'])) {
+                       //Log new user infos
+                       $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(
+                                                       $this->config['route']['confirm']['name'],
+                                                       //Prepend subscribe context with tag
+                                                       [
+                                                               'mail' => $postSmail = $slugger->short($postMail),
+                                                               'hash' => $slugger->hash($postSmail)
+                                                       ]+$this->config['route']['confirm']['context'],
+                                                       UrlGeneratorInterface::ABSOLUTE_URL
+                                               )
+                                       ]
+                               )
+                       );
+               }
 
                //With mail and field
                if (!empty($field) && !empty($hash)) {
@@ -794,8 +776,107 @@ class DefaultController extends AbstractController {
                                        throw new BadRequestHttpException($this->translator->trans('Invalid %field% field: %value%', ['%field%' => 'mail', '%value%' => $smail]));
                                }
 
-                               //Set mail
-                               $user->setMail($mail);
+                               //With existing registrant
+                               if ($existing = $doctrine->getRepository($this->config['class']['user'])->findOneByMail($mail)) {
+                                       //With disabled existing
+                                       if ($existing->isDisabled()) {
+                                               //Render view
+                                               return $this->render(
+                                                       //Template
+                                                       $this->config['register']['view']['name'],
+                                                       //Context
+                                                       ['title' => $this->translator->trans('Access denied'), 'disabled' => 1]+$this->config['register']['view']['context'],
+                                                       //Set 403
+                                                       new Response('', 403)
+                                               );
+                                       //With unactivated existing
+                                       } elseif (!$existing->isActivated()) {
+                                               //Set mail shortcut
+                                               //TODO: change for activate ???
+                                               $activateMail =& $this->config['register']['mail'];
+
+                                               //Generate each route route
+                                               foreach($this->config['register']['route'] as $route => $tag) {
+                                                       //Only process defined routes
+                                                       if (!empty($this->config['route'][$route])) {
+                                                               //Process for confirm url
+                                                               if ($route == 'confirm') {
+                                                                       //Set the url in context
+                                                                       $activateMail['context'][$tag] = $this->get('router')->generate(
+                                                                               $this->config['route'][$route]['name'],
+                                                                               //Prepend subscribe context with tag
+                                                                               [
+                                                                                       'mail' => $smail = $slugger->short($existing->getMail()),
+                                                                                       'hash' => $slugger->hash($smail)
+                                                                               ]+$this->config['route'][$route]['context'],
+                                                                               UrlGeneratorInterface::ABSOLUTE_URL
+                                                                       );
+                                                               }
+                                                       }
+                                               }
+
+                                               //Set recipient_name
+                                               $activateMail['context']['recipient_mail'] = $existing->getMail();
+
+                                               //Set recipient name
+                                               $activateMail['context']['recipient_name'] = implode(' ', [$existing->getForename(), $existing->getSurname(), $existing->getPseudonym()?'('.$existing->getPseudonym().')':'']);
+
+                                               //Init subject context
+                                               $subjectContext = $slugger->flatten(array_replace_recursive($this->config['register']['view']['context'], $activateMail['context']), null, '.', '%', '%');
+
+                                               //Translate subject
+                                               $activateMail['subject'] = ucfirst($this->translator->trans($activateMail['subject'], $subjectContext));
+
+                                               //Create message
+                                               $message = (new TemplatedEmail())
+                                                       //Set sender
+                                                       ->from(new Address($this->config['contact']['mail'], $this->config['contact']['title']))
+                                                       //Set recipient
+                                                       //XXX: remove the debug set in vendor/symfony/mime/Address.php +46
+                                                       ->to(new Address($activateMail['context']['recipient_mail'], $activateMail['context']['recipient_name']))
+                                                       //Set subject
+                                                       ->subject($activateMail['subject'])
+
+                                                       //Set path to twig templates
+                                                       ->htmlTemplate($activateMail['html'])
+                                                       ->textTemplate($activateMail['text'])
+
+                                                       //Set context
+                                                       ->context(['subject' => $activateMail['subject']]+$activateMail['context']);
+
+                                               //Try sending message
+                                               //XXX: mail delivery may silently fail
+                                               try {
+                                                       //Send message
+                                                       $mailer->send($message);
+                                               //Catch obvious transport exception
+                                               } catch(TransportExceptionInterface $e) {
+                                                       //Add error message mail unreachable
+                                                       $this->addFlash('error', $this->translator->trans('Account %mail% tried activate but unable to contact', ['%mail%' => $existing->getMail()]));
+                                               }
+
+                                               //Get route params
+                                               $routeParams = $request->get('_route_params');
+
+                                               //Remove mail, field and hash from route params
+                                               unset($routeParams['mail'], $routeParams['field'], $routeParams['hash']);
+
+                                               //Redirect on the same route with sent=1 to cleanup form
+                                               return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$routeParams);
+                                       }
+
+                                       //Add error message mail already exists
+                                       $this->addFlash('warning', $this->translator->trans('Account %mail% already exists', ['%mail%' => $existing->getMail()]));
+
+                                       //Redirect to user view
+                                       return $this->redirectToRoute(
+                                               $this->config['route']['edit']['name'],
+                                               [
+                                                       'mail' => $smail = $slugger->short($existing->getMail()),
+                                                       'hash' => $slugger->hash($smail)
+                                               ]+$this->config['route']['edit']['context']
+                                       );
+                               }
                        //Without mail
                        } else {
                                //Set smail
@@ -823,12 +904,18 @@ class DefaultController extends AbstractController {
                        $smail = $mail;
 
                        //Set smail
-                       $sfield = $sfield;
+                       $sfield = $field;
 
                        //Reset field
                        $field = [];
                }
 
+               //Init reflection
+               $reflection = new \ReflectionClass($this->config['class']['user']);
+
+               //Create new user
+               $user = $reflection->newInstance(strval($mail));
+
                //Create the RegisterType form and give the proper parameters
                $form = $this->createForm($this->config['register']['view']['form'], $user, $field+[
                        //Set action to register route name and context
@@ -931,19 +1018,6 @@ class DefaultController extends AbstractController {
                                //XXX: DEBUG: remove me
                                //die($registerMail['context']['confirm_url']);
 
-                               //Log new user infos
-                               //XXX: useless ???
-                               $logger->emergency(
-                                       $this->translator->trans(
-                                               'newuser:mail=%mail%|locale=%locale%|confirm=%confirm%',
-                                               [
-                                                       '%mail%' => $data->getMail(),
-                                                       '%locale%' => $request->getLocale(),
-                                                       '%confirm%' => $registerMail['context'][$this->config['register']['route']['confirm']]
-                                               ]
-                                       )
-                               );
-
                                //Set recipient_name
                                $registerMail['context']['recipient_mail'] = $data->getMail();