nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-05 21:18:13 -05:00
Code

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
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 6 deletions
Show Stats 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<DateTime> GetAccountRevisionDateByIdAsync(Guid userId);
Task SaveUserAsync(User user, bool push = false); Task SaveUserAsync(User user, bool push = false);
Task<IdentityResult> RegisterUserAsync(User user, string masterPassword, string token, Guid? orgUserId); Task<IdentityResult> RegisterUserAsync(User user, string masterPassword, string token, Guid? orgUserId);
Task<IdentityResult> RegisterUserAsync(User user);
Task SendMasterPasswordHintAsync(string email); Task SendMasterPasswordHintAsync(string email);
Task SendTwoFactorEmailAsync(User user); Task SendTwoFactorEmailAsync(User user);
Task<bool> VerifyTwoFactorEmailAsync(User user, string token); Task<bool> VerifyTwoFactorEmailAsync(User user, string token);

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

@ -293,8 +293,19 @@ namespace Bit.Core.Services
if (result == IdentityResult.Success) if (result == IdentityResult.Success)
{ {
await _mailService.SendWelcomeEmailAsync(user); await _mailService.SendWelcomeEmailAsync(user);
await _referenceEventService.RaiseEventAsync( await _referenceEventService.RaiseEventAsync(new ReferenceEvent(ReferenceEventType.Signup, user));
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; return result;
@ -807,7 +818,7 @@ namespace Bit.Core.Services
PlanName = PremiumPlanId, PlanName = PremiumPlanId,
}); });
} }
catch when(!_globalSettings.SelfHosted) catch when (!_globalSettings.SelfHosted)
{ {
await paymentService.CancelAndRecoverChargesAsync(user); await paymentService.CancelAndRecoverChargesAsync(user);
throw; throw;

2
src/Sql/dbo/Tables/User.sql
View File

@ -3,7 +3,7 @@
[Name] NVARCHAR (50) NULL, [Name] NVARCHAR (50) NULL,
[Email] NVARCHAR (50) NOT NULL, [Email] NVARCHAR (50) NOT NULL,
[EmailVerified] BIT NOT NULL, [EmailVerified] BIT NOT NULL,
[MasterPassword] NVARCHAR (300) NOT NULL, [MasterPassword] NVARCHAR (300) NULL,
[MasterPasswordHint] NVARCHAR (50) NULL, [MasterPasswordHint] NVARCHAR (50) NULL,
[Culture] NVARCHAR (10) NOT NULL, [Culture] NVARCHAR (10) NOT NULL,
[SecurityStamp] NVARCHAR (50) NOT NULL, [SecurityStamp] NVARCHAR (50) NOT NULL,

19
util/Migrator/DbScripts/2020-08-13_00_AllowNullMasterPassword.sql Normal file
View File

@ -0,0 +1,19 @@
ALTER TABLE
[dbo].[User]
ALTER COLUMN
[MasterPassword] NVARCHAR (300) NULL
GO
IF EXISTS(SELECT * FROM sys.views WHERE [Name] = 'UserView')
BEGIN
DROP VIEW [dbo].[UserView]
END
GO
CREATE VIEW [dbo].[UserView]
AS
SELECT
*
FROM
[dbo].[User]
GO