diff options
author | Daniel <[email protected]> | 2024-09-18 20:03:15 +0300 |
---|---|---|
committer | GitHub <[email protected]> | 2024-09-18 19:03:15 +0200 |
commit | 21efc0800ddfc4378a541c6d507a1cd481496575 (patch) | |
tree | a46767b5630f6ec794d864f0717789b64de7db16 /src/static | |
parent | 1031c2e2863414ff7a1bedb33f458ebed19859bf (diff) | |
download | vaultwarden-21efc0800ddfc4378a541c6d507a1cd481496575.tar.gz vaultwarden-21efc0800ddfc4378a541c6d507a1cd481496575.zip |
Actually use Device Type for mails (#4916)
- match Bitwarden behaviour
- add a different segment in mails for Device Name
Diffstat (limited to 'src/static')
4 files changed, 21 insertions, 9 deletions
diff --git a/src/static/templates/email/incomplete_2fa_login.hbs b/src/static/templates/email/incomplete_2fa_login.hbs index d9ff3950..a7120141 100644 --- a/src/static/templates/email/incomplete_2fa_login.hbs +++ b/src/static/templates/email/incomplete_2fa_login.hbs @@ -1,10 +1,11 @@ -Incomplete Two-Step Login From {{{device}}} +Incomplete Two-Step Login From {{{device_name}}} <!----------------> Someone attempted to log into your account with the correct master password, but did not provide the correct token or action required to complete the two-step login process within {{time_limit}} minutes of the initial login attempt. * Date: {{datetime}} * IP Address: {{ip}} -* Device Type: {{device}} +* Device Name: {{device_name}} +* Device Type: {{device_type}} If this was not you or someone you authorized, then you should change your master password as soon as possible, as it is likely to be compromised. {{> email/email_footer_text }} diff --git a/src/static/templates/email/incomplete_2fa_login.html.hbs b/src/static/templates/email/incomplete_2fa_login.html.hbs index 8bc1ce21..d388a1df 100644 --- a/src/static/templates/email/incomplete_2fa_login.html.hbs +++ b/src/static/templates/email/incomplete_2fa_login.html.hbs @@ -1,4 +1,4 @@ -Incomplete Two-Step Login From {{{device}}} +Incomplete Two-Step Login From {{{device_name}}} <!----------------> {{> 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;"> @@ -19,7 +19,12 @@ Incomplete Two-Step Login From {{{device}}} </tr> <tr 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;"> <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top"> - <b>Device Type:</b> {{device}} + <b>Device Name:</b> {{device_name}} + </td> + </tr> + <tr 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;"> + <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top"> + <b>Device Type:</b> {{device_type}} </td> </tr> <tr 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;"> diff --git a/src/static/templates/email/new_device_logged_in.hbs b/src/static/templates/email/new_device_logged_in.hbs index 9734dcbe..b76b1d25 100644 --- a/src/static/templates/email/new_device_logged_in.hbs +++ b/src/static/templates/email/new_device_logged_in.hbs @@ -1,10 +1,11 @@ -New Device Logged In From {{{device}}} +New Device Logged In From {{{device_name}}} <!----------------> Your account was just logged into from a new device. * Date: {{datetime}} * IP Address: {{ip}} -* Device Type: {{device}} +* Device Name: {{device_name}} +* Device Type: {{device_type}} You can deauthorize all devices that have access to your account from the web vault ( {{url}} ) under Settings > My Account > Deauthorize Sessions. -{{> email/email_footer_text }}
\ No newline at end of file +{{> email/email_footer_text }} diff --git a/src/static/templates/email/new_device_logged_in.html.hbs b/src/static/templates/email/new_device_logged_in.html.hbs index 763e7994..52365acf 100644 --- a/src/static/templates/email/new_device_logged_in.html.hbs +++ b/src/static/templates/email/new_device_logged_in.html.hbs @@ -1,4 +1,4 @@ -New Device Logged In From {{{device}}} +New Device Logged In From {{{device_name}}} <!----------------> {{> 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;"> @@ -19,7 +19,12 @@ New Device Logged In From {{{device}}} </tr> <tr 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;"> <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top"> - <b>Device Type:</b> {{device}} + <b>Device Name:</b> {{device_name}} + </td> + </tr> + <tr 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;"> + <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top"> + <b>Device Type:</b> {{device_type}} </td> </tr> <tr 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;"> |