nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-05-22 20:11:04 -05:00
Code

cancel on delete

Browse Source
This commit is contained in:
Kyle Spearrin 2018-12-31 14:07:19 -05:00
parent 6d173385b0
commit 4ad1634d1d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -785,7 +785,9 @@ namespace Bit.Core.Services
{ {
try try
{ {
await _stripePaymentService.CancelSubscriptionAsync(organization, true); var eop = !organization.ExpirationDate.HasValue ||
organization.ExpirationDate.Value >= DateTime.UtcNow;
await _stripePaymentService.CancelSubscriptionAsync(organization, eop);
} }
catch(GatewayException) { } catch(GatewayException) { }
} }

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

@ -205,10 +205,9 @@ namespace Bit.Core.Services
if(!string.IsNullOrWhiteSpace(user.GatewaySubscriptionId)) if(!string.IsNullOrWhiteSpace(user.GatewaySubscriptionId))
{ {
var paymentService = user.GetPaymentService(_globalSettings);
try try
{ {
await paymentService.CancelSubscriptionAsync(user, true); await CancelPremiumAsync(user);
} }
catch(GatewayException) { } catch(GatewayException) { }
} }