Update HTML 2FA template

Split paragraph in translation Inject wallabag_url for image in HTML template Remove username & password from config_dev.yml (null are already the default value)
2024-11-26 02:51:04 +00:00 · 2016-01-20 17:43:10 +01:00 · 2016-01-20 17:43:10 +01:00 · abd454c456
commit abd454c456
parent 5f736213af
7 changed files with 51 additions and 39 deletions
--- 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
-
--- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
+++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
@ -46,6 +46,13 @@ class AuthCodeMailer implements AuthCodeMailerInterface
     */
    private $supportUrl;

+    /**
+     * Url for the wallabag instance.
+     *
+     * @var string
+     */
+    private $wallabagUrl;
+
    /**
     * Initialize the auth code mailer with the SwiftMailer object.
     *
@ -54,14 +61,16 @@ class AuthCodeMailer implements AuthCodeMailerInterface
     * @param string            $senderEmail
     * @param string            $senderName
     * @param string            $supportUrl
+     * @param string            $wallabagUrl
     */
-    public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl)
+    public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
    {
        $this->mailer = $mailer;
        $this->twig = $twig;
        $this->senderEmail = $senderEmail;
        $this->senderName = $senderName;
        $this->supportUrl = $supportUrl;
+        $this->wallabagUrl = $wallabagUrl;
    }

    /**
@ -77,12 +86,13 @@ class AuthCodeMailer implements AuthCodeMailerInterface
        $bodyHtml = $template->renderBlock('body_html', [
            'user' => $user->getName(),
            'code' => $user->getEmailAuthCode(),
-            'support' => $this->supportUrl,
+            'support_url' => $this->supportUrl,
+            'wallabag_url' => $this->wallabagUrl,
        ]);
        $bodyText = $template->renderBlock('body_text', [
            'user' => $user->getName(),
            'code' => $user->getEmailAuthCode(),
-            'support' => $this->supportUrl,
+            'support_url' => $this->supportUrl,
        ]);

        $message = new \Swift_Message();
--- a/src/Wallabag/UserBundle/Resources/config/services.yml
+++ b/src/Wallabag/UserBundle/Resources/config/services.yml
@ -7,3 +7,4 @@ services:
            - "%scheb_two_factor.email.sender_email%"
            - "%scheb_two_factor.email.sender_name%"
            - "%wallabag_support_url%"
+            - "%wallabag_url%"
--- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.en.yml
@ -1,9 +1,7 @@
 # Two factor mail
 auth_code.mailer.subject: 'Wallabag authentication Code'
 auth_code.mailer.body.hello: "Hi %user%,"
-auth_code.mailer.body.content: |
-    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%
-auth_code.mailer.body.signature: |
-    Please don't hesitate to contact us if you have any problems: %support%
-    The wallabag team
+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"
--- a/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml
+++ b/src/Wallabag/UserBundle/Resources/translations/wallabag_user.fr.yml
@ -1,9 +1,7 @@
 # Two factor mail
 auth_code.mailer.subject: "Code d'authentification wallabag"
 auth_code.mailer.body.hello: "Bonjour %user%,"
-auth_code.mailer.body.content: |
-    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%
-auth_code.mailer.body.signature: |
-    Si vous avez un problème de connexion, n'hésitez pas à contacter le support: %support%
-    L'équipe wallabag
+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"
--- a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
+++ b/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
@ -2,6 +2,17 @@
 {{ "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 %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

@ -63,10 +74,10 @@

                <table cellpadding="0" cellspacing="0" border="0" align="center" id="card">
                    <tr>
-                        <td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{ wallabag_url }/themes/material/img/logo-other_themes.png" alt="logo" title="{ wallabag_url }" style="width: 96px; height: 96px;" /></td>
+                        <td style="padding: 20px;" width="96px" valign="top"><img class="image_fix" src="{{ wallabag_url }}/themes/material/img/logo-other_themes.png" alt="logo" title="{{ wallabag_url }}" style="width: 96px; height: 96px;" /></td>
                        <td style="padding: 20px; padding-left: 0;" valign="top" id="cell_desc">
-                            <h1>Wallabag</h1>
-                            <h5>{% trans %}on{% endtrans %} { wallabag_url }</h5>
+                            <h1>wallabag</h1>
+                            <h5>{% trans %}on{% endtrans %} {{ wallabag_url }}</h5>
                        </td>
                    </tr>
                    <tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;">&nbsp;</div></td></tr>
@ -75,10 +86,11 @@

                            <p><b>{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}</b></p>

-                            <p>{{ "auth_code.mailer.body.content"|trans({'%code%': code}, 'wallabag_user') }}</p>
-
-                            <p>{{ "auth_code.mailer.body.signature"|trans({'%support%': support}, 'wallabag_user') }}</p>
+                            <p>{{ "auth_code.mailer.body.first_para"|trans({}, 'wallabag_user') }}</p>
+                            <p>{{ "auth_code.mailer.body.second_para"|trans({}, 'wallabag_user') }} <b>{{ code }}</b></p>

+                            <p>{{ "auth_code.mailer.body.support"|trans({}, 'wallabag_user') }} <a href="{{ support_url }}">{{ support_url }}</a></p>
+                            <p>{{ "auth_code.mailer.body.signature"|trans({}, 'wallabag_user') }}</p>
                        </td>
                    </tr>
                    <tr><td colspan="2" style="padding: 0;"><div style="height: 0; border-top: 1px solid #c5c5c5;">&nbsp;</div></td></tr>
@ -87,8 +99,8 @@

                            <table cellpadding="0" cellspacing="0" border="0" width="100%">
                                <tr>
-                                    <td valign="top" style="padding: 20px; text-align: center"><a href="{ wallabag_url }">{ wallabag_url }</a></td>
-                                    <td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">Wallabag</a></td>
+                                    <td valign="top" style="padding: 20px; text-align: center"><a href="{{ wallabag_url }}">{{ wallabag_url }}</a></td>
+                                    <td valign="top" style="padding: 20px; text-align: center">Powered by <a href="https://www.wallabag.org/">wallabag</a></td>
                                </tr>
                            </table>

@ -103,10 +115,3 @@
 </body>
 </html>
 {% endblock %}
-
-{% block body_text %}
-{{ "auth_code.mailer.body.hello"|trans({'%user%': user}, 'wallabag_user') }}
-
-{{ "auth_code.mailer.body.content"|trans({'%code%': code}, 'wallabag_user') }}
-{{ "auth_code.mailer.body.signature"|trans({'%support%': support}, 'wallabag_user') }}
-{% endblock %}
--- a/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php
+++ b/src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php
@ -36,11 +36,13 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
        );
        $this->mailer = new \Swift_Mailer($transport);

-        $this->twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => '
+        $twigTemplate = <<<TWIG
 {% block subject %}subject{% endblock %}
-{% block body_html %}html body{% endblock %}
-{% block body_text %}text body{% endblock %}
-')));
+{% block body_html %}html body {{ code }}{% endblock %}
+{% block body_text %}text body {{ support_url }}{% endblock %}
+TWIG;
+
+        $this->twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => $twigTemplate)));
    }

    public function testSendEmail()
@ -56,6 +58,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
            $this->twig,
            'nobody@test.io',
            'wallabag test',
+            'http://0.0.0.0/support',
            'http://0.0.0.0'
        );

@ -67,7 +70,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
        $this->assertArrayHasKey('test@wallabag.io', $msg->getTo());
        $this->assertEquals(array('nobody@test.io' => 'wallabag test'), $msg->getFrom());
        $this->assertEquals('subject', $msg->getSubject());
-        $this->assertContains('text body', $msg->toString());
-        $this->assertContains('html body', $msg->toString());
+        $this->assertContains('text body http://0.0.0.0/support', $msg->toString());
+        $this->assertContains('html body 666666', $msg->toString());
    }
 }