Allow passing team ID explicitly via request headers (#6771)

Author: jnsdls

.changeset/giant-moons-sleep.md

@@ -0,0 +1,6 @@
+---
+"@thirdweb-dev/service-utils": patch
+"thirdweb": patch
+---
+
+allow passing the team id explicitly via request headers

packages/service-utils/src/cf-worker/index.ts

@@ -156,6 +156,11 @@ export async function extractAuthorizationData(
     }
   }
 
+  let teamId: string | null = null;
+  if (headers.has("x-team-id")) {
+    teamId = headers.get("x-team-id");
+  }
+
   return {
     incomingServiceApiKey,
     incomingServiceApiKeyHash,
@@ -168,7 +173,7 @@ export async function extractAuthorizationData(
     origin,
     bundleId,
     secretKeyHash,
-    teamId: authInput.teamId,
+    teamId: authInput.teamId ?? teamId ?? undefined,
     targetAddress: authInput.targetAddress,
   };
 }

packages/service-utils/src/node/index.ts

@@ -160,6 +160,11 @@ export function extractAuthorizationData(
     }
   }
 
+  let teamId: string | null = null;
+  if (getHeader(headers, "x-team-id")) {
+    teamId = getHeader(headers, "x-team-id");
+  }
+
   return {
     incomingServiceApiKey,
     incomingServiceApiKeyHash,
@@ -173,7 +178,7 @@ export function extractAuthorizationData(
     origin,
     bundleId,
     targetAddress: authInput.targetAddress,
-    teamId: authInput.teamId,
+    teamId: authInput.teamId ?? teamId ?? undefined,
     useWalletAuth,
   };
 }

packages/thirdweb/src/client/client.ts

@@ -49,6 +49,12 @@ type ClientOptions = Prettify<{
       gatewayUrl?: string;
     };
   };
+
+  /**
+   * The team ID for thirdweb dashboard usage.
+   * @hidden
+   */
+  teamId?: string;
 }>;
 
 export type CreateThirdwebClientOptions = Prettify<

packages/thirdweb/src/utils/fetch.ts

@@ -55,6 +55,10 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
         !isBundlerUrl(urlString)
       ) {
         headers.set("authorization", `Bearer ${authToken}`);
+        // if we have a specific teamId set, add it to the request headers
+        if (client.teamId) {
+          headers.set("x-team-id", client.teamId);
+        }
       } else if (secretKey) {
         headers.set("x-secret-key", secretKey);
       } else if (clientId) {