feat: Redact After Retry Attempts (#689)

Author: d-goog

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,
-      });
-    }
   }
 }
 
@@ -476,7 +469,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

@@ -229,6 +229,10 @@ export class Gaxios implements FetchCompliance {
         return this._request<T>(opts);
       }
 
+      if (opts.errorRedactor) {
+        opts.errorRedactor(err);
+      }
+
       throw err;
     }
   }

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', () => {