From beaa059888b24be8528c21f99d5a654b96e8e630 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 9 Aug 2017 22:55:52 -0400 Subject: [PATCH] raw html on certain email params --- src/Core/MailTemplates/ChangeEmail.text.cshtml | 2 +- .../MailTemplates/ChangeEmailAlreadyExists.text.cshtml | 6 +++--- src/Core/MailTemplates/MasterPasswordHint.cshtml | 2 +- src/Core/MailTemplates/MasterPasswordHint.text.cshtml | 4 ++-- .../MailTemplates/OrganizationUserAccepted.text.cshtml | 4 ++-- .../MailTemplates/OrganizationUserConfirmed.text.cshtml | 2 +- src/Core/MailTemplates/OrganizationUserInvited.cshtml | 2 +- .../MailTemplates/OrganizationUserInvited.text.cshtml | 4 ++-- src/Core/MailTemplates/TwoFactorEmail.text.cshtml | 2 +- src/Core/MailTemplates/VerifyDelete.cshtml | 2 +- src/Core/MailTemplates/VerifyDelete.text.cshtml | 4 ++-- src/Core/MailTemplates/VerifyEmail.cshtml | 2 +- src/Core/MailTemplates/VerifyEmail.text.cshtml | 2 +- src/Core/MailTemplates/Welcome.cshtml | 8 ++++---- src/Core/MailTemplates/Welcome.text.cshtml | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/Core/MailTemplates/ChangeEmail.text.cshtml b/src/Core/MailTemplates/ChangeEmail.text.cshtml index b9f60e81a7..7db8591e32 100644 --- a/src/Core/MailTemplates/ChangeEmail.text.cshtml +++ b/src/Core/MailTemplates/ChangeEmail.text.cshtml @@ -3,4 +3,4 @@ Layout = "_BasicMailLayout.text"; } To finalize changing your email address enter the -following code in the pop-up window: @Model.Token +following code in the pop-up window: @Raw(Model.Token) diff --git a/src/Core/MailTemplates/ChangeEmailAlreadyExists.text.cshtml b/src/Core/MailTemplates/ChangeEmailAlreadyExists.text.cshtml index 869b88d919..3a1f2b1ab9 100644 --- a/src/Core/MailTemplates/ChangeEmailAlreadyExists.text.cshtml +++ b/src/Core/MailTemplates/ChangeEmailAlreadyExists.text.cshtml @@ -2,10 +2,10 @@ @{ Layout = "_BasicMailLayout.text"; } -A user ({{fromEmail}}) recently tried to +A user (@Raw(Model.FromEmail)) recently tried to change their account to use this email -address ({{toEmail}}). An account already -exists with this email ({{toEmail}}). +address (@Raw(Model.ToEmail)). An account already +exists with this email (@Raw(Model.ToEmail)). If you did not try to change an email address, you can safely ignore this diff --git a/src/Core/MailTemplates/MasterPasswordHint.cshtml b/src/Core/MailTemplates/MasterPasswordHint.cshtml index e1e4060f45..f7a6c041b7 100644 --- a/src/Core/MailTemplates/MasterPasswordHint.cshtml +++ b/src/Core/MailTemplates/MasterPasswordHint.cshtml @@ -4,5 +4,5 @@ }

You (or someone) recently requested your master password hint.

Your hint is: "@Model.Hint"

-

Login: @Model.WebVaultUrl

+

Login: @Model.WebVaultUrl

If you did not request your master password hint you can safely ignore this email.

diff --git a/src/Core/MailTemplates/MasterPasswordHint.text.cshtml b/src/Core/MailTemplates/MasterPasswordHint.text.cshtml index dfec7d69c7..189b59b654 100644 --- a/src/Core/MailTemplates/MasterPasswordHint.text.cshtml +++ b/src/Core/MailTemplates/MasterPasswordHint.text.cshtml @@ -5,9 +5,9 @@ You (or someone) recently requested your master password hint. -Your hint is: "@Model.Hint" +Your hint is: "@Raw(Model.Hint)" -Login: @Model.WebVaultUrl +Login: @Raw(@Model.WebVaultUrl) If you did not request your master password hint you can safely ignore this email. diff --git a/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml b/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml index 0e8772f31f..9f7d2a68c8 100644 --- a/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml +++ b/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml @@ -2,9 +2,9 @@ @{ Layout = "_BasicMailLayout.text"; } -This email is to notify you that @Model.UserEmail +This email is to notify you that @Raw(Model.UserEmail) has accepted your invitation to join -@Model.OrganizationName. +@Raw(Model.OrganizationName). To confirm this user, log into the bitwarden web vault, manage your organization "People" diff --git a/src/Core/MailTemplates/OrganizationUserConfirmed.text.cshtml b/src/Core/MailTemplates/OrganizationUserConfirmed.text.cshtml index 415605a684..1e8e615877 100644 --- a/src/Core/MailTemplates/OrganizationUserConfirmed.text.cshtml +++ b/src/Core/MailTemplates/OrganizationUserConfirmed.text.cshtml @@ -3,7 +3,7 @@ Layout = "_BasicMailLayout.text"; } This email is to notify you that you have been -confirmed as a user of @(Model.OrganizationName). +confirmed as a user of @Raw(Model.OrganizationName). Any collections and logins being shared with you by this organization will now appear in diff --git a/src/Core/MailTemplates/OrganizationUserInvited.cshtml b/src/Core/MailTemplates/OrganizationUserInvited.cshtml index 41121cd8c3..d9a6d7336a 100644 --- a/src/Core/MailTemplates/OrganizationUserInvited.cshtml +++ b/src/Core/MailTemplates/OrganizationUserInvited.cshtml @@ -6,7 +6,7 @@ You have been invited to join the @Model.OrganizationName organization. To accept this invite, click the following link:

