[server] Add new individual Stripe Price IDs to Gitpod's configuration

Author: jankeromnes

.werft/jobs/build/payment/stripe-configmap.yaml

@@ -6,7 +6,11 @@ metadata:
 data:
   config: |
     {
-      "usageProductPriceIds": {
+      "individualUsagePriceIds": {
+        "EUR": "price_1LiId7GadRXm50o3OayAS2y4",
+        "USD": "price_1LiIdbGadRXm50o3ylg5S44r"
+      },
+      "teamUsagePriceIds": {
         "EUR": "price_1LiId7GadRXm50o3OayAS2y4",
         "USD": "price_1LiIdbGadRXm50o3ylg5S44r"
       }

components/gitpod-protocol/src/protocol.ts

@@ -815,8 +815,8 @@ export interface RepositoryCloneInformation {
 
 export interface CoreDumpConfig {
     enabled?: boolean;
-	softLimit?: number;
-	hardLimit?: number;
+    softLimit?: number;
+    hardLimit?: number;
 }
 
 export interface WorkspaceConfig {
@@ -1520,6 +1520,11 @@ export interface Terms {
     readonly formElements?: object;
 }
 
+export interface StripeConfig {
+    individualUsagePriceIds: { [currency: string]: string };
+    teamUsagePriceIds: { [currency: string]: string };
+}
+
 export type BillingStrategy = "other" | "stripe";
 export interface CostCenter {
     readonly id: AttributionId;

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

@@ -139,7 +139,8 @@ export class StripeService {
             throw new Error(`Stripe customer '${customerId}' could not be found`);
         }
         const currency = customer.metadata.preferredCurrency || "USD";
-        const priceId = this.config?.stripeConfig?.usageProductPriceIds[currency];
+        // FIXME(janx): Use `individualUsagePriceIds` when subscribing users.
+        const priceId = this.config?.stripeConfig?.teamUsagePriceIds[currency];
         if (!priceId) {
             throw new Error(`No Stripe Price ID configured for currency '${currency}'`);
         }

components/server/src/config.ts

@@ -7,7 +7,7 @@
 import { GitpodHostUrl } from "@gitpod/gitpod-protocol/lib/util/gitpod-host-url";
 import { AuthProviderParams, normalizeAuthProviderParams } from "./auth/auth-provider";
 
-import { NamedWorkspaceFeatureFlag } from "@gitpod/gitpod-protocol";
+import { NamedWorkspaceFeatureFlag, StripeConfig } from "@gitpod/gitpod-protocol";
 
 import { RateLimiterConfig } from "./auth/rate-limiter";
 import { CodeSyncConfig } from "./code-sync/code-sync-service";
@@ -27,7 +27,7 @@ export type Config = Omit<
     workspaceDefaults: WorkspaceDefaults;
     chargebeeProviderOptions?: ChargebeeProviderOptions;
     stripeSecrets?: { publishableKey: string; secretKey: string };
-    stripeConfig?: { usageProductPriceIds: { [currency: string]: string } };
+    stripeConfig?: StripeConfig;
     builtinAuthProvidersConfigured: boolean;
     inactivityPeriodForRepos?: number;
 };
@@ -266,7 +266,7 @@ export namespace ConfigFile {
                 log.error("Could not load Stripe secrets", error);
             }
         }
-        let stripeConfig: { usageProductPriceIds: { EUR: string; USD: string } } | undefined;
+        let stripeConfig: StripeConfig | undefined;
         if (config.enablePayment && config.stripeConfigFile) {
             try {
                 stripeConfig = JSON.parse(fs.readFileSync(filePathTelepresenceAware(config.stripeConfigFile), "utf-8"));