X-Git-Url: https://git.rapsys.eu/userbundle/blobdiff_plain/4f7c241cab3374b8fb7a99555d15afa745c78b92..76b2ea7078f3a5dac1c2669d48dfe7551ebacaa2:/Controller/DefaultController.php?ds=inline
diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index f364144..7f6b02e 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -1,230 +1,39 @@
-<?php
+<?php declare(strict_types=1);
+
+/*
+ * This file is part of the Rapsys UserBundle package.
+ *
+ * (c) Raphaël Gertz <symfony@rapsys.eu>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
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\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\DependencyInjection\ContainerInterface;
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\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;
use Rapsys\PackBundle\Util\SluggerUtil;
-use Rapsys\UserBundle\RapsysUserBundle;
+/**
+ * {@inheritdoc}
+ */
class DefaultController extends AbstractController {
- //Config array
- protected $config;
-
- //Translator instance
- protected $translator;
-
- /**
- * Constructor
- *
- * @TODO: move all canonical and other view related stuff in an user AbstractController like in RapsysAir render feature !!!!
- * @TODO: add resetpassword ? with $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY'); https://symfony.com/doc/current/security/remember_me.html
- *
- * @param ContainerInterface $container The containter instance
- * @param RouterInterface $router The router instance
- * @param TranslatorInterface $translator The translator instance
- */
- public function __construct(ContainerInterface $container, RouterInterface $router, TranslatorInterface $translator) {
- //Retrieve config
- $this->config = $container->getParameter(self::getAlias());
-
- //Set the translator
- $this->translator = $translator;
-
- //Get request stack
- $stack = $container->get('request_stack');
-
- //Get current request
- $request = $stack->getCurrentRequest();
-
- //Get current locale
- $currentLocale = $request->getLocale();
-
- //Set locale
- $this->config['context']['locale'] = str_replace('_', '-', $currentLocale);
-
- //Set translate array
- $translates = [];
-
- //Look for keys to translate
- if (!empty($this->config['translate'])) {
- //Iterate on keys to translate
- foreach($this->config['translate'] as $translate) {
- //Set tmp
- $tmp = null;
- //Iterate on keys
- foreach(array_reverse(explode('.', $translate)) as $curkey) {
- $tmp = array_combine([$curkey], [$tmp]);
- }
- //Append tree
- $translates = array_replace_recursive($translates, $tmp);
- }
- }
-
- //Inject every requested route in view and mail context
- foreach($this->config as $tag => $current) {
- //Look for entry with title subkey
- if (!empty($current['title'])) {
- //Translate title value
- $this->config[$tag]['title'] = $translator->trans($current['title']);
- }
-
- //Look for entry with route subkey
- if (!empty($current['route'])) {
- //Generate url for both view and mail
- foreach(['view', 'mail'] as $view) {
- //Check that context key is usable
- if (isset($current[$view]['context']) && is_array($current[$view]['context'])) {
- //Merge with global context
- $this->config[$tag][$view]['context'] = array_replace_recursive($this->config['context'], $this->config[$tag][$view]['context']);
-
- //Process every routes
- foreach($current['route'] as $route => $key) {
- //With confirm route
- if ($route == 'confirm') {
- //Skip route as it requires some parameters
- continue;
- }
-
- //Set value
- $value = $router->generate(
- $this->config['route'][$route]['name'],
- $this->config['route'][$route]['context'],
- //Generate absolute url for mails
- $view=='mail'?UrlGeneratorInterface::ABSOLUTE_URL:UrlGeneratorInterface::ABSOLUTE_PATH
- );
-
- //Multi level key
- if (strpos($key, '.') !== false) {
- //Set tmp
- $tmp = $value;
-
- //Iterate on key
- foreach(array_reverse(explode('.', $key)) as $curkey) {
- $tmp = array_combine([$curkey], [$tmp]);
- }
-
- //Set value
- $this->config[$tag][$view]['context'] = array_replace_recursive($this->config[$tag][$view]['context'], $tmp);
- //Single level key
- } else {
- //Set value
- $this->config[$tag][$view]['context'][$key] = $value;
- }
- }
-
- //Look for successful intersections
- if (!empty(array_intersect_key($translates, $this->config[$tag][$view]['context']))) {
- //Iterate on keys to translate
- foreach($this->config['translate'] as $translate) {
- //Set keys
- $keys = explode('.', $translate);
-
- //Set tmp
- $tmp = $this->config[$tag][$view]['context'];
-
- //Iterate on keys
- foreach($keys as $curkey) {
- //Without child key
- if (!isset($tmp[$curkey])) {
- //Skip to next key
- continue(2);
- }
-
- //Get child key
- $tmp = $tmp[$curkey];
- }
-
- //Translate tmp value
- $tmp = $translator->trans($tmp);
-
- //Iterate on keys
- foreach(array_reverse($keys) as $curkey) {
- //Set parent key
- $tmp = array_combine([$curkey], [$tmp]);
- }
-
- //Set value
- $this->config[$tag][$view]['context'] = array_replace_recursive($this->config[$tag][$view]['context'], $tmp);
- }
- }
-
- //With view context
- if ($view == 'view') {
- //Get context path
- $pathInfo = $router->getContext()->getPathInfo();
-
- //Iterate on locales excluding current one
- foreach($this->config['locales'] as $locale) {
- //Set titles
- $titles = [];
-
- //Iterate on other locales
- foreach(array_diff($this->config['locales'], [$locale]) as $other) {
- $titles[$other] = $translator->trans($this->config['languages'][$locale], [], null, $other);
- }
-
- //Retrieve route matching path
- $route = $router->match($pathInfo);
-
- //Get route name
- $name = $route['_route'];
-
- //Unset route name
- unset($route['_route']);
-
- //With current locale
- if ($locale == $currentLocale) {
- //Set locale locales context
- $this->config[$tag][$view]['context']['canonical'] = $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL);
- } else {
- //Set locale locales context
- $this->config[$tag][$view]['context']['alternates'][$locale] = [
- 'absolute' => $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL),
- 'relative' => $router->generate($name, ['_locale' => $locale]+$route),
- 'title' => implode('/', $titles),
- 'translated' => $translator->trans($this->config['languages'][$locale], [], null, $locale)
- ];
- }
-
- //Add shorter locale
- if (empty($this->config[$tag][$view]['context']['alternates'][$slocale = substr($locale, 0, 2)])) {
- //Add shorter locale
- $this->config[$tag][$view]['context']['alternates'][$slocale] = [
- 'absolute' => $router->generate($name, ['_locale' => $locale]+$route, UrlGeneratorInterface::ABSOLUTE_URL),
- 'relative' => $router->generate($name, ['_locale' => $locale]+$route),
- 'title' => implode('/', $titles),
- 'translated' => $translator->trans($this->config['languages'][$locale], [], null, $locale)
- ];
- }
- }
- }
- }
- }
- }
- }
- }
-
/**
* Confirm account from mail link
*
@@ -238,7 +47,7 @@ class DefaultController extends AbstractController {
* @param string $hash The hashed password
* @return Response The response
*/
- public function confirm(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, $mail, $hash) {
+ public function confirm(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, $mail, $hash): Response {
//With invalid hash
if ($hash != $slugger->hash($mail)) {
//Throw bad request
@@ -268,9 +77,6 @@ class DefaultController extends AbstractController {
//Set active
$user->setActive(true);
- //Set updated
- $user->setUpdated(new \DateTime('now'));
-
//Persist user
$manager->persist($user);
@@ -289,13 +95,14 @@ class DefaultController extends AbstractController {
*
* @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
* @return Response The response
*/
- public function edit(Request $request, Registry $doctrine, EntityManagerInterface $manager, SluggerUtil $slugger, $mail, $hash) {
+ public function edit(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, $mail, $hash): Response {
//With invalid hash
if ($hash != $slugger->hash($mail)) {
//Throw bad request
@@ -313,14 +120,14 @@ class DefaultController extends AbstractController {
}
//Prevent access when not admin, user is not guest and not currently logged user
- if (!$this->isGranted('ROLE_ADMIN') && $user != $this->getUser()) {
+ if (!$this->isGranted('ROLE_ADMIN') && $user != $this->getUser() || !$this->isGranted('IS_AUTHENTICATED_FULLY')) {
//Throw access denied
//XXX: prevent slugger reverse engineering by not displaying decoded mail
throw $this->createAccessDeniedException($this->translator->trans('Unable to access user: %mail%', ['%mail%' => $smail]));
}
//Create the RegisterType form and give the proper parameters
- $form = $this->createForm($this->config['register']['view']['form'], $user, [
+ $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']),
//Set civility class
@@ -329,40 +136,106 @@ class DefaultController extends AbstractController {
'civility_default' => $doctrine->getRepository($this->config['class']['civility'])->findOneByTitle($this->config['default']['civility']),
//Disable mail
'mail' => $this->isGranted('ROLE_ADMIN'),
+ //Disable slug
+ 'slug' => $this->isGranted('ROLE_ADMIN'),
//Disable password
- //XXX: prefer a reset on login to force user unspam action
'password' => false,
//Set method
'method' => 'POST'
]);
+ //With admin role
+ if ($this->isGranted('ROLE_ADMIN')) {
+ //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']),
+ //Disable mail
+ 'mail' => false,
+ //Set method
+ 'method' => 'POST'
+ ]);
+
+ //With post method
+ if ($request->isMethod('POST')) {
+ //Refill the fields in case the form is not valid.
+ $reset->handleRequest($request);
+
+ //With reset submitted and valid
+ if ($reset->isSubmitted() && $reset->isValid()) {
+ //Set data
+ $data = $reset->getData();
+
+ //Set password
+ $data->setPassword($encoder->encodePassword($data, $data->getPassword()));
+
+ //Queue snippet save
+ $manager->persist($data);
+
+ //Flush to get the ids
+ $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']);
+ }
+ }
+
+ //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
if ($request->isMethod('POST')) {
//Refill the fields in case the form is not valid.
- $form->handleRequest($request);
+ $edit->handleRequest($request);
- if ($form->isValid()) {
+ //With edit submitted and valid
+ if ($edit->isSubmitted() && $edit->isValid()) {
//Set data
- $data = $form->getData();
+ $data = $edit->getData();
+
+ //Set slug
+ $slug = null;
+
+ //With admin
+ if ($this->isGranted('ROLE_ADMIN')) {
+ //With slug
+ if (!empty($data->getSlug())) {
+ //Set slug
+ $slug = $slugger->slug($data->getPseudonym());
+ }
+
+ //Update slug
+ $data->setSlug($slug);
+ }
//Queue snippet save
$manager->persist($data);
- //Flush to get the ids
- $manager->flush();
-
- //Add notice
- $this->addFlash('notice', $this->translator->trans('Account %mail% updated', ['%mail%' => $mail = $data->getMail()]));
+ //Try saving in database
+ try {
+ //Flush to get the ids
+ $manager->flush();
- //Redirect to user view
- //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']);
+ //Add notice
+ $this->addFlash('notice', $this->translator->trans('Account %mail% updated', ['%mail%' => $mail = $data->getMail()]));
- //Redirect to cleanup the form
- return $this->redirectToRoute('rapsys_air', ['user' => $data->getId()]);
+ //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']);
+ //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]));
+ }
}
- } else {
- //Add notice
- $this->addFlash('notice', $this->translator->trans('To change your password relogin with your mail %mail% and any password then follow the procedure', ['%mail%' => $mail]));
}
//Render view
@@ -370,16 +243,13 @@ class DefaultController extends AbstractController {
//Template
$this->config['edit']['view']['name'],
//Context
- ['form' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['edit']['view']['context']
+ ['edit' => $edit->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['edit']['view']['context']
);
}
/**
* Login
*
- * @todo When account is not activated, refuse login and send verification mail ?
- * @todo Redirect to referer if route is not connect ?
- *
* @param Request $request The request
* @param AuthenticationUtils $authenticationUtils The authentication utils
* @param RouterInterface $router The router instance
@@ -388,7 +258,7 @@ class DefaultController extends AbstractController {
* @param string $hash The hashed password
* @return Response The response
*/
- public function login(Request $request, AuthenticationUtils $authenticationUtils, RouterInterface $router, SluggerUtil $slugger, $mail, $hash) {
+ public function login(Request $request, AuthenticationUtils $authenticationUtils, RouterInterface $router, SluggerUtil $slugger, $mail, $hash): 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
@@ -455,7 +325,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'));
}
@@ -482,7 +351,7 @@ class DefaultController extends AbstractController {
* @param string $hash The hashed password
* @return Response The response
*/
- public function recover(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, $mail, $pass, $hash) {
+ public function recover(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, $mail, $pass, $hash): Response {
//Without mail, pass and hash
if (empty($mail) && empty($pass) && empty($hash)) {
//Create the LoginType form and give the proper parameters
@@ -653,9 +522,6 @@ class DefaultController extends AbstractController {
//Set user password
$user->setPassword($encoded);
- //Set updated
- $user->setUpdated(new \DateTime('now'));
-
//Persist user
$manager->persist($user);
@@ -694,12 +560,29 @@ class DefaultController extends AbstractController {
* @param string $hash The hashed serialized field array
* @return Response The response
*/
- public function register(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, LoggerInterface $logger, $mail, $field, $hash) {
- //Init reflection
- $reflection = new \ReflectionClass($this->config['class']['user']);
-
- //Create new user
- $user = $reflection->newInstance();
+ public function register(Request $request, Registry $doctrine, UserPasswordEncoderInterface $encoder, EntityManagerInterface $manager, SluggerUtil $slugger, MailerInterface $mailer, LoggerInterface $logger, $mail, $field, $hash): Response {
+ //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)) {
@@ -721,8 +604,110 @@ 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
+ $response = $this->render(
+ //Template
+ $this->config['register']['view']['name'],
+ //Context
+ ['title' => $this->translator->trans('Access denied'), 'disabled' => 1]+$this->config['register']['view']['context']
+ );
+
+ //Set 403
+ $response->setStatusCode(403);
+
+ //Return response
+ return $response;
+ //With unactivated existing
+ } elseif (!$existing->isActivated()) {
+ //Set mail shortcut
+ $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
@@ -750,12 +735,21 @@ class DefaultController extends AbstractController {
$smail = $mail;
//Set smail
- $sfield = $sfield;
+ $sfield = $field;
//Reset field
- $field = [];
+ $field = [
+ //Without slug
+ 'slug' => false
+ ];
}
+ //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
@@ -858,19 +852,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();
@@ -925,7 +906,7 @@ class DefaultController extends AbstractController {
$form->get('mail')->addError(new FormError($this->translator->trans('Account %mail% tried subscribe but unable to contact', ['%mail%' => $data->getMail()])));
}
//Catch double subscription
- } catch (\Doctrine\DBAL\Exception\UniqueConstraintViolationException $e) {
+ } catch (UniqueConstraintViolationException $e) {
//Add error message mail already exists
$this->addFlash('error', $this->translator->trans('Account %mail% already exists', ['%mail%' => $mail]));
}
@@ -940,11 +921,4 @@ class DefaultController extends AbstractController {
['form' => $form->createView(), 'sent' => $request->query->get('sent', 0)]+$this->config['register']['view']['context']
);
}
-
- /**
- * {@inheritdoc}
- */
- public function getAlias(): string {
- return RapsysUserBundle::getAlias();
- }
}