[server] Only try to delete Stripe subscription if the user's BillingMode is "usage-based" (#17318)

* [server] Only try to delete Stripe subscription if the user's BillingMode is "usage-based"

* [server] Push subscription cancellation into StripeService

Author: geropl

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

@@ -16,6 +16,7 @@ import {
 import { BillingServiceClient, BillingServiceDefinition } from "@gitpod/usage-api/lib/usage/v1/billing.pb";
 import { ResponseError } from "vscode-ws-jsonrpc";
 import { ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
+import { AttributionId } from "@gitpod/gitpod-protocol/lib/attribution";
 
 @injectable()
 export class StripeService {
@@ -98,7 +99,22 @@ export class StripeService {
         return priceInformation.humanReadableDescription;
     }
 
-    async cancelSubscription(subscriptionId: string): Promise<void> {
+    async cancelSubscriptionForUser(userId: string) {
+        let subscriptionId;
+        try {
+            subscriptionId = await this.findUncancelledSubscriptionByAttributionId(
+                AttributionId.render({ kind: "user", userId }),
+            );
+            if (subscriptionId) {
+                await this.cancelSubscription(subscriptionId);
+            }
+        } catch (error) {
+            log.error("Error cancelling Stripe user subscription", error, { subscriptionId });
+            throw new Error(`Failed to cancel stripe subscription. ${error}`);
+        }
+    }
+
+    protected async cancelSubscription(subscriptionId: string): Promise<void> {
         await reportStripeOutcome("subscriptions_cancel", () => {
             return this.getStripe().subscriptions.del(subscriptionId, { invoice_now: true });
         });

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

@@ -16,7 +16,7 @@ import { AuthProviderService } from "../auth/auth-provider-service";
 import { IAnalyticsWriter } from "@gitpod/gitpod-protocol/lib/analytics";
 import { Config } from "../config";
 import { StripeService } from "../../ee/src/user/stripe-service";
-import { AttributionId } from "@gitpod/gitpod-protocol/lib/attribution";
+import { BillingModes } from "../../ee/src/billing/billing-mode";
 
 @injectable()
 export class UserDeletionService {
@@ -33,6 +33,7 @@ export class UserDeletionService {
     @inject(AuthProviderService) protected readonly authProviderService: AuthProviderService;
     @inject(IAnalyticsWriter) protected readonly analytics: IAnalyticsWriter;
     @inject(StripeService) protected readonly stripeService: StripeService;
+    @inject(BillingModes) protected readonly billingMode: BillingModes;
 
     /**
      * This method deletes a User logically. The contract here is that after running this method without receiving an
@@ -50,20 +51,10 @@ export class UserDeletionService {
             log.debug({ userId: id }, "Is deleted but markDeleted already set. Continuing.");
         }
 
-        if (this.config.enablePayment) {
-            let subscriptionId;
-            try {
-                // Also cancel any usage-based (Stripe) subscription
-                subscriptionId = await this.stripeService.findUncancelledSubscriptionByAttributionId(
-                    AttributionId.render({ kind: "user", userId: user.id }),
-                );
-                if (subscriptionId) {
-                    await this.stripeService.cancelSubscription(subscriptionId);
-                }
-            } catch (error) {
-                log.error("Error cancelling Stripe user subscription", error, { subscriptionId });
-                throw new Error(`Failed to cancel stripe subscription. ${error}`);
-            }
+        const billingMode = await this.billingMode.getBillingModeForUser(user, new Date());
+        if (billingMode.mode === "usage-based") {
+            // Also cancel any usage-based (Stripe) subscription
+            await this.stripeService.cancelSubscriptionForUser(user.id);
         }
 
         // Stop all workspaces