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

remove circular dependency

Browse Source
This commit is contained in:
Kyle Spearrin 2017-08-16 23:15:09 -04:00
parent 82718e2201
commit 52c0e77a3a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Core/Services/Implementations/RsaLicensingService.cs
View File

@ -1,5 +1,6 @@
using Bit.Core.Models.Business; using Bit.Core.Models.Business;
using Bit.Core.Models.Table; using Bit.Core.Models.Table;
using Bit.Core.Repositories;
using Bit.Core.Utilities; using Bit.Core.Utilities;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -18,14 +19,14 @@ namespace Bit.Core.Services
private readonly GlobalSettings _globalSettings; private readonly GlobalSettings _globalSettings;
private IDictionary<Guid, DateTime> _userCheckCache = new Dictionary<Guid, DateTime>(); private IDictionary<Guid, DateTime> _userCheckCache = new Dictionary<Guid, DateTime>();
private IDictionary<Guid, DateTime> _organizationCheckCache = new Dictionary<Guid, DateTime>(); private IDictionary<Guid, DateTime> _organizationCheckCache = new Dictionary<Guid, DateTime>();
private readonly IUserService _userService; private readonly IUserRepository _userRepository;
public RsaLicensingService( public RsaLicensingService(
IUserService userService, IUserRepository userRepository,
IHostingEnvironment environment, IHostingEnvironment environment,
GlobalSettings globalSettings) GlobalSettings globalSettings)
{ {
_userService = userService; _userRepository = userRepository;
var certThumbprint = "‎207e64a231e8aa32aaf68a61037c075ebebd553f"; var certThumbprint = "‎207e64a231e8aa32aaf68a61037c075ebebd553f";
_globalSettings = globalSettings; _globalSettings = globalSettings;
@ -76,7 +77,7 @@ namespace Bit.Core.Services
if(_userCheckCache.ContainsKey(user.Id)) if(_userCheckCache.ContainsKey(user.Id))
{ {
var lastCheck = _userCheckCache[user.Id]; var lastCheck = _userCheckCache[user.Id];
if(lastCheck < now && now - lastCheck < TimeSpan.FromDays(1)) if(lastCheck < now && now - lastCheck < TimeSpan.FromMinutes(1))
{ {
return user.Premium; return user.Premium;
} }
@ -94,7 +95,10 @@ namespace Bit.Core.Services
var licensedForPremium = license != null && license.VerifyData(user) && license.VerifySignature(_certificate); var licensedForPremium = license != null && license.VerifyData(user) && license.VerifySignature(_certificate);
if(!licensedForPremium) if(!licensedForPremium)
{ {
await _userService.DisablePremiumAsync(user, license.Expires); user.Premium = false;
user.PremiumExpirationDate = license.Expires;
user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
} }
return licensedForPremium; return licensedForPremium;