nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-03 17:12:49 -05:00
Code Activity

[PS-794] Fix password reset email templates email format (#2068)

Browse Source 
* Fix password reset email templates email format
This commit is contained in:
Thomas Avery
2022-06-23 10:44:41 -05:00
committed by GitHub
parent 94059a2b06
commit b8d41b47f1
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Core/Services/Implementations/HandlebarsMailService.cs
View File

@ -418,7 +418,7 @@ namespace Bit.Core.Services
var message = CreateDefaultMessage("Master Password Has Been Changed", email);
var model = new AdminResetPasswordViewModel()
{
UserName = CoreHelpers.SanitizeForEmail(userName),
UserName = GetUserIdentifier(email, userName),
OrgName = CoreHelpers.SanitizeForEmail(orgName),
};
await AddMessageContentAsync(message, "AdminResetPassword", model);
@ -766,7 +766,7 @@ namespace Bit.Core.Services
var message = CreateDefaultMessage("Master Password Has Been Changed", email);
var model = new UpdateTempPasswordViewModel()
{
UserName = CoreHelpers.SanitizeForEmail(userName)
UserName = GetUserIdentifier(email, userName)
};
await AddMessageContentAsync(message, "UpdatedTempPassword", model);
message.Category = "UpdatedTempPassword";
@ -886,5 +886,10 @@ namespace Bit.Core.Services
message.Category = "FailedTwoFactorAttempts";
await _mailDeliveryService.SendEmailAsync(message);
}
private static string GetUserIdentifier(string email, string userName)
{
return string.IsNullOrEmpty(userName) ? email : CoreHelpers.SanitizeForEmail(userName, false);
}
}
}