From 6eaf1319227158df7724d25f53bf03f7c1a52bc1 Mon Sep 17 00:00:00 2001
From: aureateflux <106857930+aureateflux@users.noreply.github.com>
Date: Sat, 21 Oct 2023 13:50:22 -0500
Subject: [PATCH] 2FA Confirmation Code Email subject line change to fix
 triggering Google spam blocker (#3572)

* Update twofactor_email.hbs subject line to avoid triggering gmail content filter

Previous subject line was triggering Google's spam blocker, breaking the 2FA setup process if a gmail SMTP server is configured.  The new subject line does not (currently) run afoul of Google's filter.

* Update twofactor_email.html.hbs subject line to avoid triggering gmail content filter

Previous subject line was triggering Google's spam blocker, breaking the 2FA setup process if a gmail SMTP server is configured.  The new subject line does not (currently) run afoul of Google's filter.

* Update twofactor_email.hbs

Changed "Confirmation" to "Verification" for the sake of internal consistency

* Update twofactor_email.hbs

* Update twofactor_email.html.hbs
---
 src/static/templates/email/twofactor_email.hbs      | 4 ++--
 src/static/templates/email/twofactor_email.html.hbs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/static/templates/email/twofactor_email.hbs b/src/static/templates/email/twofactor_email.hbs
index ae24df6a96..01d79e9f23 100644
--- a/src/static/templates/email/twofactor_email.hbs
+++ b/src/static/templates/email/twofactor_email.hbs
@@ -1,6 +1,6 @@
-Your Two-step Login Verification Code
+Vaultwarden Login Verification Code
 <!---------------->
 Your two-step verification code is: {{token}}
 
 Use this code to complete logging in with Vaultwarden.
-{{> email/email_footer_text }}
\ No newline at end of file
+{{> email/email_footer_text }}
diff --git a/src/static/templates/email/twofactor_email.html.hbs b/src/static/templates/email/twofactor_email.html.hbs
index fb21dc690a..30990d9e0c 100644
--- a/src/static/templates/email/twofactor_email.html.hbs
+++ b/src/static/templates/email/twofactor_email.html.hbs
@@ -1,4 +1,4 @@
-Your Two-step Login Verification Code
+Vaultwarden Login Verification Code
 <!---------------->
 {{> email/email_header }}
 <table width="100%" cellpadding="0" cellspacing="0" style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
@@ -13,4 +13,4 @@ Your Two-step Login Verification Code
         </td>
     </tr>
 </table>
-{{> email/email_footer }}
\ No newline at end of file
+{{> email/email_footer }}