[server] Make 'subscribeToStripe' return the new usage limit

Author: jankeromnes

components/dashboard/src/components/UsageBasedBillingConfig.tsx

@@ -102,9 +102,10 @@ export default function UsageBasedBillingConfig({ attributionId }: Props) {
                     const members = await getGitpodService().server.getTeamMembers(attrId.teamId);
                     limit = BASE_USAGE_LIMIT_FOR_STRIPE_USERS * members.length;
                 }
-                await getGitpodService().server.subscribeToStripe(attributionId, setupIntentId, limit);
-                const newLimit = await getGitpodService().server.getUsageLimit(attributionId);
-                setUsageLimit(newLimit);
+                const newLimit = await getGitpodService().server.subscribeToStripe(attributionId, setupIntentId, limit);
+                if (newLimit) {
+                    setUsageLimit(newLimit);
+                }
             } catch (error) {
                 console.error("Could not subscribe to Stripe", error);
                 window.localStorage.removeItem(localStorageKey);

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

@@ -278,7 +278,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getStripeSetupIntentClientSecret(): Promise<string>;
     findStripeSubscriptionId(attributionId: string): Promise<string | undefined>;
     createStripeCustomerIfNeeded(attributionId: string, currency: string): Promise<void>;
-    subscribeToStripe(attributionId: string, setupIntentId: string, usageLimit: number): Promise<void>;
+    subscribeToStripe(attributionId: string, setupIntentId: string, usageLimit: number): Promise<number | undefined>;
     getStripePortalUrl(attributionId: string): Promise<string>;
     getUsageLimit(attributionId: string): Promise<number | undefined>;
     setUsageLimit(attributionId: string, usageLimit: number): Promise<void>;

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

@@ -2118,7 +2118,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         attributionId: string,
         setupIntentId: string,
         usageLimit: number,
-    ): Promise<void> {
+    ): Promise<number | undefined> {
         const attrId = AttributionId.parse(attributionId);
         if (attrId === undefined) {
             log.error(`Invalid attribution id: ${attributionId}`);
@@ -2143,7 +2143,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
             await this.stripeService.createSubscriptionForCustomer(customerId, attributionId);
 
             // Creating a cost center for this customer
-            await this.usageService.setCostCenter({
+            const { costCenter } = await this.usageService.setCostCenter({
                 costCenter: {
                     attributionId: attributionId,
                     spendingLimit: usageLimit,
@@ -2152,6 +2152,8 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
             });
 
             this.messageBus.notifyOnSubscriptionUpdate(ctx, attrId).catch();
+
+            return costCenter?.spendingLimit;
         } catch (error) {
             log.error(`Failed to subscribe '${attributionId}' to Stripe`, error);
             throw new ResponseError(

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

@@ -3106,7 +3106,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         attributionId: string,
         setupIntentId: string,
         usageLimit: number,
-    ): Promise<void> {
+    ): Promise<number | undefined> {
         throw new ResponseError(ErrorCodes.SAAS_FEATURE, `Not implemented in this version`);
     }
     async getStripePortalUrl(ctx: TraceContext, attributionId: string): Promise<string> {