Merge pull request #805 from MuckRock/allanlasser/issue803

Catch JSON errors in API error response
MuckRock · Nov 1, 2024 · 07c2f49 · 07c2f49
2 parents 31201b4 + d4ed3f7
commit 07c2f49
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/lib/utils/api.ts b/src/lib/utils/api.ts
@@ -40,11 +40,22 @@ export async function getApiResponse<T, E = unknown>(
   }
 
   if (isErrorCode(resp.status)) {
-    response.error = {
-      status: resp.status,
-      message: resp.statusText,
-      errors: resp.json ? await resp.json() : null,
-    };
+    try {
+      response.error = {
+        status: resp.status,
+        message: resp.statusText,
+        errors: resp.json ? await resp.json() : null,
+      };
+    } catch (error) {
+      console.error(error);
+      // if we fail parsing the error's JSON,
+      // just return the status
+      response.error = {
+        status: resp.status,
+        message: resp.statusText,
+        errors: null,
+      };
+    }
 
     return response;
   }