fix: fetch r.ok

ThatConference · Oct 12, 2023 · eeec82a · eeec82a
1 parent a2d9e79
commit eeec82a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "thatconference.com",
-	"version": "5.0.10",
+	"version": "5.0.11",
 	"description": "THATConference.com website",
 	"main": "index.js",
 	"type": "module",

diff --git a/src/lib/gfetch.js b/src/lib/gfetch.js
@@ -17,7 +17,18 @@ function init(fetch) {
 		// 'that-correlation-id': createCorrelationId()
 	};
 
-	const json = (r) => r.json();
+	const handleResult = (r) => {
+		if (browser) {
+			loading.set(false);
+		}
+
+		if (r.ok) {
+			return r.json();
+		} else {
+			Sentry.captureException(`${r.status} ${r.statusText}`);
+			throw new Error('API returned');
+		}
+	};
 
 	function updateHeaders(values) {
 		headers = {
@@ -55,11 +66,7 @@ function init(fetch) {
 			retries: 3,
 			retryOn
 		})
-			.then(json)
-			.then((r) => {
-				if (browser) loading.set(false);
-				return r;
-			})
+			.then(handleResult)
 			.catch((error) => {
 				console.error('api query error:', error);
 				Sentry.captureException(error);
@@ -87,11 +94,7 @@ function init(fetch) {
 			}),
 			retryOn
 		})
-			.then(json)
-			.then((r) => {
-				if (browser) loading.set(false);
-				return r;
-			})
+			.then(handleResult)
 			.catch((error) => {
 				console.error('api secure query error:', error);
 				Sentry.captureException(error);
@@ -119,11 +122,7 @@ function init(fetch) {
 			}),
 			retryOn
 		})
-			.then(json)
-			.then((r) => {
-				if (browser) loading.set(false);
-				return r;
-			})
+			.then(handleResult)
 			.catch((error) => {
 				console.error('api mutation error:', error);
 				Sentry.captureException(error);