Merge pull request #462 from sasjs/json-fix

fix: invalid json checking

src/request/RequestClient.ts

@@ -429,8 +429,8 @@ export class RequestClient implements HttpClient {
           throw new Error('Valid JSON could not be extracted from response.')
         }
 
-        isValidJson(weboutResponse)
-        parsedResponse = JSON.parse(weboutResponse)
+        const jsonResponse = isValidJson(weboutResponse)
+        parsedResponse = jsonResponse
       } catch {
         parsedResponse = response.data
       }

src/test/utils/isValidJson.spec.ts

@@ -0,0 +1,31 @@
+import { isValidJson } from '../../utils'
+
+describe('jsonValidator', () => {
+  it('should not throw an error with an valid json', () => {
+    const json = {
+      test: 'test'
+    }
+
+    expect(isValidJson(json)).toBe(json)
+  })
+
+  it('should not throw an error with an valid json string', () => {
+    const json = {
+      test: 'test'
+    }
+
+    expect(isValidJson(JSON.stringify(json))).toStrictEqual(json)
+  })
+
+  it('should throw an error with an invalid json', () => {
+    const json = `{\"test\":\"test\"\"test2\":\"test\"}`
+
+    expect(() => {
+      try {
+        isValidJson(json)
+      } catch (err) {
+        throw new Error()
+      }
+    }).toThrowError
+  })
+})

src/utils/isValidJson.ts

@@ -2,9 +2,11 @@
  * Checks if string is in valid JSON format else throw error.
  * @param str - string to check.
  */
-export const isValidJson = (str: string) => {
+export const isValidJson = (str: string | object) => {
   try {
-    JSON.parse(str)
+    if (typeof str === 'object') return str
+
+    return JSON.parse(str)
   } catch (e) {
     throw new Error('Invalid JSON response.')
   }