remove service utils chagne

Author: arcoraven

packages/service-utils/src/core/api.ts

@@ -80,15 +80,30 @@ type TeamCapabilities = {
     customAuth: boolean;
     customBranding: boolean;
   };
+  engineCloud: {
+    enabled: boolean;
+    mainnetEnabled: boolean;
+    rateLimit: number;
+  };
 };
 
+type TeamPlan =
+  | "free"
+  | "starter"
+  | "starter_legacy"
+  | "growth_legacy"
+  | "growth"
+  | "accelerate"
+  | "scale"
+  | "pro";
+
 export type TeamResponse = {
   id: string;
   name: string;
   slug: string;
   image: string | null;
-  billingPlan: "free" | "starter" | "growth" | "pro";
-  supportPlan: "free" | "starter" | "growth" | "pro";
+  billingPlan: TeamPlan;
+  supportPlan: TeamPlan;
   billingPlanVersion: number;
   createdAt: string;
   updatedAt: string | null;
@@ -108,7 +123,7 @@ export type TeamResponse = {
   enabledScopes: ServiceName[];
   isOnboarded: boolean;
   capabilities: TeamCapabilities;
-  unthreadCustomerId: string | null;
+  planCancellationDate: string | null;
 };
 
 export type ProjectSecretKey = {
@@ -219,7 +234,7 @@ export async function fetchTeamAndProject(
   config: CoreServiceConfig,
 ): Promise<ApiResponse> {
   const { apiUrl, serviceApiKey } = config;
-  const { teamId, clientId } = authData;
+  const { teamId, clientId, incomingServiceApiKey } = authData;
 
   const url = new URL("/v2/keys/use", apiUrl);
   if (clientId) {
@@ -238,11 +253,17 @@ export async function fetchTeamAndProject(
         headers: {
           ...(authData.secretKey ? { "x-secret-key": authData.secretKey } : {}),
           ...(authData.jwt ? { Authorization: `Bearer ${authData.jwt}` } : {}),
-          "x-service-api-key": serviceApiKey,
+          // use the incoming service api key if it exists, otherwise use the service api key
+          // this is done to ensure that the incoming service API key is VALID in the first place
+          "x-service-api-key": incomingServiceApiKey
+            ? incomingServiceApiKey
+            : serviceApiKey,
           "content-type": "application/json",
         },
       });
 
+      // TODO: if the response is a well understood status code (401, 402, etc), we should skip retry logic
+
       let text = "";
       try {
         text = await response.text();