Merge branch 'main' into greg/fix-invalid-client-id-override

Author: gregfromstl

apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/connect/universal-bridge/webhooks/components/webhooks.client.tsx

@@ -63,7 +63,7 @@ type PayWebhooksPageProps = {
 
 export function PayWebhooksPage(props: PayWebhooksPageProps) {
   const webhooksQuery = useQuery({
-    queryKey: ["webhooks", props.clientId],
+    queryKey: ["webhooks", props.clientId, props.teamId],
     queryFn: async () => {
       return await getWebhooks({
         clientId: props.clientId,

packages/thirdweb/src/utils/fetch.ts

@@ -70,14 +70,15 @@ export function getClientFetch(client: ThirdwebClient, ecosystem?: Ecosystem) {
         if (client.teamId) {
           headers.set("x-team-id", client.teamId);
         }
-      }
-
-      if (secretKey) {
-        headers.set("x-secret-key", secretKey);
-      }
+      } else {
+        // only set secret key or client id if we are NOT using the auth token!
+        if (secretKey) {
+          headers.set("x-secret-key", secretKey);
+        }
 
-      if (clientId) {
-        headers.set("x-client-id", clientId);
+        if (clientId) {
+          headers.set("x-client-id", clientId);
+        }
       }
 
       if (ecosystem) {