Merge pull request #2670 from 1000hz/headers-dont-throw-validation-error-w-custom-fetch

chore(client): don't throw a validation error for missing auth headers if using custom fetch

Author: musa-cf

src/core.ts

@@ -234,7 +234,7 @@ export abstract class APIClient {
   /**
    * Override this to add your own headers validation:
    */
-  protected validateHeaders(headers: Headers, customHeaders: Headers) {}
+  protected validateHeaders(headers: Headers, customHeaders: Headers, usingCustomFetch: boolean) {}
 
   protected defaultIdempotencyKey(): string {
     return `stainless-node-retry-${uuid4()}`;
@@ -397,7 +397,7 @@ export abstract class APIClient {
       reqHeaders['x-stainless-timeout'] = String(options.timeout);
     }
 
-    this.validateHeaders(reqHeaders, headers);
+    this.validateHeaders(reqHeaders, headers, this.fetch !== fetch);
 
     return reqHeaders;
   }

src/index.ts

@@ -381,7 +381,11 @@ export class Cloudflare extends Core.APIClient {
     };
   }
 
-  protected override validateHeaders(headers: Core.Headers, customHeaders: Core.Headers) {
+  protected override validateHeaders(
+    headers: Core.Headers,
+    customHeaders: Core.Headers,
+    usingCustomFetch: boolean,
+  ) {
     if (this.apiEmail && headers['x-auth-email']) {
       return;
     }
@@ -410,6 +414,11 @@ export class Cloudflare extends Core.APIClient {
       return;
     }
 
+    // we can't check for the presence of the headers with a custom fetch implementation, so we shouldn't throw an error
+    if (usingCustomFetch) {
+      return;
+    }
+
     throw new Error(
       'Could not resolve authentication method. Expected one of apiEmail, apiKey, apiToken or userServiceKey to be set. Or for one of the "X-Auth-Email", "X-Auth-Key", "Authorization" or "X-Auth-User-Service-Key" headers to be explicitly omitted',
     );