namespace Rapsys\UserBundle\Controller;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
+
+use Rapsys\UserBundle\RapsysUserBundle;
+
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
use Symfony\Component\Form\FormError;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
-use Rapsys\UserBundle\RapsysUserBundle;
-
/**
* {@inheritdoc}
*/
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]));
+ $this->addFlash('error', $this->translator->trans('Account do not exists'));
//Redirect to register view
return $this->redirectToRoute($this->config['route']['register']['name'], $this->config['route']['register']['context']);
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]));
+ throw $this->createNotFoundException($this->translator->trans('Unable to find account'));
}
//Prevent access when not admin, user is not guest and not currently logged user
if (!$this->checker->isGranted($this->config['default']['admin']) && $user != $this->security->getUser() || !$this->checker->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]));
+ throw $this->createAccessDeniedException($this->translator->trans('Unable to access user'));
}
//Create the EditType form and give the proper parameters
- $edit = $this->createForm($this->config['edit']['view']['edit'], $user, [
+ $edit = $this->factory->create($this->config['edit']['view']['edit'], $user, [
//Set action to edit route name and context
'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']),
//Set civility class
//With admin role
if ($this->checker->isGranted($this->config['default']['admin'])) {
//Create the EditType form and give the proper parameters
- $reset = $this->createForm($this->config['edit']['view']['reset'], $user, [
+ $reset = $this->factory->create($this->config['edit']['view']['reset'], $user, [
//Set action to edit route name and context
'action' => $this->generateUrl($this->config['route']['edit']['name'], ['mail' => $smail, 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']),
//Set method
$this->manager->flush();
//Add notice
- $this->addFlash('notice', $this->translator->trans('Account %mail% password updated', ['%mail%' => $mail = $data->getMail()]));
+ $this->addFlash('notice', $this->translator->trans('Account password updated'));
//Redirect to cleanup the form
return $this->redirectToRoute($this->config['route']['edit']['name'], ['mail' => $smail = $this->slugger->short($mail), 'hash' => $this->slugger->hash($smail)]+$this->config['route']['edit']['context']);
$this->manager->flush();
//Add notice
- $this->addFlash('notice', $this->translator->trans('Account %mail% updated', ['%mail%' => $mail = $data->getMail()]));
+ $this->addFlash('notice', $this->translator->trans('Account updated'));
//Redirect to cleanup the form
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% already exists', ['%mail%' => $data->getMail()]));
+ $this->addFlash('error', $this->translator->trans('Account already exists'));
}
}
//Without admin role
*/
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, [
+ $login = $this->factory->create($this->config['login']['view']['form'], null, [
//Set action to login route name and context
'action' => $this->generateUrl($this->config['route']['login']['name'], $this->config['route']['login']['context']),
//Set method
$login->get('mail')->addError(new FormError($error));
//Create the RecoverType form and give the proper parameters
- $recover = $this->createForm($this->config['recover']['view']['form'], null, [
+ $recover = $this->factory->create($this->config['recover']['view']['form'], null, [
//Set action to recover route name and context
'action' => $this->generateUrl($this->config['route']['recover']['name'], $this->config['route']['recover']['context']),
//Without password
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]));
+ throw $this->createNotFoundException($this->translator->trans('Unable to find account'));
}
//With unmatched pass
}
//Create the LoginType form and give the proper parameters
- $form = $this->createForm($this->config['recover']['view']['form'], $user, [
+ $form = $this->factory->create($this->config['recover']['view']['form'], $user, [
//Set action to recover route name and context
'action' => $this->generateUrl($this->config['route']['recover']['name'], $context+$this->config['route']['recover']['context']),
//With user disable mail
//Create message
$message = (new TemplatedEmail())
//Set sender
- ->from(new Address($this->config['contact']['address'], $this->config['contact']['name']))
+ ->from(new Address($this->config['contact']['address'], $this->translator->trans($this->config['contact']['name'])))
//Set recipient
//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
->to(new Address($context['recipient_mail'], $context['recipient_name']))
$this->mailer->send($message);
//Add notice
- $this->addFlash('notice', $this->translator->trans('Your recovery mail has been sent, to retrieve your account you must follow the recuperate link inside'));
+ $this->addFlash('notice', $this->translator->trans('Your recovery mail has been sent, to retrieve your account follow the recuperate link inside'));
//Add junk warning
- $this->addFlash('warning', $this->translator->trans('If you did not receive a recovery mail, check your Spam or Junk mail folders'));
+ $this->addFlash('warning', $this->translator->trans('If you did not receive a recovery mail, check your Spam or Junk mail folder'));
//Redirect on the same route with sent=1 to cleanup form
return $this->redirectToRoute($request->get('_route'), ['sent' => 1]+$request->get('_route_params'), 302);
//Log new user infos
$this->logger->emergency(
$this->translator->trans(
- 'register: mail=%mail% locale=%locale% confirm=%confirm%',
+ 'register: mail=%mail% locale=%locale% confirm=%confirm% ip=%ip%',
[
'%mail%' => $postMail = $_POST['register']['mail'],
'%locale%' => $request->getLocale(),
'hash' => $this->slugger->hash($postSmail)
]+$this->config['route']['confirm']['context'],
UrlGeneratorInterface::ABSOLUTE_URL
- )
+ ),
+ '%ip%' => $request->getClientIp()
]
)
);
$user = $reflection->newInstance('', '');
//Create the RegisterType form and give the proper parameters
- $form = $this->createForm($this->config['register']['view']['form'], $user, [
+ $form = $this->factory->create($this->config['register']['view']['form'], $user, [
//Set action to register route name and context
'action' => $this->generateUrl($this->config['route']['register']['name'], $this->config['route']['register']['context']),
//Set civility class
//Create message
$message = (new TemplatedEmail())
//Set sender
- ->from(new Address($this->config['contact']['address'], $this->config['contact']['name']))
+ ->from(new Address($this->config['contact']['address'], $this->translator->trans($this->config['contact']['name'])))
//Set recipient
//XXX: remove the debug set in vendor/symfony/mime/Address.php +46
->to(new Address($context['recipient_mail'], $context['recipient_name']))
$this->manager->flush();
//Add error message mail already exists
- $this->addFlash('notice', $this->translator->trans('Your account has been created'));
+ $this->addFlash('notice', $this->translator->trans('Account created'));
//Try sending message
//XXX: mail delivery may silently fail
Rapsys Git / userbundle / blobdiff