feat: Redact After Retry Attempts

src/common.ts

@@ -129,13 +129,6 @@ export class GaxiosError<T = any> extends Error {
     if (error && 'code' in error && error.code) {
       this.code = error.code;
     }
-
-    if (config.errorRedactor) {
-      config.errorRedactor({
-        config: this.config,
-        response: this.response,
-      });
-    }
   }
 }
 
@@ -496,7 +489,7 @@ export function defaultErrorRedactor<
   }
 
   function redactObject<T extends O['data'] | R>(obj: T | null) {
-    if (!obj) {
+    if (!obj || typeof obj !== 'object') {
       return;
     } else if (
       obj instanceof FormData ||

src/gaxios.ts

@@ -135,7 +135,7 @@
    * Perform an HTTP request with the given options.
    * @param opts Set of HTTP options that will be used for this HTTP request.
    */
   async request<T = any>(opts: GaxiosOptions = {}): GaxiosPromise<T> {
     let prepared = await this.#prepareRequest(opts);
     prepared = await this.#applyRequestInterceptors(prepared);
     return this.#applyResponseInterceptors(this._request(prepared));
@@ -177,7 +177,7 @@
    * Internal, retryable version of the `request` method.
    * @param opts Set of HTTP options that will be used for this HTTP request.
    */
   protected async _request<T = any>(
     opts: GaxiosOptionsPrepared,
   ): GaxiosPromise<T> {
     try {
@@ -229,6 +229,10 @@
         return this._request<T>(opts);
       }
 
+      if (opts.errorRedactor) {
+        opts.errorRedactor(err);
+      }
+
       throw err;
     }
   }
@@ -236,7 +240,7 @@
   private async getResponseData(
     opts: GaxiosOptionsPrepared,
     res: Response,
   ): Promise<any> {
     if (
       opts.maxContentLength &&
       res.headers.has('content-length') &&
@@ -577,7 +581,7 @@
    */
   private async getResponseDataFromContentType(
     response: Response,
   ): Promise<any> {
     let contentType = response.headers.get('Content-Type');
     if (contentType === null) {
       // Maintain existing functionality by calling text()

test/test.getch.ts

@@ -1128,6 +1128,53 @@ describe('🎏 data handling', () => {
       scope.done();
     }
   });
+
+  it('should redact after final retry', async () => {
+    const customURL = new URL(url);
+    customURL.searchParams.append('token', 'sensitive');
+    customURL.searchParams.append('client_secret', 'data');
+    customURL.searchParams.append('random', 'non-sensitive');
+
+    const data = {
+      grant_type: 'urn:ietf:params:oauth:grant-type:jwt-bearer',
+      assertion: 'somesensitivedata',
+      unrelated: 'data',
+      client_secret: 'data',
+    };
+
+    let retryAttempted = false;
+    const config: GaxiosOptions = {
+      url: customURL,
+      method: 'POST',
+      data: new URLSearchParams(data),
+      retry: true,
+      retryConfig: {
+        httpMethodsToRetry: ['POST'],
+        onRetryAttempt: err => {
+          assert.deepStrictEqual(err.config.data, new URLSearchParams(data));
+          retryAttempted = true;
+        },
+      },
+    };
+
+    const scope = nock(url)
+      .post('/', data)
+      .query(() => true)
+      .reply(500)
+      .post('/', data)
+      .query(() => true)
+      .reply(204);
+
+    const gaxios = new Gaxios();
+
+    try {
+      await gaxios.request(config);
+
+      assert(retryAttempted);
+    } finally {
+      scope.done();
+    }
+  });
 });
 
 describe('🍂 defaults & instances', () => {