From 0349225edefbb391fdd7be8b8e791aae8956f432 Mon Sep 17 00:00:00 2001
From: James Collins <james.collins@outlook.com.au>
Date: Mon, 20 Feb 2023 13:37:36 +1000
Subject: [PATCH] handle when response is not json

---
 resources/js/helpers/api.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/resources/js/helpers/api.ts b/resources/js/helpers/api.ts
index 680782c..1f6a9dc 100644
--- a/resources/js/helpers/api.ts
+++ b/resources/js/helpers/api.ts
@@ -79,12 +79,6 @@ export const api = {
 
                         if (!response.body) {
                             return response;
-                            // return {
-                            //     status: 0,
-                            //     message:
-                            //         "ReadableStream not yet supported in this browser.",
-                            //     data: null,
-                            // };
                         }
 
                         let contentLength =
@@ -138,7 +132,12 @@ export const api = {
                     return response;
                 })
                 .then(async (response) => {
-                    const data = response.json ? await response.json() : {};
+                    let data: string | object = "";
+                    if (response.headers.get("content-type") == null) {
+                        data = response.text ? await response.text() : "";
+                    } else {
+                        data = response.json ? await response.json() : {};
+                    }
                     const result = {
                         status: response.status,
                         statusText: response.statusText,
@@ -154,7 +153,6 @@ export const api = {
                     resolve(result);
                 })
                 .catch((error) => {
-                    console.log(error);
                     // Handle any errors thrown during the fetch process
                     const { response, ...rest } = error;
                     reject({