-

@Model.Url

+

@Model.Url

If you do not wish to join this organization, you can safely ignore this email. diff --git a/src/Core/MailTemplates/OrganizationUserInvited.text.cshtml b/src/Core/MailTemplates/OrganizationUserInvited.text.cshtml index 7f2dcd1714..09ecaf188e 100644 --- a/src/Core/MailTemplates/OrganizationUserInvited.text.cshtml +++ b/src/Core/MailTemplates/OrganizationUserInvited.text.cshtml @@ -3,11 +3,11 @@ Layout = "_BasicMailLayout.text"; } You have been invited to join the -@Model.OrganizationName organization. +@Raw(Model.OrganizationName) organization. To accept this invite, click the following link: -@Model.Url +@Raw(Model.Url) If you do not wish to join this organization, you can safely ignore diff --git a/src/Core/MailTemplates/TwoFactorEmail.text.cshtml b/src/Core/MailTemplates/TwoFactorEmail.text.cshtml index 615a65f78f..aee3525c31 100644 --- a/src/Core/MailTemplates/TwoFactorEmail.text.cshtml +++ b/src/Core/MailTemplates/TwoFactorEmail.text.cshtml @@ -2,6 +2,6 @@ @{ Layout = "_BasicMailLayout.text"; } -Your two-step verification code is: @Model.Token +Your two-step verification code is: @Raw(Model.Token) Use this code to complete logging in with bitwarden. diff --git a/src/Core/MailTemplates/VerifyDelete.cshtml b/src/Core/MailTemplates/VerifyDelete.cshtml index c50936be50..9b3b1a7b64 100644 --- a/src/Core/MailTemplates/VerifyDelete.cshtml +++ b/src/Core/MailTemplates/VerifyDelete.cshtml @@ -6,4 +6,4 @@ Click the link below to delete your bitwarden account (@Model.Email). If you did not request this email to delete your bitwarden account, you can safely ignore it.

-

@Model.Url

+

@Model.Url

diff --git a/src/Core/MailTemplates/VerifyDelete.text.cshtml b/src/Core/MailTemplates/VerifyDelete.text.cshtml index 5061c2db32..0f27adac84 100644 --- a/src/Core/MailTemplates/VerifyDelete.text.cshtml +++ b/src/Core/MailTemplates/VerifyDelete.text.cshtml @@ -3,8 +3,8 @@ Layout = "_BasicMailLayout.text"; } Click the link below to delete your bitwarden -account (@Model.Email). If you did not request +account (@Raw(Model.Email)). If you did not request this email to delete your bitwarden account, you can safely ignore it. -@Model.Url +@Raw(Model.Url) diff --git a/src/Core/MailTemplates/VerifyEmail.cshtml b/src/Core/MailTemplates/VerifyEmail.cshtml index f742eafef0..49edc5f125 100644 --- a/src/Core/MailTemplates/VerifyEmail.cshtml +++ b/src/Core/MailTemplates/VerifyEmail.cshtml @@ -5,4 +5,4 @@

Verify this email address for your bitwarden account by clicking the following link:

-

@Model.Url

+

@Model.Url

diff --git a/src/Core/MailTemplates/VerifyEmail.text.cshtml b/src/Core/MailTemplates/VerifyEmail.text.cshtml index ffa21fae2b..d599edc251 100644 --- a/src/Core/MailTemplates/VerifyEmail.text.cshtml +++ b/src/Core/MailTemplates/VerifyEmail.text.cshtml @@ -5,4 +5,4 @@ Verify this email address for your bitwarden account by clicking the following link: -@Model.Url +@Raw(Model.Url) diff --git a/src/Core/MailTemplates/Welcome.cshtml b/src/Core/MailTemplates/Welcome.cshtml index 974d8e539c..5f2968b7b8 100644 --- a/src/Core/MailTemplates/Welcome.cshtml +++ b/src/Core/MailTemplates/Welcome.cshtml @@ -60,7 +60,7 @@ @@ -70,7 +70,7 @@ @@ -90,12 +90,12 @@ diff --git a/src/Core/MailTemplates/Welcome.text.cshtml b/src/Core/MailTemplates/Welcome.text.cshtml index 6ef55d41a4..89218f5542 100644 --- a/src/Core/MailTemplates/Welcome.text.cshtml +++ b/src/Core/MailTemplates/Welcome.text.cshtml @@ -34,7 +34,7 @@ Web You can also access your vault from any web-enabled device using our web vault at: -@Model.WebVaultUrl/?utm_source=welcome_email&utm_medium=email +@Raw(Model.WebVaultUrl)/?utm_source=welcome_email&utm_medium=email If you have any questions or problems you can
- + Chrome Extension - + Opera Extension
- vault.bitwarden.com + vault.bitwarden.com
- If you have any questions or problems you can email us from our website at https://bitwarden.com/contact. + If you have any questions or problems you can email us from our website at https://bitwarden.com/contact.