From f850dbb310d22ec27d07d696c0af1e3e783da092 Mon Sep 17 00:00:00 2001 From: kennymc-c Date: Tue, 11 Apr 2023 21:27:38 +0200 Subject: [PATCH 1/3] Fixed some missing footer_text partials and a few inconsistencies between plain text and html email templates --- src/static/templates/email/admin_reset_password.hbs | 4 +--- src/static/templates/email/change_email.hbs | 4 +--- src/static/templates/email/delete_account.html.hbs | 2 +- src/static/templates/email/invite_accepted.hbs | 2 +- src/static/templates/email/invite_confirmed.hbs | 4 ++-- src/static/templates/email/send_2fa_removed_from_org.hbs | 4 +--- .../templates/email/send_single_org_removed_from_org.hbs | 3 +-- 7 files changed, 8 insertions(+), 15 deletions(-) mode change 100644 => 100755 src/static/templates/email/admin_reset_password.hbs mode change 100644 => 100755 src/static/templates/email/change_email.hbs mode change 100644 => 100755 src/static/templates/email/delete_account.html.hbs mode change 100644 => 100755 src/static/templates/email/invite_accepted.hbs mode change 100644 => 100755 src/static/templates/email/invite_confirmed.hbs mode change 100644 => 100755 src/static/templates/email/send_2fa_removed_from_org.hbs mode change 100644 => 100755 src/static/templates/email/send_single_org_removed_from_org.hbs diff --git a/src/static/templates/email/admin_reset_password.hbs b/src/static/templates/email/admin_reset_password.hbs old mode 100644 new mode 100755 index 8d381772..89844316 --- a/src/static/templates/email/admin_reset_password.hbs +++ b/src/static/templates/email/admin_reset_password.hbs @@ -1,6 +1,4 @@ Master Password Has Been Changed The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately. - -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer }} diff --git a/src/static/templates/email/change_email.hbs b/src/static/templates/email/change_email.hbs old mode 100644 new mode 100755 index 170af6f9..e641182d --- a/src/static/templates/email/change_email.hbs +++ b/src/static/templates/email/change_email.hbs @@ -3,6 +3,4 @@ Your Email Change To finalize changing your email address enter the following code in web vault: {{token}} If you did not try to change an email address, you can safely ignore this email. - -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer }} diff --git a/src/static/templates/email/delete_account.html.hbs b/src/static/templates/email/delete_account.html.hbs old mode 100644 new mode 100755 index a129ce59..431f6165 --- a/src/static/templates/email/delete_account.html.hbs +++ b/src/static/templates/email/delete_account.html.hbs @@ -4,7 +4,7 @@ Delete Your Account diff --git a/src/static/templates/email/invite_accepted.hbs b/src/static/templates/email/invite_accepted.hbs old mode 100644 new mode 100755 index e2148577..abe3d10b --- a/src/static/templates/email/invite_accepted.hbs +++ b/src/static/templates/email/invite_accepted.hbs @@ -1,5 +1,5 @@ Invitation to {{{org_name}}} accepted -Your invitation for *{{email}}* to join *{{org_name}}* was accepted. +This email is to notify you that {{email}} has accepted your invitation to join {{org_name}}. Please log in via {{url}} to the vaultwarden server and confirm them from the organization management page. {{> email/email_footer_text }} \ No newline at end of file diff --git a/src/static/templates/email/invite_confirmed.hbs b/src/static/templates/email/invite_confirmed.hbs old mode 100644 new mode 100755 index c7ea4f9a..e14153b8 --- a/src/static/templates/email/invite_confirmed.hbs +++ b/src/static/templates/email/invite_confirmed.hbs @@ -1,5 +1,5 @@ Invitation to {{{org_name}}} confirmed -Your invitation to join *{{org_name}}* was confirmed. -It will now appear under the Organizations the next time you log in to the web vault at {{url}}. +This email is to notify you that you have been confirmed as a user of {{org_name}}. +Any collections and logins being shared with you by this organization will now appear in your Vaultwarden vault at {{url}}. {{> email/email_footer_text }} \ No newline at end of file diff --git a/src/static/templates/email/send_2fa_removed_from_org.hbs b/src/static/templates/email/send_2fa_removed_from_org.hbs old mode 100644 new mode 100755 index 95d41b97..c2440316 --- a/src/static/templates/email/send_2fa_removed_from_org.hbs +++ b/src/static/templates/email/send_2fa_removed_from_org.hbs @@ -4,6 +4,4 @@ You have been removed from organization *{{org_name}}* because your account does You can enable Two-step Login in your account settings. - -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer }} diff --git a/src/static/templates/email/send_single_org_removed_from_org.hbs b/src/static/templates/email/send_single_org_removed_from_org.hbs old mode 100644 new mode 100755 index 0686d986..5672ab9f --- a/src/static/templates/email/send_single_org_removed_from_org.hbs +++ b/src/static/templates/email/send_single_org_removed_from_org.hbs @@ -1,5 +1,4 @@ You have been removed from {{{org_name}}} Your user account has been removed from the *{{org_name}}* organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account. -=== -Github: https://github.com/dani-garcia/vaultwarden +{{> email/email_footer }} From 6a7cee4e7e4d26d04b9c6a425d04ccc567207939 Mon Sep 17 00:00:00 2001 From: kennymc-c Date: Tue, 11 Apr 2023 22:00:10 +0200 Subject: [PATCH 2/3] Fixed footer to footer_text --- src/static/templates/email/admin_reset_password.hbs | 2 +- src/static/templates/email/change_email.hbs | 2 +- src/static/templates/email/send_2fa_removed_from_org.hbs | 2 +- src/static/templates/email/send_single_org_removed_from_org.hbs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/static/templates/email/admin_reset_password.hbs b/src/static/templates/email/admin_reset_password.hbs index 89844316..f70423f1 100755 --- a/src/static/templates/email/admin_reset_password.hbs +++ b/src/static/templates/email/admin_reset_password.hbs @@ -1,4 +1,4 @@ Master Password Has Been Changed The master password for {{user_name}} has been changed by an administrator in your {{org_name}} organization. If you did not initiate this request, please reach out to your administrator immediately. -{{> email/email_footer }} +{{> email/email_footer_text }} diff --git a/src/static/templates/email/change_email.hbs b/src/static/templates/email/change_email.hbs index e641182d..4262fd74 100755 --- a/src/static/templates/email/change_email.hbs +++ b/src/static/templates/email/change_email.hbs @@ -3,4 +3,4 @@ Your Email Change To finalize changing your email address enter the following code in web vault: {{token}} If you did not try to change an email address, you can safely ignore this email. -{{> email/email_footer }} +{{> email/email_footer_text }} diff --git a/src/static/templates/email/send_2fa_removed_from_org.hbs b/src/static/templates/email/send_2fa_removed_from_org.hbs index c2440316..79956bbb 100755 --- a/src/static/templates/email/send_2fa_removed_from_org.hbs +++ b/src/static/templates/email/send_2fa_removed_from_org.hbs @@ -4,4 +4,4 @@ You have been removed from organization *{{org_name}}* because your account does You can enable Two-step Login in your account settings. -{{> email/email_footer }} +{{> email/email_footer_text }} diff --git a/src/static/templates/email/send_single_org_removed_from_org.hbs b/src/static/templates/email/send_single_org_removed_from_org.hbs index 5672ab9f..ec77cf63 100755 --- a/src/static/templates/email/send_single_org_removed_from_org.hbs +++ b/src/static/templates/email/send_single_org_removed_from_org.hbs @@ -1,4 +1,4 @@ You have been removed from {{{org_name}}} Your user account has been removed from the *{{org_name}}* organization because you are a part of another organization. The {{org_name}} organization has enabled a policy that prevents users from being a part of multiple organizations. Before you can re-join this organization you need to leave all other organizations or join with a different account. -{{> email/email_footer }} +{{> email/email_footer_text }} From 271e3ae757d6c11ddcff99e2bd91aa38abde7ab9 Mon Sep 17 00:00:00 2001 From: kennymc-c Date: Wed, 12 Apr 2023 18:06:46 +0200 Subject: [PATCH 3/3] Changed permissions back to 644 --- src/static/templates/email/admin_reset_password.hbs | 0 src/static/templates/email/change_email.hbs | 0 src/static/templates/email/delete_account.html.hbs | 0 src/static/templates/email/invite_accepted.hbs | 0 src/static/templates/email/invite_confirmed.hbs | 0 src/static/templates/email/send_2fa_removed_from_org.hbs | 0 src/static/templates/email/send_single_org_removed_from_org.hbs | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 src/static/templates/email/admin_reset_password.hbs mode change 100755 => 100644 src/static/templates/email/change_email.hbs mode change 100755 => 100644 src/static/templates/email/delete_account.html.hbs mode change 100755 => 100644 src/static/templates/email/invite_accepted.hbs mode change 100755 => 100644 src/static/templates/email/invite_confirmed.hbs mode change 100755 => 100644 src/static/templates/email/send_2fa_removed_from_org.hbs mode change 100755 => 100644 src/static/templates/email/send_single_org_removed_from_org.hbs diff --git a/src/static/templates/email/admin_reset_password.hbs b/src/static/templates/email/admin_reset_password.hbs old mode 100755 new mode 100644 diff --git a/src/static/templates/email/change_email.hbs b/src/static/templates/email/change_email.hbs old mode 100755 new mode 100644 diff --git a/src/static/templates/email/delete_account.html.hbs b/src/static/templates/email/delete_account.html.hbs old mode 100755 new mode 100644 diff --git a/src/static/templates/email/invite_accepted.hbs b/src/static/templates/email/invite_accepted.hbs old mode 100755 new mode 100644 diff --git a/src/static/templates/email/invite_confirmed.hbs b/src/static/templates/email/invite_confirmed.hbs old mode 100755 new mode 100644 diff --git a/src/static/templates/email/send_2fa_removed_from_org.hbs b/src/static/templates/email/send_2fa_removed_from_org.hbs old mode 100755 new mode 100644 diff --git a/src/static/templates/email/send_single_org_removed_from_org.hbs b/src/static/templates/email/send_single_org_removed_from_org.hbs old mode 100755 new mode 100644
- click the link below to delete your account. + Click the link below to delete your account.