Allow a team without subscription to go unmanaged

Author: knolleary

forge/ee/db/controllers/Subscription.js

@@ -28,6 +28,15 @@ module.exports = {
             return newSubscription
         }
     },
+    createUnmanagedSubscription: async function (app, team) {
+        const newSubscription = await app.db.models.Subscription.create({
+            customer: '',
+            subscription: '',
+            status: app.db.models.Subscription.STATUS.UNMANAGED
+        })
+        await newSubscription.setTeam(team)
+        return newSubscription
+    },
     createTrialSubscription: async function (app, team, trialEndsAt) {
         const newSubscription = await app.db.models.Subscription.create({
             customer: '',

forge/ee/lib/billing/index.js

@@ -525,40 +525,46 @@ module.exports.init = async function (app) {
         enableManualBilling: async (team) => {
             app.log.info(`Enabling manual billing for team ${team.hashid}`)
             const subscription = await team.getSubscription()
-            const existingSubscription = subscription.subscription
-            subscription.subscription = ''
-            subscription.status = app.db.models.Subscription.STATUS.UNMANAGED
-            subscription.trialEndsAt = null
-            subscription.trialStatus = app.db.models.Subscription.TRIAL_STATUS.ENDED
-            await subscription.save()
+            if (subscription) {
+                const existingSubscription = subscription.subscription
+                subscription.subscription = ''
+                subscription.status = app.db.models.Subscription.STATUS.UNMANAGED
+                subscription.trialEndsAt = null
+                subscription.trialStatus = app.db.models.Subscription.TRIAL_STATUS.ENDED
+                await subscription.save()
 
-            // Now we have marked the local subscription as unmanaged, we need to
-            // check to see if there is a stripe subscription to cancel
-            if (existingSubscription) {
-                try {
-                    const stripeSubscription = await stripe.subscriptions.retrieve(existingSubscription)
-                    if (stripeSubscription && stripeSubscription.status !== 'canceled') {
-                        app.log.info(`Canceling existing subscription ${existingSubscription} for team ${team.hashid}`)
-                        // There is an existing subscription to cancel
-                        try {
-                            // We do not use `app.billing.closeSubscription` because
-                            // that expects a Subscription object. However, we've already
-                            // updated the local Subscription object to remove the information
-                            // needed by closeSubscription. This is to ensure when the
-                            // stripe callback arrives we don't trigger a suspension of
-                            // the team resources.
-                            await stripe.subscriptions.del(existingSubscription, {
-                                invoice_now: true,
-                                prorate: true
-                            })
-                        } catch (err) {
-                            app.log.warn(`Error canceling existing subscription ${existingSubscription} for team ${team.hashid}: ${err.toString()}`)
+                // Now we have marked the local subscription as unmanaged, we need to
+                // check to see if there is a stripe subscription to cancel
+                if (existingSubscription) {
+                    try {
+                        const stripeSubscription = await stripe.subscriptions.retrieve(existingSubscription)
+                        if (stripeSubscription && stripeSubscription.status !== 'canceled') {
+                            app.log.info(`Canceling existing subscription ${existingSubscription} for team ${team.hashid}`)
+                            // There is an existing subscription to cancel
+                            try {
+                                // We do not use `app.billing.closeSubscription` because
+                                // that expects a Subscription object. However, we've already
+                                // updated the local Subscription object to remove the information
+                                // needed by closeSubscription. This is to ensure when the
+                                // stripe callback arrives we don't trigger a suspension of
+                                // the team resources.
+                                await stripe.subscriptions.del(existingSubscription, {
+                                    invoice_now: true,
+                                    prorate: true
+                                })
+                            } catch (err) {
+                                app.log.warn(`Error canceling existing subscription ${existingSubscription} for team ${team.hashid}: ${err.toString()}`)
+                            }
                         }
+                    } catch (err) {
+                        // Could not find a matching stripe subscription - that's means
+                        // we have nothing cancel
                     }
-                } catch (err) {
-                    // Could not find a matching stripe subscription - that's means
-                    // we have nothing cancel
                 }
+            } else {
+                // If the team bailed out of setting up stripe, they will not have
+                // a subscription.
+                await app.db.controllers.Subscription.createUnmanagedSubscription(team)
             }
         },
         updateTrialSettings: async (team, settings) => {

test/unit/forge/ee/lib/billing/index_spec.js

@@ -361,6 +361,21 @@ describe('Billing', function () {
             stripe.subscriptions.del.called.should.be.true()
             stripe.subscriptions.del.lastCall.args[0].should.equal('sub_1234')
         })
+        it('puts team without existing subscription into unmanaged mode', async function () {
+            const team1 = await app.factory.createTeam({ name: 'UnmanagedTeam2' })
+            await team1.addUser(app.user, { through: { role: Roles.Owner } })
+
+            await app.billing.enableManualBilling(team1)
+
+            const sub = await team1.getSubscription()
+            // Check the updated states for an unmanaged subscription are correct
+            sub.isActive().should.be.false()
+            sub.isUnmanaged().should.be.true()
+            sub.isTrial().should.be.false()
+            sub.isTrialEnded().should.be.true()
+            sub.subscription.should.equal('')
+            sub.customer.should.equal('')
+        })
     })
 
     describe('addProject', function () {