Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-21 12:05:42 +01:00
Code Issues Projects Releases Wiki Activity

Update user last password change (#4685)

Browse Source
This commit is contained in:
Matt Gibson 2024-08-20 16:20:56 -07:00 committed by GitHub
parent 9a7165b489
commit 0ed1f5e2de
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Core/Auth/Services/Implementations/EmergencyAccessService.cs
View File

@ -327,7 +327,9 @@ public class EmergencyAccessService : IEmergencyAccessService
var grantor = await _userRepository.GetByIdAsync(emergencyAccess.GrantorId);
grantor.MasterPassword = _passwordHasher.HashPassword(grantor, newMasterPasswordHash);
await _userService.UpdatePasswordHash(grantor, newMasterPasswordHash);
grantor.RevisionDate = DateTime.UtcNow;
grantor.LastPasswordChangeDate = grantor.RevisionDate;
grantor.Key = key;
// Disable TwoFactor providers since they will otherwise block logins
grantor.SetTwoFactorProviders(new Dictionary<TwoFactorProviderType, TwoFactorProvider>());

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

@ -713,8 +713,9 @@ public class UserService : UserManager<User>, IUserService, IDisposable
}
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
user.Key = key;
user.LastPasswordChangeDate = user.RevisionDate;
user.ForcePasswordReset = true;
user.Key = key;
await _userRepository.ReplaceAsync(user);
await _mailService.SendAdminResetPasswordEmailAsync(user.Email, user.Name, org.DisplayName());