[server] When deleting a user account, also cancel any individual Stripe subscription

Author: jankeromnes

components/server/ee/src/user/user-deletion-service.ts

@@ -8,13 +8,16 @@ import { injectable, inject } from "inversify";
 import { UserDeletionService } from "../../../src/user/user-deletion-service";
 import { SubscriptionService } from "@gitpod/gitpod-payment-endpoint/lib/accounting/subscription-service";
 import { Plans } from "@gitpod/gitpod-protocol/lib/plans";
+import { AttributionId } from "@gitpod/gitpod-protocol/lib/attribution";
 import { ChargebeeService } from "./chargebee-service";
+import { StripeService } from "./stripe-service";
 import { TeamSubscriptionService } from "@gitpod/gitpod-payment-endpoint/lib/accounting";
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 
 @injectable()
 export class UserDeletionServiceEE extends UserDeletionService {
     @inject(ChargebeeService) protected readonly chargebeeService: ChargebeeService;
+    @inject(StripeService) protected readonly stripeService: StripeService;
     @inject(SubscriptionService) protected readonly subscriptionService: SubscriptionService;
     @inject(TeamSubscriptionService) protected readonly teamSubscriptionService: TeamSubscriptionService;
 
@@ -27,14 +30,14 @@ export class UserDeletionServiceEE extends UserDeletionService {
         const errors = [];
         if (this.config.enablePayment) {
             const now = new Date();
-            const subscriptions = await this.subscriptionService.getNotYetCancelledSubscriptions(
+            const chargebeeSubscriptions = await this.subscriptionService.getNotYetCancelledSubscriptions(
                 user,
                 now.toISOString(),
             );
-            for (const subscription of subscriptions) {
+            for (const chargebeeSubscription of chargebeeSubscriptions) {
                 try {
-                    const planId = subscription.planId!;
-                    const paymentReference = subscription.paymentReference;
+                    const planId = chargebeeSubscription.planId!;
+                    const paymentReference = chargebeeSubscription.paymentReference;
                     if (Plans.isFreeNonTransientPlan(planId)) {
                         // only delete those plans that are persisted in the DB
                         await this.subscriptionService.unsubscribe(user.id, now.toISOString(), planId);
@@ -58,8 +61,8 @@ export class UserDeletionServiceEE extends UserDeletionService {
                             throw new Error("Cannot delete user subscription from GitHub");
                         } else {
                             // cancel Chargebee subscriptions
-                            const subscriptionId = subscription.uid;
-                            const chargebeeSubscriptionId = subscription.paymentReference!;
+                            const subscriptionId = chargebeeSubscription.uid;
+                            const chargebeeSubscriptionId = chargebeeSubscription.paymentReference!;
                             await this.chargebeeService.cancelSubscription(
                                 chargebeeSubscriptionId,
                                 { userId: user.id },
@@ -69,9 +72,23 @@ export class UserDeletionServiceEE extends UserDeletionService {
                     }
                 } catch (error) {
                     errors.push(error);
-                    log.error("Error cancelling subscription", error, { subscription });
+                    log.error("Error cancelling Chargebee user subscription", error, {
+                        subscription: chargebeeSubscription,
+                    });
                 }
             }
+            // Also cancel any usage-based (Stripe) subscription
+            const subscriptionId = await this.stripeService.findUncancelledSubscriptionByAttributionId(
+                AttributionId.render({ kind: "user", userId: user.id }),
+            );
+            try {
+                if (subscriptionId) {
+                    await this.stripeService.cancelSubscription(subscriptionId);
+                }
+            } catch (error) {
+                errors.push(error);
+                log.error("Error cancelling Stripe user subscription", error, { subscriptionId });
+            }
         }
 
         await super.deleteUser(id);