Merge pull request #5172 from FlowFuse/allow-suspend-on-expired-subsc…

…ription Allow team suspend when subscription has expired
FlowFuse · Feb 24, 2025 · decd2d5 · decd2d5
2 parents d4a29de + 74b3bc1
commit decd2d5
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/forge/ee/lib/billing/index.js b/forge/ee/lib/billing/index.js
@@ -397,11 +397,18 @@ module.exports.init = async function (app) {
         closeSubscription: async (subscription) => {
             if (subscription.subscription) {
                 app.log.info(`Canceling subscription ${subscription.subscription} for team ${subscription.Team.hashid}`)
-
-                await stripe.subscriptions.del(subscription.subscription, {
-                    invoice_now: true,
-                    prorate: true
-                })
+                try {
+                    await stripe.subscriptions.del(subscription.subscription, {
+                        invoice_now: true,
+                        prorate: true
+                    })
+                } catch (err) {
+                    // resource_missing error is okay - that means the subscription cannot be found
+                    // and we can ignore it
+                    if (err.code !== 'resource_missing') {
+                        throw err
+                    }
+                }
             }
             subscription.status = app.db.models.Subscription.STATUS.CANCELED
             await subscription.save()