Try catch

aunefyren · Nov 23, 2023 · fb1f91c · fb1f91c
1 parent 8229e7a
commit fb1f91c
Showing 1 changed file with 27 additions and 32 deletions.
diff --git a/web/js/functions.js b/web/js/functions.js
@@ -76,42 +76,37 @@ function get_login(cookie) {
         if (this.readyState == 4) {
 
             var result;
-            if(result = JSON.parse(this.responseText)) { 
-                // If the error is to verify, allow loading page anyways
-                if(result.error === "You must verify your account.") {
-
-                    // If not front-page, redirect
-                    if(window.location.pathname !== "/verify") {
-                        location.href = '/verify';
-                        return;
-                    }
-
-                    // Load page
-                    load_page(this.responseText)
-
-                } else if (result.error) {
-
-                    error(result.error)
-                    showLoggedInMenu();
+            try {
+                result = JSON.parse(this.responseText)
+            } catch(e) {
+                console.log("Failed to parse JSON. Error: " + e)
+                load_page(false);
+            }
+
+            // If the error is to verify, allow loading page anyways
+            if(result.error === "You must verify your account.") {
+                // If not front-page, redirect
+                if(window.location.pathname !== "/verify") {
+                    location.href = '/verify';
                     return;
-
-                } else {
-
-                    // If new token, save it
-                    if(result.token != null && result.token != "") {
-                        // store jwt to cookie
-                        console.log("Refreshed login token.")
-                        set_cookie("poenskelisten", result.token, 7);
-                    }
-
-                    // Load page
-                    load_page(this.responseText)
-
                 }
+                // Load page
+                load_page(this.responseText)
+            } else if (result.error) {
+                error(result.error)
+                showLoggedInMenu();
+                return;
             } else {
-                load_page(false);
-            }
+                // If new token, save it
+                if(result.token != null && result.token != "") {
+                    // store jwt to cookie
+                    console.log("Refreshed login token.")
+                    set_cookie("poenskelisten", result.token, 7);
+                }
 
+                // Load page
+                load_page(this.responseText)
+            }
         }
     };
     xhttp.withCredentials = true;