nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 00:22:50 -05:00
Code Activity

allow user registration for sso (#865)

Browse Source
This commit is contained in:
Kyle Spearrin
2020-08-13 17:30:10 -04:00
committed by GitHub
parent 4d8090d75e
commit cd926ca8f6
4 changed files with 37 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@ namespace Bit.Core.Services
Task<DateTime> GetAccountRevisionDateByIdAsync(Guid userId);
Task SaveUserAsync(User user, bool push = false);
Task<IdentityResult> RegisterUserAsync(User user, string masterPassword, string token, Guid? orgUserId);
Task<IdentityResult> RegisterUserAsync(User user);
Task SendMasterPasswordHintAsync(string email);
Task SendTwoFactorEmailAsync(User user);
Task<bool> VerifyTwoFactorEmailAsync(User user, string token);

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

@ -293,8 +293,19 @@ namespace Bit.Core.Services
if (result == IdentityResult.Success)
{
await _mailService.SendWelcomeEmailAsync(user);
await _referenceEventService.RaiseEventAsync(
new ReferenceEvent(ReferenceEventType.Signup, user));
await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.Signup, user));
}
return result;
}
public async Task<IdentityResult> RegisterUserAsync(User user)
{
var result = await base.CreateAsync(user);
if (result == IdentityResult.Success)
{
await _mailService.SendWelcomeEmailAsync(user);
await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.Signup, user));
}
return result;
@ -567,7 +578,7 @@ namespace Bit.Core.Services
Logger.LogWarning("Change password failed for user {userId}.", user.Id);
return IdentityResult.Failed(_identityErrorDescriber.PasswordMismatch());
}
public async Task<IdentityResult> SetPasswordAsync(User user, string newMasterPassword, string key)
{
if (user == null)
@ -580,7 +591,7 @@ namespace Bit.Core.Services
Logger.LogWarning("Change password failed for user {userId} - already has password.", user.Id);
return IdentityResult.Failed(_identityErrorDescriber.UserAlreadyHasPassword());
}
var result = await UpdatePasswordHash(user, newMasterPassword);
if (!result.Succeeded)
{
@ -807,7 +818,7 @@ namespace Bit.Core.Services
PlanName = PremiumPlanId,
});
}
catch when(!_globalSettings.SelfHosted)
catch when (!_globalSettings.SelfHosted)
{
await paymentService.CancelAndRecoverChargesAsync(user);
throw;