diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml index 6b077fdbd..2813e369d 100644 --- a/app/config/config_dev.yml +++ b/app/config/config_dev.yml @@ -42,6 +42,3 @@ swiftmailer: transport: smtp host: 'localhost' port: 1025 - username: null - password: null - diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php index be370e71d..6b108dd3e 100644 --- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php +++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php @@ -4,7 +4,6 @@ namespace Wallabag\UserBundle\Mailer; use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; -use Symfony\Component\Translation\TranslatorInterface; /** * Custom mailer for TwoFactorBundle email. @@ -20,11 +19,11 @@ class AuthCodeMailer implements AuthCodeMailerInterface private $mailer; /** - * Translator for email content. + * Twig to render the html's email. * - * @var TranslatorInterface + * @var \Twig_Environment */ - private $translator; + private $twig; /** * Sender email address. @@ -47,22 +46,31 @@ class AuthCodeMailer implements AuthCodeMailerInterface */ private $supportUrl; + /** + * Url for the wallabag instance. + * + * @var string + */ + private $wallabagUrl; + /** * Initialize the auth code mailer with the SwiftMailer object. * - * @param \Swift_Mailer $mailer - * @param TranslatorInterface $translator - * @param string $senderEmail - * @param string $senderName - * @param string $supportUrl + * @param \Swift_Mailer $mailer + * @param \Twig_Environment $twig + * @param string $senderEmail + * @param string $senderName + * @param string $supportUrl + * @param string $wallabagUrl */ - public function __construct(\Swift_Mailer $mailer, TranslatorInterface $translator, $senderEmail, $senderName, $supportUrl) + public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) { $this->mailer = $mailer; - $this->translator = $translator; + $this->twig = $twig; $this->senderEmail = $senderEmail; $this->senderName = $senderName; $this->supportUrl = $supportUrl; + $this->wallabagUrl = $wallabagUrl; } /** @@ -72,20 +80,28 @@ class AuthCodeMailer implements AuthCodeMailerInterface */ public function sendAuthCode(TwoFactorInterface $user) { + $template = $this->twig->loadTemplate('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig'); + + $subject = $template->renderBlock('subject', array()); + $bodyHtml = $template->renderBlock('body_html', [ + 'user' => $user->getName(), + 'code' => $user->getEmailAuthCode(), + 'support_url' => $this->supportUrl, + 'wallabag_url' => $this->wallabagUrl, + ]); + $bodyText = $template->renderBlock('body_text', [ + 'user' => $user->getName(), + 'code' => $user->getEmailAuthCode(), + 'support_url' => $this->supportUrl, + ]); + $message = new \Swift_Message(); $message ->setTo($user->getEmail()) ->setFrom($this->senderEmail, $this->senderName) - ->setSubject($this->translator->trans('auth_code.mailer.subject', array(), 'wallabag_user')) - ->setBody($this->translator->trans( - 'auth_code.mailer.body', - [ - '%user%' => $user->getName(), - '%code%' => $user->getEmailAuthCode(), - '%support%' => $this->supportUrl, - ], - 'wallabag_user' - )) + ->setSubject($subject) + ->setBody($bodyText, 'text/plain') + ->addPart($bodyHtml, 'text/html') ; $this->mailer->send($message); diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index 9109b6a37..93e04d592 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml @@ -3,7 +3,8 @@ services: class: Wallabag\UserBundle\Mailer\AuthCodeMailer arguments: - "@mailer" - - "@translator" + - "@twig" - "%scheb_two_factor.email.sender_email%" - "%scheb_two_factor.email.sender_name%" - "%wallabag_support_url%" + - "%wallabag_url%" diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml index f806d1d6f..4da6075f4 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml @@ -1,10 +1,7 @@ # Two factor mail auth_code.mailer.subject: 'Wallabag authentication Code' -auth_code.mailer.body: | - Hi %user%, - - Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection. - Here is the code: %code% - - Please don't hesitate to contact us if you have any problems: %support% - The wallabag team +auth_code.mailer.body.hello: "Hi %user%," +auth_code.mailer.body.first_para: "Since you enable two factor authentication on your wallabag account and you just logged in from a new device (computer, phone, etc.), we send you a code to validate your connection." +auth_code.mailer.body.second_para: "Here is the code:" +auth_code.mailer.body.support: "Please don't hesitate to contact us if you have any problems:" +auth_code.mailer.body.signature: "The wallabag team" diff --git a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml index 386b2d9eb..b4448d3a4 100644 --- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml +++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml @@ -1,10 +1,7 @@ # Two factor mail auth_code.mailer.subject: "Code d'authentification wallabag" -auth_code.mailer.body: | - Bonjour %user%, - - Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion. - Voici le code à renseigner: %code% - - Si vous avez un problème de connexion, n'hésitez pas à contacter le support: %support% - L'équipe wallabag +auth_code.mailer.body.hello: "Bonjour %user%," +auth_code.mailer.body.first_para: "Comme vous avez activé la double authentification sur votre compte wallabag et que vous venez de vous connecter depuis un nouvel appareil (ordinateur, téléphone, etc.), nous vous envoyons un code pour valider votre connexion." +auth_code.mailer.body.second_para: "Voici le code à renseigner :" +auth_code.mailer.body.support: "Si vous avez un problème de connexion, n'hésitez pas à contacter le support :" +auth_code.mailer.body.signature: "L'équipe wallabag" diff --git a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig new file mode 100644 index 000000000..69d231600 --- /dev/null +++ b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig @@ -0,0 +1,117 @@ +{% block subject %} +{{ "auth_code.mailer.subject"|trans({}, 'wallabag_user') }} +{% endblock %} + +{% block body_text %} +{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }} + +{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }} +{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} {{ code }} + +{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} {{ support_url }} + +{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }} +{% endblock %} + +{% block body_html %} + + + + + + + {{ "auth_code.mailer.subject"|trans({}, 'wallabag_user') }} + + + + + +
+ {{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }} +
+ + + + + +
+ + + + + + + + + + + + + + +
logo +

wallabag

+
{% trans %}on{% endtrans %} {{ wallabag_url }}
+
 
+ +

{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}

+ +

{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }}

