update responseFormatter to handle JSON.parse errors

putdotio · May 17, 2023 · 7922357 · 7922357
1 parent 9341fd6
commit 7922357
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 22 deletions.
diff --git a/src/interceptors/response/responseFormatter.spec.ts b/src/interceptors/response/responseFormatter.spec.ts
@@ -1,6 +1,7 @@
 import {
   mockPutioAPIClientError,
   mockPutioAPIClientResponse,
+  createMockXMLHttpRequest,
 } from '../../test-utils/mocks'
 import { IPutioAPIClientError } from '../../client/types'
 import { DEFAULT_CLIENT_OPTIONS } from '../../constants'
@@ -104,23 +105,6 @@ describe('interceptors/response/responseFormatter', () => {
     })
 
     it('sets error.data property corrrectly when the request doesnt have response object, but has a request object that is a valid XMLHttpRequest', () => {
-      function createMockXMLHttpRequest(
-        readyState: number,
-        status: number,
-        responseText: string,
-      ) {
-        const xhr = new XMLHttpRequest()
-        return new Proxy(xhr, {
-          get(target, prop) {
-            if (prop === 'readyState') return readyState
-            if (prop === 'status') return status
-            if (prop === 'responseText') return responseText
-            // @ts-ignore
-            return target[prop]
-          },
-        })
-      }
-
       const error: IPutioAPIClientError = {
         ...mockPutioAPIClientError,
         response: undefined,
@@ -143,6 +127,28 @@ describe('interceptors/response/responseFormatter', () => {
         `),
       )
     })
+
+    it('sets error.data property corrrectly when the request doesnt have response object, but has a request object that is a valid XMLHttpRequest', () => {
+      const error: IPutioAPIClientError = {
+        ...mockPutioAPIClientError,
+        response: undefined,
+        request: createMockXMLHttpRequest(
+          4,
+          500,
+          'no meaningful response body',
+        ),
+      }
+
+      responseFormatter.onRejected(error).catch(e =>
+        expect(e).toMatchInlineSnapshot(`
+          Object {
+            "error_message": "MOCK_MESSAGE",
+            "error_type": "MOCK_ERROR",
+            "status_code": 0,
+          }
+        `),
+      )
+    })
   })
 
   describe('royally fucked up cases', () => {

diff --git a/src/interceptors/response/responseFormatter.ts b/src/interceptors/response/responseFormatter.ts
@@ -41,12 +41,17 @@ export const createResponseFormatter: PutioAPIClientResponseInterceptorFactory =
       error.request.readyState === 4
     ) {
       const { status, responseText } = error.request
-      const data = JSON.parse(responseText)
 
-      errorData = {
-        ...errorData,
-        ...data,
-        status_code: status,
+      try {
+        const data = JSON.parse(responseText)
+
+        errorData = {
+          ...errorData,
+          ...data,
+          status_code: status,
+        }
+      } catch (parseError) {
+        return Promise.reject(error)
       }
     }
 

diff --git a/src/test-utils/mocks.ts b/src/test-utils/mocks.ts
@@ -64,3 +64,20 @@ export const createMockErrorResponse = (
     return this.data
   },
 })
+
+export function createMockXMLHttpRequest(
+  readyState: number,
+  status: number,
+  responseText: string,
+) {
+  const xhr = new XMLHttpRequest()
+  return new Proxy(xhr, {
+    get(target, prop) {
+      if (prop === 'readyState') return readyState
+      if (prop === 'status') return status
+      if (prop === 'responseText') return responseText
+      // @ts-ignore
+      return target[prop]
+    },
+  })
+}