almost done

Lab_3/Twidder/server.py

@@ -29,6 +29,7 @@ sock = Sock(app)
 
 app.debug = True
 session = {'token':'email'}
+signedInUser = {'email':'wsObj'}
 
 @app.route('/')
 def root():
@@ -65,31 +66,47 @@ def input_has_error(input):
 
 
 @sock.route('/myServer/api')
-def echo(ws):
+def echo(socket):
     while True:
-        if not ws:
+
+        # Making sure we have a valid socket
+        if not socket:
+            return
+
+
+        # Making sure message format is OK and store email & token in string
+        data = socket.receive()
+        try:
+            myEmail = json.loads(data)["email"]
+        except:
+            signedInUser[email].close()
+            return
+        try:
+            myToken = json.loads(data)["token"]
+        except:
+            signedInUser[email].close()
             return
-        data = ws.receive()
 
-        email = json.loads(data)["email"]
-        token = json.loads(data)["token"]
 
-        # Nonse so far:
-        # if email in session.values():
-        #     toDelete = ""
-        #     for key, value in session.items():
-        #         if value == email:
-        #             toDelete = key
-        #         print(key, value)
+        print(signedInUser)
+        # sign out if I am logged in somewhere else
+        for email in list(signedInUser.keys()):
+            if email == myEmail:
+                print("You got kicked out")
+                signedInUser[email].send(json.dumps({"action" : "signOut"}))
+                signedInUser[email].close()
+                signedInUser.pop(email)
+        print(signedInUser)
 
-        print("- - - - " + token)
-        ws.send(data)
+        # Put socket in global dict so server knows my connection is open
+        signedInUser[myEmail] = socket
+        socket.send(json.dumps({"action" : "signIn"}))
     
 
 @app.route("/myServer/sign_in", methods=['POST'])
 def sign_in():
     """Sign in user"""
-    print("shoit")
+    
     # Validate Email
     tmp = input_has_error('email')
     if tmp[0]:
@@ -179,8 +196,19 @@ def sign_out():
     if tmp[0]:
         return jsonify({}), tmp[1]
 
+    print(signedInUser)
+    # Close my socket
+    myEmail = session[token]
+    try:
+        signedInUser[myEmail].close()
+        signedInUser.pop(myEmail)
+    except:
+        pass # samma sak som ingenting
+    print(signedInUser)
+
     # set user to not logged in
     session.pop(token)
+
     return jsonify({}), 204 # "Successfully signed out")
 
 

Lab_3/Twidder/static/client.js

@@ -10,6 +10,49 @@ var socket;
 // source "/Users/lorenzo/OneDrive - Linköpings universitet/Skola/DI3B/TDDD97/virtualenv/bin/activate"
 
 
+function connectWithSocket() {
+    let token = localStorage.getItem("currentUser");
+            
+    // Changes the view to profile view and loads user info
+    document.getElementById("error").innerHTML = "You are signed in";
+    displayView();
+    setUserDetails("home");
+
+    // Establish web socket
+    socket = new WebSocket('ws://' + document.domain + ':5000/myServer/api');
+    socket.onopen = function (event) {
+        let myEmail = localStorage.getItem("homeEmail");
+
+        // Todo - ändra så att token skickas i header istället
+        this.send(JSON.stringify({token: token, email: myEmail}));
+        console.log("Nu har jag skickat");
+    }
+    socket.onmessage = function (event) {
+        let response = JSON.parse(event.data);
+
+        console.log("Nu fick jag svar"); 
+        switch (response["action"]) {
+            case "signOut":
+                console.log(response);
+                
+                // Reset token in the localStorage
+                localStorage.setItem("currentUser", "");
+                localStorage.setItem("homeEmail", "");
+                localStorage.setItem("browseEmail", "");
+
+                // Changes the view to welcome view
+                displayView();
+                document.getElementById("error").innerHTML = "Signed Out, you signed in elsewhere";
+                break;
+            case "signIn":
+                console.log(response);
+                console.log("ja är signed in");
+                break;
+        } 
+    }
+}
+
+
 // - - - - - Init Request Objects - - - - - //
 
 // Sign In Request Object
@@ -19,30 +62,9 @@ signInRequest.onreadystatechange = function() {
 
         let errorMessage = document.getElementById("error");
         if (this.status == 204) {
-            errorMessage.innerHTML = "You are signed in"; 
             let token = this.getResponseHeader("Authorization")
             localStorage.setItem("currentUser", token);
-            
-            // Changes the view to profile view and loads user info
-            displayView();
-            setUserDetails("home");
-
-            // Establish web socket
-            socket = new WebSocket('ws://' + document.domain + ':5000/myServer/api');
-            socket.onopen = function (event) {
-                let myEmail = localStorage.getItem("homeEmail");
-
-                // Todo - ändra så att token skickas i header istället
-                this.send(JSON.stringify({token: token, email: myEmail}));
-                console.log("Nu har jag skickat");
-            }
-            socket.onmessage = function (event) {
-                console.log("Nu fick jag svar");
-                console.log(event.data);    
-            };
-            console.log("ja är signed in");
-
-
+            connectWithSocket();
         }
         else if (this.status == 400) {
             errorMessage.innerHTML = "Error 400: Incorrect format"; 
@@ -66,12 +88,11 @@ signOutRequest.onreadystatechange = function() {
         if (this.status == 204) {
 
             // Reset token in the localStorage
-            // localStorage.setItem("currentUser", "");
-            // localStorage.setItem("homeEmail", "");
-            // localStorage.setItem("browseEmail", "");
+            localStorage.setItem("currentUser", "");
+            localStorage.setItem("homeEmail", "");
+            localStorage.setItem("browseEmail", "");
 
             // Changes the view to welcome view
-            
             displayView();
         }
         else if (this.status == 401) {
@@ -336,12 +357,16 @@ window.onload = function () {
 
     // All key/value pairs stored in out localStorage
     // If first time? check this:
-    if (localStorage.getItem("currentUser") == null)
-        localStorage.setItem("currentUser", "");
     if (localStorage.getItem("homeEmail") == null)
         localStorage.setItem("homeEmail", "");
     if (localStorage.getItem("browseEmail") == null)
         localStorage.setItem("browseEmail", "");
+    if (localStorage.getItem("currentUser") == null)
+        localStorage.setItem("currentUser", "");
+    
+    // Todo - problem    
+    if (localStorage.getItem("currentUser") != "")
+        connectWithSocket();
 
     // Initialize div objects (global variables)
     welcomeDiv = document.getElementById("welcomeview");
@@ -431,7 +456,6 @@ function sign_in() {
     else {
 
         // Sending sign_in request to "server"
-        
         signInRequest.open("POST", url + "sign_in", true);
         signInRequest.setRequestHeader("Content-Type", "application/json;charset=UTF-8");
         signInRequest.send(JSON.stringify({email: email,password: password}));