nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-02 16:42:50 -05:00
Code Activity

alloe sub cancellation when deleting account

Browse Source
This commit is contained in:
Kyle Spearrin
2019-09-20 13:45:47 -04:00
parent 0bc034f620
commit b72744eafc
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1049,7 +1049,8 @@ namespace Bit.Core.Services
return new Tuple<bool, string>(invoiceNow, paymentIntentClientSecret);
}
public async Task CancelSubscriptionAsync(ISubscriber subscriber, bool endOfPeriod = false)
public async Task CancelSubscriptionAsync(ISubscriber subscriber, bool endOfPeriod = false,
bool skipInAppPurchaseCheck = false)
{
if(subscriber == null)
{
@ -1061,7 +1062,7 @@ namespace Bit.Core.Services
throw new GatewayException("No subscription.");
}
if(!string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId))
if(!string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId) && !skipInAppPurchaseCheck)
{
var customerService = new CustomerService();
var customer = await customerService.GetAsync(subscriber.GatewayCustomerId);

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

@ -210,7 +210,7 @@ namespace Bit.Core.Services
{
try
{
await CancelPremiumAsync(user);
await CancelPremiumAsync(user, null, true);
}
catch(GatewayException) { }
}
@ -835,7 +835,7 @@ namespace Bit.Core.Services
}
}
public async Task CancelPremiumAsync(User user, bool? endOfPeriod = null)
public async Task CancelPremiumAsync(User user, bool? endOfPeriod = null, bool accountDelete = false)
{
var eop = endOfPeriod.GetValueOrDefault(true);
if(!endOfPeriod.HasValue && user.PremiumExpirationDate.HasValue &&
@ -843,7 +843,7 @@ namespace Bit.Core.Services
{
eop = false;
}
await _paymentService.CancelSubscriptionAsync(user, eop);
await _paymentService.CancelSubscriptionAsync(user, eop, accountDelete);
}
public async Task ReinstatePremiumAsync(User user)