modif lab3

Twidder (Lab3)/database_helper.py

@@ -38,25 +38,23 @@ def authenticate(email, password):
         return True
     except:
         return False"""
-        
+
 def addToLoggedInUsers(token, email):
     try:
         db = get_db()
         cursor = db.cursor()
-        
+
         # Check if the email already exists in the table
         cursor.execute("SELECT * FROM LOGGEDINUSERS WHERE EMAIL=?", (email,))
         result = cursor.fetchone()
-        
+
         if result is None:
-            print("First time putting user in LOGGEDINUSERS")
             # If the email is not already in the table, insert a new row
             cursor.execute("INSERT INTO LOGGEDINUSERS (TOKEN, EMAIL) VALUES (?, ?)", (token, email))
         else:
-            print("Second time putting user in LOGGEDINUSERS")
             # If the email already exists in the table, update the corresponding token
             cursor.execute("UPDATE LOGGEDINUSERS SET TOKEN=? WHERE EMAIL=?", (token, email))
-        
+
         db.commit()
         return True
     except:

Twidder (Lab3)/server.py

@@ -11,23 +11,7 @@ import re
 app = Flask(__name__, template_folder='static')
 sockets = Sock(app)
 
-        
-@sockets.route('/echo_connection')
-def echo_connection_socket(ws):
-    while True:
-        token = ws.receive()
-        email = database_helper.tokenToEmail(token)
-        if email:
-            if email in loggedIn_for_ws:
-                old_ws = loggedIn_for_ws[email]
-                old_ws.send("Disconnect")
-                old_ws.close()
-                print(email, "first connection disconnected")
-                loggedIn_for_ws[email] = ws
-            else:
-                loggedIn_for_ws[email] = ws
-        else:
-            print("email error")
+loggedIn_for_ws = {}
 
 @sockets.route("/profil_view")
 def socket_connection(ws):
@@ -37,7 +21,6 @@ def socket_connection(ws):
         if email:
             if email in loggedIn_for_ws:
                 loggedIn_for_ws[email] = ws
-                print("loggedIn_for_ws : ", loggedIn_for_ws)
             else:
                 print("ERROR : ", email, " not connected")
         else:
@@ -87,7 +70,6 @@ def sign_in():
             value = {
                 "token" : token
             }
-            print("token : ", token)
             if database_helper.addToLoggedInUsers(token, data['email']):
                 check_reconnection(data['email'])
                 return jsonify(value), 201
@@ -263,15 +245,11 @@ def check_reconnection(email):
         old_ws = loggedIn_for_ws[email]
         old_ws.send("Disconnect")
         old_ws.close()
-        print(email, "first connection disconnected")
         loggedIn_for_ws[email] = -1
     else:
         loggedIn_for_ws[email] = -1
-    
+
 
 if __name__ == '__main__':
-    # waitress.serve(app, host='0.0.0.0', port=5000, threads=4)  #http://localhost:5000
-    loggedIn_for_ws = {}
     app.debug = True
     app.run()
-

Twidder (Lab3)/static/client.js

@@ -30,12 +30,10 @@ function displayProfilView() {
   //let ws = new WebSocket('ws://' + window.location.host + '/echo_connection')
   let ws = new WebSocket('ws://' + window.location.host + '/profil_view')
   ws.onopen = function(event) {
-    console.log("WebSocket connection established !");
     ws.send(localStorage.getItem("token"));
   };
   ws.onmessage = (event) => {
   if (event.data == "Disconnect"){
-    console.log("Disconnection")
     displayWelcomeView();
     localStorage.removeItem("tab");
     localStorage.removeItem("token");
@@ -51,9 +49,6 @@ function displayProfilView() {
     document.body.style.backgroundColor = "#0F98B7";
     }
   }
-  ws.onclose = function() {
-    console.log('WebSocket disconnected');
-  };
   document.getElementById("displayprofil").innerHTML = document.getElementById("profilview").innerHTML;
   document.getElementById("displaywelcome").innerHTML = "";
   document.body.style.backgroundColor = "#fcd29f";
@@ -479,7 +474,6 @@ function display_wall(email, tab) {
   xhttp.send();
 
 
-
 }
 
 function fills_data(tab, data_user) {
@@ -490,13 +484,3 @@ function fills_data(tab, data_user) {
   document.getElementById(tab + "_city").innerHTML = "City = " + data_user.data.city;
   document.getElementById(tab + "_gender").innerHTML = "Gender = " + data_user.data.gender;
 }
-
-
-
-//---------------------------------------WEBSOCKET---------------------------------------
-
-/*let ws = new WebSocket('ws://' + window.location.host + '/echo_connection')
-
-ws.onmessage = (event) => {
-  console.log("event.data : ", event.data);
-}*/
\ No newline at end of file