+

{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} {{ code }}

+ +

{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} {{ support_url }}

+

{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }}

+
 
+ + + + + + +
{{ wallabag_url }}Powered by wallabag
+ +
+ +
+ + + +{% endblock %} diff --git a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php index 61e960f9c..e3f43a7e7 100644 --- a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php +++ b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php @@ -4,8 +4,6 @@ namespace Wallabag\UserBundle\Tests\Mailer; use Wallabag\UserBundle\Entity\User; use Wallabag\UserBundle\Mailer\AuthCodeMailer; -use Symfony\Component\Translation\Translator; -use Symfony\Component\Translation\Loader\ArrayLoader; /** * @see https://www.pmg.com/blog/integration-testing-swift-mailer/ @@ -27,7 +25,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase { protected $mailer; protected $spool; - protected $translator; + protected $twig; protected function setUp() { @@ -38,12 +36,13 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase ); $this->mailer = new \Swift_Mailer($transport); - $this->translator = new Translator('en'); - $this->translator->addLoader('array', new ArrayLoader()); - $this->translator->addResource('array', array( - 'auth_code.mailer.subject' => 'auth_code subject', - 'auth_code.mailer.body' => 'Hi %user%, here is the code: %code% and the support: %support%', - ), 'en', 'wallabag_user'); + $twigTemplate = <<twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => $twigTemplate))); } public function testSendEmail() @@ -56,9 +55,10 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase $authCodeMailer = new AuthCodeMailer( $this->mailer, - $this->translator, + $this->twig, 'nobody@test.io', 'wallabag test', + 'http://0.0.0.0/support', 'http://0.0.0.0' ); @@ -69,7 +69,8 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase $msg = $this->spool->getMessages()[0]; $this->assertArrayHasKey('test@wallabag.io', $msg->getTo()); $this->assertEquals(array('nobody@test.io' => 'wallabag test'), $msg->getFrom()); - $this->assertEquals('auth_code subject', $msg->getSubject()); - $this->assertContains('Hi Bob, here is the code: 666666 and the support: http://0.0.0.0', $msg->toString()); + $this->assertEquals('subject', $msg->getSubject()); + $this->assertContains('text body http://0.0.0.0/support', $msg->toString()); + $this->assertContains('html body 666666', $msg->toString()); } }