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

[fix] Payment Failed webhook fix (#2076)

Browse Source
This commit is contained in:
Addison Beck 2022-06-24 14:20:32 -07:00 committed by GitHub
parent 75ab5826e0
commit fe062dc987
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Billing/Controllers/StripeController.cs
View File

@ -28,6 +28,7 @@ namespace Bit.Billing.Controllers
{ {
private const decimal PremiumPlanAppleIapPrice = 14.99M; private const decimal PremiumPlanAppleIapPrice = 14.99M;
private const string PremiumPlanId = "premium-annually"; private const string PremiumPlanId = "premium-annually";
private const string PremiumPlanIdAppStore = "premium-annually-app";
private readonly BillingSettings _billingSettings; private readonly BillingSettings _billingSettings;
private readonly IWebHostEnvironment _hostingEnvironment; private readonly IWebHostEnvironment _hostingEnvironment;
@ -437,7 +438,7 @@ namespace Bit.Billing.Controllers
} }
else if (parsedEvent.Type.Equals(HandledStripeWebhook.PaymentFailed)) else if (parsedEvent.Type.Equals(HandledStripeWebhook.PaymentFailed))
{ {
await HandlePaymentFailed(await GetInvoiceAsync(parsedEvent, true), await GetSubscriptionAsync(parsedEvent)); await HandlePaymentFailed(await GetInvoiceAsync(parsedEvent, true));
} }
else if (parsedEvent.Type.Equals(HandledStripeWebhook.InvoiceCreated)) else if (parsedEvent.Type.Equals(HandledStripeWebhook.InvoiceCreated))
{ {
@ -802,12 +803,14 @@ namespace Bit.Billing.Controllers
private static bool IsSponsoredSubscription(Subscription subscription) => private static bool IsSponsoredSubscription(Subscription subscription) =>
StaticStore.SponsoredPlans.Any(p => p.StripePlanId == subscription.Id); StaticStore.SponsoredPlans.Any(p => p.StripePlanId == subscription.Id);
private async Task HandlePaymentFailed(Invoice invoice, Subscription subscription) private async Task HandlePaymentFailed(Invoice invoice)
{ {
if (!invoice.Paid && invoice.AttemptCount > 1 && UnpaidAutoChargeInvoiceForSubscriptionCycle(invoice)) if (!invoice.Paid && invoice.AttemptCount > 1 && UnpaidAutoChargeInvoiceForSubscriptionCycle(invoice))
{ {
var subscriptionService = new SubscriptionService();
var subscription = await subscriptionService.GetAsync(invoice.SubscriptionId);
// attempt count 4 = 11 days after initial failure // attempt count 4 = 11 days after initial failure
if (invoice.AttemptCount > 3 && subscription.Items.Any(i => i.Plan.Id == PremiumPlanId)) if (invoice.AttemptCount > 3 && subscription.Items.Any(i => i.Price.Id == PremiumPlanId || i.Price.Id == PremiumPlanIdAppStore))
{ {
await CancelSubscription(invoice.SubscriptionId); await CancelSubscription(invoice.SubscriptionId);
await VoidOpenInvoices(invoice.SubscriptionId); await VoidOpenInvoices(invoice.SubscriptionId);