nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Core/Services/IPaymentService.cs
View File

@ -16,7 +16,8 @@ namespace Bit.Core.Services
Task<string> PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, string paymentToken, Task<string> PurchasePremiumAsync(User user, PaymentMethodType paymentMethodType, string paymentToken,
short additionalStorageGb); short additionalStorageGb);
Task<string> AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage, string storagePlanId); Task<string> AdjustStorageAsync(IStorableSubscriber storableSubscriber, int additionalStorage, string storagePlanId);
Task CancelSubscriptionAsync(ISubscriber subscriber, bool endOfPeriod = false); Task CancelSubscriptionAsync(ISubscriber subscriber, bool endOfPeriod = false,
bool skipInAppPurchaseCheck = false);
Task ReinstateSubscriptionAsync(ISubscriber subscriber); Task ReinstateSubscriptionAsync(ISubscriber subscriber);
Task<bool> UpdatePaymentMethodAsync(ISubscriber subscriber, PaymentMethodType paymentMethodType, Task<bool> UpdatePaymentMethodAsync(ISubscriber subscriber, PaymentMethodType paymentMethodType,
string paymentToken, bool allowInAppPurchases = false); string paymentToken, bool allowInAppPurchases = false);

2
src/Core/Services/IUserService.cs
View File

@ -49,7 +49,7 @@ namespace Bit.Core.Services
Task UpdateLicenseAsync(User user, UserLicense license); Task UpdateLicenseAsync(User user, UserLicense license);
Task<string> AdjustStorageAsync(User user, short storageAdjustmentGb); Task<string> AdjustStorageAsync(User user, short storageAdjustmentGb);
Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType); Task ReplacePaymentMethodAsync(User user, string paymentToken, PaymentMethodType paymentMethodType);
Task CancelPremiumAsync(User user, bool? endOfPeriod = null); Task CancelPremiumAsync(User user, bool? endOfPeriod = null, bool accountDelete = false);
Task ReinstatePremiumAsync(User user); Task ReinstatePremiumAsync(User user);
Task EnablePremiumAsync(Guid userId, DateTime? expirationDate); Task EnablePremiumAsync(Guid userId, DateTime? expirationDate);
Task EnablePremiumAsync(User user, DateTime? expirationDate); Task EnablePremiumAsync(User user, DateTime? expirationDate);

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

@ -1049,7 +1049,8 @@ namespace Bit.Core.Services
return new Tuple<bool, string>(invoiceNow, paymentIntentClientSecret); 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) if(subscriber == null)
{ {
@ -1061,7 +1062,7 @@ namespace Bit.Core.Services
throw new GatewayException("No subscription."); throw new GatewayException("No subscription.");
} }
if(!string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId)) if(!string.IsNullOrWhiteSpace(subscriber.GatewayCustomerId) && !skipInAppPurchaseCheck)
{ {
var customerService = new CustomerService(); var customerService = new CustomerService();
var customer = await customerService.GetAsync(subscriber.GatewayCustomerId); 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 try
{ {
await CancelPremiumAsync(user); await CancelPremiumAsync(user, null, true);
} }
catch(GatewayException) { } 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); var eop = endOfPeriod.GetValueOrDefault(true);
if(!endOfPeriod.HasValue && user.PremiumExpirationDate.HasValue && if(!endOfPeriod.HasValue && user.PremiumExpirationDate.HasValue &&
@ -843,7 +843,7 @@ namespace Bit.Core.Services
{ {
eop = false; eop = false;
} }
await _paymentService.CancelSubscriptionAsync(user, eop); await _paymentService.CancelSubscriptionAsync(user, eop, accountDelete);
} }
public async Task ReinstatePremiumAsync(User user) public async Task ReinstatePremiumAsync(User user)