Skip to content

[PM-33153] Fix: Double HTML encoding in emergency access emails #7149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
boris324 wants to merge 1 commit into from
+7 −7
Closed

[PM-33153] Fix: Double HTML encoding in emergency access emails #7149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Core/Platform/Mail/HandlebarsMailService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ public async Task SendEmergencyAccessInviteEmailAsync(EmergencyAccess emergencyA
var message = CreateDefaultMessage($"Emergency Access Contact Invite", emergencyAccess.Email);
var model = new EmergencyAccessInvitedViewModel
{
Name = CoreHelpers.SanitizeForEmail(name),
Name = CoreHelpers.SanitizeForEmail(name, false),
Email = WebUtility.UrlEncode(emergencyAccess.Email),
Id = emergencyAccess.Id.ToString(),
Token = WebUtility.UrlEncode(token),
Expand Down Expand Up @@ -1218,7 +1218,7 @@ public async Task SendEmergencyAccessConfirmedEmailAsync(string grantorName, str
var message = CreateDefaultMessage($"You Have Been Confirmed as Emergency Access Contact", email);
var model = new EmergencyAccessConfirmedViewModel
{
Name = CoreHelpers.SanitizeForEmail(grantorName),
Name = CoreHelpers.SanitizeForEmail(grantorName, false),
WebVaultUrl = _globalSettings.BaseServiceUri.VaultWithHash,
SiteName = _globalSettings.SiteName
};
Expand All @@ -1235,7 +1235,7 @@ public async Task SendEmergencyAccessRecoveryInitiated(EmergencyAccess emergency

var model = new EmergencyAccessRecoveryViewModel
{
Name = CoreHelpers.SanitizeForEmail(initiatingName),
Name = CoreHelpers.SanitizeForEmail(initiatingName, false),
Action = emergencyAccess.Type.ToString(),
DaysLeft = emergencyAccess.WaitTimeDays - Convert.ToInt32((remainingTime).TotalDays),
};
Expand All @@ -1249,7 +1249,7 @@ public async Task SendEmergencyAccessRecoveryApproved(EmergencyAccess emergencyA
var message = CreateDefaultMessage("Emergency Access Approved", email);
var model = new EmergencyAccessApprovedViewModel
{
Name = CoreHelpers.SanitizeForEmail(approvingName),
Name = CoreHelpers.SanitizeForEmail(approvingName, false),
};
await AddMessageContentAsync(message, "Auth.EmergencyAccessApproved", model);
message.Category = "EmergencyAccessApproved";
Expand All @@ -1261,7 +1261,7 @@ public async Task SendEmergencyAccessRecoveryRejected(EmergencyAccess emergencyA
var message = CreateDefaultMessage("Emergency Access Rejected", email);
var model = new EmergencyAccessRejectedViewModel
{
Name = CoreHelpers.SanitizeForEmail(rejectingName),
Name = CoreHelpers.SanitizeForEmail(rejectingName, false),
};
await AddMessageContentAsync(message, "Auth.EmergencyAccessRejected", model);
message.Category = "EmergencyAccessRejected";
Expand All @@ -1276,7 +1276,7 @@ public async Task SendEmergencyAccessRecoveryReminder(EmergencyAccess emergencyA

var model = new EmergencyAccessRecoveryViewModel
{
Name = CoreHelpers.SanitizeForEmail(initiatingName),
Name = CoreHelpers.SanitizeForEmail(initiatingName, false),
Action = emergencyAccess.Type.ToString(),
DaysLeft = emergencyAccess.WaitTimeDays - Convert.ToInt32((remainingTime).TotalDays),
};
Expand All @@ -1290,7 +1290,7 @@ public async Task SendEmergencyAccessRecoveryTimedOut(EmergencyAccess emergencyA
var message = CreateDefaultMessage("Emergency Access Granted", email);
var model = new EmergencyAccessRecoveryTimedOutViewModel
{
Name = CoreHelpers.SanitizeForEmail(initiatingName),
Name = CoreHelpers.SanitizeForEmail(initiatingName, false),
Action = emergencyAccess.Type.ToString(),
};
await AddMessageContentAsync(message, "Auth.EmergencyAccessRecoveryTimedOut", model);
Expand Down
Loading