[server][dashboard] Refactor createOrUpdateStripeCustomerFor{User,Team} to createStripeCustomer

Author: jankeromnes

components/dashboard/src/components/UsageBasedBillingConfig.tsx

@@ -295,13 +295,8 @@ function CreditCardInputForm(props: { attributionId: string }) {
         setBillingError(undefined);
         setIsLoading(true);
         try {
-            if (attrId.kind === "team") {
-                // Create Stripe customer for team & currency (or update currency)
-                await getGitpodService().server.createOrUpdateStripeCustomerForTeam(attrId.teamId, currency);
-            } else {
-                // Create Stripe customer for user & currency (or update currency)
-                await getGitpodService().server.createOrUpdateStripeCustomerForUser(currency);
-            }
+            // Create Stripe customer with currency
+            await getGitpodService().server.createStripeCustomer(props.attributionId, currency);
             const result = await stripe.confirmSetup({
                 elements,
                 confirmParams: {

components/gitpod-protocol/src/gitpod-service.ts

@@ -288,8 +288,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getStripeSetupIntentClientSecret(): Promise<string>;
     findStripeSubscriptionId(attributionId: string): Promise<string | undefined>;
     findStripeSubscriptionIdForTeam(teamId: string): Promise<string | undefined>;
-    createOrUpdateStripeCustomerForTeam(teamId: string, currency: string): Promise<void>;
-    createOrUpdateStripeCustomerForUser(currency: string): Promise<void>;
+    createStripeCustomer(attributionId: string, currency: string): Promise<void>;
     subscribeToStripe(attributionId: string, setupIntentId: string): Promise<void>;
     subscribeTeamToStripe(teamId: string, setupIntentId: string): Promise<void>;
     getStripePortalUrl(attributionId: string): Promise<string>;

components/server/ee/src/workspace/gitpod-server-impl.ts

@@ -2099,41 +2099,42 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         return this.findStripeSubscriptionId(ctx, AttributionId.render(attributionId));
     }
 
-    async createOrUpdateStripeCustomerForTeam(ctx: TraceContext, teamId: string, currency: string): Promise<void> {
-        const user = this.checkAndBlockUser("createOrUpdateStripeCustomerForTeam");
-        const team = await this.guardTeamOperation(teamId, "update");
-        await this.ensureStripeApiIsAllowed({ team });
-        try {
-            let customerId = await this.stripeService.findCustomerByTeamId(team!.id);
-            if (!customerId) {
-                log.info("Creating customer for team", { teamId });
-                customerId = await this.stripeService.createCustomerForTeam(user, team!);
+    async createStripeCustomer(ctx: TraceContext, attributionId: string, currency: string): Promise<void> {
+        const user = this.checkAndBlockUser("createStripeCustomer");
+        const attrId = AttributionId.parse(attributionId);
+        if (!attrId) {
+            throw new ResponseError(ErrorCodes.BAD_REQUEST, `Invalid attributionId '${attributionId}'`);
+        }
+        let team: Team | undefined;
+        if (attrId.kind === "team") {
+            team = await this.guardTeamOperation(attrId.teamId, "update");
+            await this.ensureStripeApiIsAllowed({ team });
+        } else {
+            if (attrId.userId !== user.id) {
+                throw new ResponseError(
+                    ErrorCodes.PERMISSION_DENIED,
+                    "Cannot create Stripe customer profile for another user",
+                );
             }
-            log.info("Setting preferred currency for team", { teamId, currency });
-            await this.stripeService.setPreferredCurrencyForCustomer(customerId, currency);
-        } catch (error) {
-            log.error(`Failed to update Stripe customer profile for team '${teamId}'`, error);
-            throw new ResponseError(
-                ErrorCodes.INTERNAL_SERVER_ERROR,
-                `Failed to update Stripe customer profile for team '${teamId}'`,
-            );
+            await this.ensureStripeApiIsAllowed({ user });
         }
-    }
-
-    async createOrUpdateStripeCustomerForUser(ctx: TraceContext, currency: string): Promise<void> {
-        const user = this.checkAndBlockUser("createOrUpdateStripeCustomerForUser");
-        await this.ensureStripeApiIsAllowed({ user });
         try {
-            let customerId = await this.stripeService.findCustomerByUserId(user.id);
-            if (!customerId) {
-                customerId = await this.stripeService.createCustomerForUser(user);
+            if (await this.stripeService.findCustomerByAttributionId(attributionId)) {
+                throw new ResponseError(
+                    ErrorCodes.BAD_REQUEST,
+                    "A Stripe customer profile already exists for this attributionId",
+                );
             }
+            const customerId =
+                attrId.kind === "team"
+                    ? await this.stripeService.createCustomerForTeam(user, team!)
+                    : await this.stripeService.createCustomerForUser(user);
             await this.stripeService.setPreferredCurrencyForCustomer(customerId, currency);
         } catch (error) {
-            log.error(`Failed to update Stripe customer profile for user '${user.id}'`, error);
+            log.error(`Failed to create Stripe customer profile for '${attributionId}'`, error);
             throw new ResponseError(
                 ErrorCodes.INTERNAL_SERVER_ERROR,
-                `Failed to update Stripe customer profile for user '${user.id}'`,
+                `Failed to create Stripe customer profile for '${attributionId}'`,
             );
         }
     }

components/server/src/auth/rate-limiter.ts

@@ -202,8 +202,7 @@ const defaultFunctions: FunctionsConfig = {
     getStripeSetupIntentClientSecret: { group: "default", points: 1 },
     findStripeSubscriptionId: { group: "default", points: 1 },
     findStripeSubscriptionIdForTeam: { group: "default", points: 1 },
-    createOrUpdateStripeCustomerForTeam: { group: "default", points: 1 },
-    createOrUpdateStripeCustomerForUser: { group: "default", points: 1 },
+    createStripeCustomer: { group: "default", points: 1 },
     subscribeToStripe: { group: "default", points: 1 },
     subscribeTeamToStripe: { group: "default", points: 1 },
     getStripePortalUrl: { group: "default", points: 1 },

components/server/src/workspace/gitpod-server-impl.ts

@@ -3133,10 +3133,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     async findStripeSubscriptionIdForTeam(ctx: TraceContext, teamId: string): Promise<string | undefined> {
         throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
     }
-    async createOrUpdateStripeCustomerForTeam(ctx: TraceContext, teamId: string, currency: string): Promise<void> {
-        throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
-    }
-    async createOrUpdateStripeCustomerForUser(ctx: TraceContext, currency: string): Promise<void> {
+    async createStripeCustomer(ctx: TraceContext, attributionId: string, currency: string): Promise<void> {
         throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
     }
     async subscribeTeamToStripe(ctx: TraceContext, teamId: string, setupIntentId: string): Promise<void> {