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

update expiration dates

Browse Source
This commit is contained in:
Kyle Spearrin
2017-08-12 22:16:42 -04:00
parent 55ae6f12ad
commit 680d7b2bed
7 changed files with 79 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Services/Implementations/BraintreePaymentService.cs
View File

@ -243,6 +243,8 @@ namespace Bit.Core.Services
user.Gateway = Enums.GatewayType.Braintree;
user.GatewayCustomerId = customerResult.Target.Id;
user.GatewaySubscriptionId = subResult.Target.Id;
user.Premium = true;
user.PremiumExpirationDate = subResult.Target.BillingPeriodEndDate;
}
public async Task ReinstateSubscriptionAsync(ISubscriber subscriber)

15
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -527,18 +527,31 @@ namespace Bit.Core.Services
await _organizationRepository.DeleteAsync(organization);
}
public async Task DisableAsync(Guid organizationId)
public async Task DisableAsync(Guid organizationId, DateTime? expirationDate)
{
var org = await _organizationRepository.GetByIdAsync(organizationId);
if(org != null && org.Enabled)
{
org.Enabled = false;
org.ExpirationDate = expirationDate;
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org);
// TODO: send email to owners?
}
}
public async Task UpdateExpirationDateAsync(Guid organizationId, DateTime? expirationDate)
{
var org = await _organizationRepository.GetByIdAsync(organizationId);
if(org != null)
{
org.ExpirationDate = expirationDate;
org.RevisionDate = DateTime.UtcNow;
await _organizationRepository.ReplaceAsync(org);
}
}
public async Task EnableAsync(Guid organizationId)
{
var org = await _organizationRepository.GetByIdAsync(organizationId);

2
src/Core/Services/Implementations/StripePaymentService.cs
View File

@ -63,6 +63,8 @@ namespace Bit.Core.Services
user.Gateway = Enums.GatewayType.Stripe;
user.GatewayCustomerId = customer.Id;
user.GatewaySubscriptionId = subscription.Id;
user.Premium = true;
user.PremiumExpirationDate = subscription.CurrentPeriodEnd;
}
public async Task AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage,

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

@ -574,6 +574,7 @@ namespace Bit.Core.Services
{
user.MaxStorageGb = 10240; // 10 TB
user.LicenseKey = license.LicenseKey;
user.PremiumExpirationDate = license.Expires;
}
else
{
@ -640,12 +641,24 @@ namespace Bit.Core.Services
await paymentService.ReinstateSubscriptionAsync(user);
}
public async Task DisablePremiumAsync(Guid userId)
public async Task DisablePremiumAsync(Guid userId, DateTime? expirationDate)
{
var user = await _userRepository.GetByIdAsync(userId);
if(user != null && user.Premium)
{
user.Premium = false;
user.PremiumExpirationDate = expirationDate;
user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}
}
public async Task UpdatePremiumExpirationAsync(Guid userId, DateTime? expirationDate)
{
var user = await _userRepository.GetByIdAsync(userId);
if(user != null)
{
user.PremiumExpirationDate = expirationDate;
user.RevisionDate = DateTime.UtcNow;
await _userRepository.ReplaceAsync(user);
}