fix(frontend): allow not using passwords

ravenclaw900 · Nov 20, 2021 · 1607ece · 1607ece
1 parent 6eff076
commit 1607ece
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/backend/src/sockets.rs b/src/backend/src/sockets.rs
@@ -281,6 +281,7 @@ async fn browser_handler(
     }
 }
 
+#[allow(clippy::too_many_lines)]
 pub async fn socket_handler(socket: warp::ws::WebSocket) {
     let (mut socket_send, mut socket_recv) = socket.split();
     let (data_send, mut data_recv) = mpsc::channel(1);

diff --git a/src/frontend/src/App.svelte b/src/frontend/src/App.svelte
@@ -105,12 +105,16 @@
             update = socketData.update;
             login = socketData.login;
             // Get token
-            if (localStorage.getItem("token") != null) {
-                token = localStorage.getItem("token");
-                pollServer(window.location.pathname);
+            if (login) {
+                if (localStorage.getItem("token") != null) {
+                    token = localStorage.getItem("token");
+                    pollServer(window.location.pathname);
+                } else {
+                    // Or login
+                    loginDialog = true;
+                }
             } else {
-                // Or login
-                loginDialog = true;
+                pollServer(window.location.pathname);
             }
         }
         if (socketData.error == true) {
@@ -151,7 +155,7 @@
                 token,
             });
         } else {
-            JSON.stringify({
+            json = JSON.stringify({
                 page,
             });
         }
@@ -168,7 +172,6 @@
     }
 
     function getToken() {
-        console.log("Getting token...");
         const options = {
             method: "POST",
             body: password,