Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-28 13:15:12 +01:00
Code Issues Projects Releases Wiki 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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats 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 message = CreateDefaultMessage("Master Password Has Been Changed", email);
var model = new AdminResetPasswordViewModel() var model = new AdminResetPasswordViewModel()
{ {
UserName = CoreHelpers.SanitizeForEmail(userName), UserName = GetUserIdentifier(email, userName),
OrgName = CoreHelpers.SanitizeForEmail(orgName), OrgName = CoreHelpers.SanitizeForEmail(orgName),
}; };
await AddMessageContentAsync(message, "AdminResetPassword", model); await AddMessageContentAsync(message, "AdminResetPassword", model);
@ -766,7 +766,7 @@ namespace Bit.Core.Services
var message = CreateDefaultMessage("Master Password Has Been Changed", email); var message = CreateDefaultMessage("Master Password Has Been Changed", email);
var model = new UpdateTempPasswordViewModel() var model = new UpdateTempPasswordViewModel()
{ {
UserName = CoreHelpers.SanitizeForEmail(userName) UserName = GetUserIdentifier(email, userName)
}; };
await AddMessageContentAsync(message, "UpdatedTempPassword", model); await AddMessageContentAsync(message, "UpdatedTempPassword", model);
message.Category = "UpdatedTempPassword"; message.Category = "UpdatedTempPassword";
@ -886,5 +886,10 @@ namespace Bit.Core.Services
message.Category = "FailedTwoFactorAttempts"; message.Category = "FailedTwoFactorAttempts";
await _mailDeliveryService.SendEmailAsync(message); await _mailDeliveryService.SendEmailAsync(message);
} }
private static string GetUserIdentifier(string email, string userName)
{
return string.IsNullOrEmpty(userName) ? email : CoreHelpers.SanitizeForEmail(userName, false);
}
} }
} }

4
src/Core/Services/Implementations/UserService.cs
View File

@ -794,7 +794,7 @@ namespace Bit.Core.Services
user.ForcePasswordReset = true; user.ForcePasswordReset = true;
await _userRepository.ReplaceAsync(user); await _userRepository.ReplaceAsync(user);
await _mailService.SendAdminResetPasswordEmailAsync(user.Email, user.Name ?? user.Email, org.Name); await _mailService.SendAdminResetPasswordEmailAsync(user.Email, user.Name, org.Name);
await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_AdminResetPassword); await _eventService.LogOrganizationUserEventAsync(orgUser, EventType.OrganizationUser_AdminResetPassword);
await _pushService.PushLogOutAsync(user.Id); await _pushService.PushLogOutAsync(user.Id);
@ -820,7 +820,7 @@ namespace Bit.Core.Services
user.MasterPasswordHint = hint; user.MasterPasswordHint = hint;
await _userRepository.ReplaceAsync(user); await _userRepository.ReplaceAsync(user);
await _mailService.SendUpdatedTempPasswordEmailAsync(user.Email, user.Name ?? user.Email); await _mailService.SendUpdatedTempPasswordEmailAsync(user.Email, user.Name);
await _eventService.LogUserEventAsync(user.Id, EventType.User_UpdatedTempPassword); await _eventService.LogUserEventAsync(user.Id, EventType.User_UpdatedTempPassword);
await _pushService.PushLogOutAsync(user.Id); await _pushService.PushLogOutAsync(user.Id);