bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server synced 2025-12-23 03:33:35 +00:00
Code Issues Releases Wiki Activity

updates for license validation

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-14 13:06:44 -04:00
parent 18cbc79dd2
commit 6b80ec6331
9 changed files with 140 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,7 +142,7 @@ namespace Bit.Core.Services
return await _userRepository.GetAccountRevisionDateAsync(userId);
}
public async Task SaveUserAsync(User user)
public async Task SaveUserAsync(User user, bool push = false)
{
if(user.Id == default(Guid))
{
@@ -152,8 +152,11 @@ namespace Bit.Core.Services
user.RevisionDate = user.AccountRevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
// push
await _pushService.PushSyncSettingsAsync(user.Id);
if(push)
{
// push
await _pushService.PushSyncSettingsAsync(user.Id);
}
}
public override async Task<IdentityResult> DeleteAsync(User user)
@@ -540,7 +543,7 @@ namespace Bit.Core.Services
IPaymentService paymentService = null;
if(_globalSettings.SelfHosted)
{
if(license == null || !_licenseService.VerifyLicense(license))
if(license == null || !_licenseService.VerifyLicense(license) || !license.CanUse(user))
{
throw new BadRequestException("Invalid license.");
}
@@ -605,7 +608,7 @@ namespace Bit.Core.Services
throw new InvalidOperationException("Licenses require self hosting.");
}
if(license == null || !_licenseService.VerifyLicense(license))
if(license == null || !_licenseService.VerifyLicense(license) || !license.CanUse(user))
{
throw new BadRequestException("Invalid license.");
}