Patch unnecessary error handling from legacy code that no longer does…

… anything
malee31 · Jan 8, 2025 · 73f4974 · 73f4974
1 parent 21ee1af
commit 73f4974
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 22 deletions.
diff --git a/components/parts/utils/serverClient.js b/components/parts/utils/serverClient.js
@@ -16,7 +16,8 @@ const STORAGE_KEYS = {
 async function _fetchRetry(url, options = {}, retries = 3) {
 	let response = {
 		ok: false,
-		code: "fetch_failed"
+		status: -1,
+		error: "fetch_failed"
 	};
 
 	for(let attempt = 0; attempt < retries; attempt++) {

diff --git a/components/parts/utils/serverClientWrapper.js b/components/parts/utils/serverClientWrapper.js
@@ -4,7 +4,6 @@
 import client from "./serverClient";
 import config from "../../../config.json";
 
-const SERVER_URL = config.serverURL;
 const endpoints = config.serverEndpointBaseURLs;
 
 export async function getStatus() {
@@ -17,16 +16,10 @@ export async function getStatus() {
 		}
 	};
 
-	let res;
-	try {
-		res = await client.request("GET", endpoints.getUserStatus);
-	} catch(err) {
-		result.messages.push(`Unable to fetch status. Are you connected to the internet?`);
-		return result;
-	}
+	const res = await client.request("GET", endpoints.getUserStatus);
 
 	if(!res.ok) {
-		result.messages.push(`Server behaved unexpectedly during exchange and gave this error: [${res.status}] ${res.statusText}`);
+		result.messages.push(`Server behaved unexpectedly during exchange and gave this error: [${res.status}] ${res.error}`);
 		return result;
 	}
 
@@ -61,18 +54,7 @@ async function signInOut(signInMode) {
 	});
 
 	if(!res.ok) {
-		result.messages.push(`Unable to fetch status. Are you connected to the internet?`);
-		return result;
-	}
-
-	if(res.status === 400) {
-		result.ok = true;
-		result.messages.push(await res.text());
-		return result;
-	}
-
-	if(!res.ok) {
-		result.messages.push(`Unable to sign ${signIn ? "in" : "out"}: [${res.status}] ${res.statusText}`);
+		result.messages.push(`Unable to get status of sign in/out: [${res.status}] ${res.error}`);
 		return result;
 	}