Skip to content

[PM-37648] Fix double HTML encoding in emergency access emails #7652

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

Open
singhvishalkr wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −4
Open

[PM-37648] Fix double HTML encoding in emergency access emails #7652

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
8 changes: 4 additions & 4 deletions src/Core/Platform/Mail/HandlebarsMailService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1193,7 +1193,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 @@ -1241,7 +1241,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 @@ -1267,7 +1267,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 Down Expand Up @@ -1296,7 +1296,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