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

[Reset Password v1] Update Temporary Password API (#1481)

Browse Source 
* [Reset Password v1] Update Temporary Password API

* Fixed Noop interface
This commit is contained in:
Vincent Salucci
2021-07-22 09:20:14 -05:00
committed by GitHub
parent 8e1e2fa2fe
commit 46fa6f6673
11 changed files with 95 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Core/Services/IMailService.cs
View File

@ -46,5 +46,6 @@ namespace Bit.Core.Services
Task SendProviderInviteEmailAsync(string providerName, ProviderUser providerUser, string token, string email);
Task SendProviderConfirmedEmailAsync(string providerName, string email);
Task SendProviderUserRemoved(string providerName, string email);
Task SendUpdatedTempPasswordEmailAsync(string email, string userName);
}
}

1
src/Core/Services/IUserService.cs
View File

@ -35,6 +35,7 @@ namespace Bit.Core.Services
Task<IdentityResult> ChangePasswordAsync(User user, string masterPassword, string newMasterPassword, string key);
Task<IdentityResult> SetPasswordAsync(User user, string newMasterPassword, string key, string orgIdentifier = null);
Task<IdentityResult> AdminResetPasswordAsync(OrganizationUserType type, Guid orgId, Guid id, string newMasterPassword, string key);
Task<IdentityResult> UpdateTempPasswordAsync(User user, string newMasterPassword, string key);
Task<IdentityResult> ChangeKdfAsync(User user, string masterPassword, string newMasterPassword, string key,
KdfType kdf, int kdfIterations);
Task<IdentityResult> UpdateKeyAsync(User user, string masterPassword, string key, string privateKey,

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

@ -714,5 +714,17 @@ namespace Bit.Core.Services
message.Category = "ProviderUserRemoved";
await _mailDeliveryService.SendEmailAsync(message);
}
public async Task SendUpdatedTempPasswordEmailAsync(string email, string userName)
{
var message = CreateDefaultMessage("Master Password Has Been Changed", email);
var model = new UpdateTempPasswordViewModel()
{
UserName = CoreHelpers.SanitizeForEmail(userName)
};
await AddMessageContentAsync(message, "UpdatedTempPassword", model);
message.Category = "UpdatedTempPassword";
await _mailDeliveryService.SendEmailAsync(message);
}
}
}

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

@ -690,6 +690,7 @@ namespace Bit.Core.Services
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
user.Key = key;
user.ForcePasswordReset = true;
await _userRepository.ReplaceAsync(user);
await _mailService.SendAdminResetPasswordEmailAsync(user.Email, user.Name ?? user.Email, org.Name);
@ -698,6 +699,31 @@ namespace Bit.Core.Services
return IdentityResult.Success;
}
public async Task<IdentityResult> UpdateTempPasswordAsync(User user, string newMasterPassword, string key)
{
if (!user.ForcePasswordReset)
{
throw new BadRequestException("User does not have a temporary password to update.");
}
var result = await UpdatePasswordHash(user, newMasterPassword);
if (!result.Succeeded)
{
return result;
}
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
user.ForcePasswordReset = false;
user.Key = key;
await _userRepository.ReplaceAsync(user);
await _mailService.SendUpdatedTempPasswordEmailAsync(user.Email, user.Name ?? user.Email);
await _eventService.LogUserEventAsync(user.Id, EventType.User_UpdatedTempPassword);
await _pushService.PushLogOutAsync(user.Id);
return IdentityResult.Success;
}
public async Task<IdentityResult> ChangeKdfAsync(User user, string masterPassword, string newMasterPassword,
string key, KdfType kdf, int kdfIterations)

5
src/Core/Services/NoopImplementations/NoopMailService.cs
View File

@ -185,5 +185,10 @@ namespace Bit.Core.Services
{
return Task.FromResult(0);
}
public Task SendUpdatedTempPasswordEmailAsync(string email, string userName)
{
return Task.FromResult(0);
}
}
}