From db0ef226c46bcff477cd6f78c973d7efbfcb2312 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Fri, 3 Sep 2021 09:55:29 -0400
Subject: [PATCH] Fix stripe invoice time on seat adjust (#1564)

* Finalize and void subscription updates

Stripe does not allow deletion of invoices created as subscription updates.
Instead, finalize it and void it out without sending to the customer.

* Store and Restore invoice days until due

Currently, we're overwriting customer invoice lead times whenever they
attempt to update their seat count. Changes are now updated to previous
behavior after our seat adjustment work

* PR Comments
---
 .../Services/Implementations/OrganizationService.cs | 11 +++++++----
 .../Implementations/StripePaymentService.cs         | 13 ++++++++++++-
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/Core/Services/Implementations/OrganizationService.cs b/src/Core/Services/Implementations/OrganizationService.cs
index 9be13b12cf..0971d2fdc7 100644
--- a/src/Core/Services/Implementations/OrganizationService.cs
+++ b/src/Core/Services/Implementations/OrganizationService.cs
@@ -414,8 +414,9 @@ namespace Bit.Core.Services
 
             var prorationDate = DateTime.UtcNow;
             var seatItem = sub.Items?.Data?.FirstOrDefault(i => i.Plan.Id == plan.StripeSeatPlanId);
-            // Retain original collection method
+            // Retain original collection method and days util due
             var collectionMethod = sub.CollectionMethod;
+            var daysUntilDue = sub.DaysUntilDue;
 
             var subUpdateOptions = new SubscriptionUpdateOptions
             {
@@ -430,8 +431,8 @@ namespace Bit.Core.Services
                     }
                 },
                 ProrationBehavior = "always_invoice",
-                DaysUntilDue = 1,
                 CollectionMethod = "send_invoice",
+                DaysUntilDue = daysUntilDue ?? 1,
                 ProrationDate = prorationDate,
             };
 
@@ -485,17 +486,19 @@ namespace Bit.Core.Services
                         //  being applied forward to the next month's invoice
                         ProrationBehavior = "none",
                         CollectionMethod = collectionMethod,
+                        DaysUntilDue = daysUntilDue,
                     });
                     throw;
                 }
             }
 
-            // Change back the subscription collection method
-            if (collectionMethod != "send_invoice")
+            // Change back the subscription collection method and/or days until due
+            if (collectionMethod != "send_invoice" || daysUntilDue == null)
             {
                 await subscriptionService.UpdateAsync(sub.Id, new SubscriptionUpdateOptions
                 {
                     CollectionMethod = collectionMethod,
+                    DaysUntilDue = daysUntilDue,
                 });
             }
 
diff --git a/src/Core/Services/Implementations/StripePaymentService.cs b/src/Core/Services/Implementations/StripePaymentService.cs
index 5274ed8b76..6b971f9709 100644
--- a/src/Core/Services/Implementations/StripePaymentService.cs
+++ b/src/Core/Services/Implementations/StripePaymentService.cs
@@ -889,7 +889,18 @@ namespace Bit.Core.Services
                     if (cardPaymentMethodId == null)
                     {
                         // We're going to delete this draft invoice, it can't be paid
-                        await invoiceService.DeleteAsync(invoice.Id);
+                        try
+                        {
+                            await invoiceService.DeleteAsync(invoice.Id);
+                        }
+                        catch
+                        {
+                            await invoiceService.FinalizeInvoiceAsync(invoice.Id, new InvoiceFinalizeOptions
+                            {
+                                AutoAdvance = false
+                            });
+                            await invoiceService.VoidInvoiceAsync(invoice.Id);
+                        }
                         throw new BadRequestException("No payment method is available.");
                     }
                 }