From dca56831afc1be9ae0590ffcc76625bc3ba2dc67 Mon Sep 17 00:00:00 2001 From: James Collins Date: Sun, 5 Mar 2023 16:58:34 +1000 Subject: [PATCH] return empty body correctly --- resources/js/helpers/api.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/js/helpers/api.ts b/resources/js/helpers/api.ts index 36d5edd..cafc0f7 100644 --- a/resources/js/helpers/api.ts +++ b/resources/js/helpers/api.ts @@ -164,7 +164,7 @@ export const api = { fetch(url, fetchOptions) .then(async (response) => { let data: string | object = ""; - if (fetchOptions.method.toLowerCase() != "delete") { + if (response.headers.get("content-length") !== "0") { if ( response && response.headers.get("content-type") == null @@ -174,9 +174,13 @@ export const api = { ? await response.json() : {}; } catch (error) { - data = response.text - ? await response.text() - : ""; + try { + data = response.text + ? await response.text() + : ""; + } catch (error) { + data = ""; + } } } else { data =