kompletterat lab 3

lab3/twidder/server.py

@@ -294,18 +294,22 @@ def web_socket():
         ws = request.environ["wsgi.websocket"]
         obj = ws.receive()
         data = json.loads(obj)
-        try:
-            active_sockets[data["email"]] = ws
-            while True:
-                obj = ws.receive()
-                if obj is None:
-                    active_sockets.pop(data["email"], None)
-                    ws.close()
-                    return ""
-
-        except WebSocketError as e:
-            active_sockets.pop(data["email"], None)
+        token = data["token"]
+        current_user = get_user_by_token(token)
+        if current_user:
+            email = current_user[0]
+            try:
+                active_sockets[email] = ws
+                while True:
+                    obj = ws.receive()
+                    if obj is None:
+                        active_sockets.pop(email, None)
+                        ws.close()
+                        return ""
 
+            except WebSocketError as e:
+                active_sockets.pop(email, None)
+        
     return ""
 
 

lab3/twidder/static/client.js

@@ -383,8 +383,8 @@ function connectWebSocket() {
 
   ws.onopen = function () {
     console.log("Ws opened");
-    let email = localStorage.getItem("email");
-    let userData = { "email": email};
+    let token = localStorage.getItem("token");
+    let userData = { "token": token};
     console.log("user data" + JSON.stringify(userData));
     ws.send(JSON.stringify(userData));
   };