From cf390e9708524add4cbc42496247f09edc410bb5 Mon Sep 17 00:00:00 2001
From: MaximeOLIVA <maxime.oliva@etu.univ-cotedazur.fr>
Date: Tue, 28 Feb 2023 16:22:02 +0100
Subject: [PATCH] modif lab3
---
.../database_helper.cpython-310.pyc | Bin 4076 -> 3894 bytes
.../__pycache__/server.cpython-310.pyc | Bin 5153 -> 5582 bytes
Twidder (Lab3)/database.db | Bin 36864 -> 36864 bytes
Twidder (Lab3)/database_helper.py | 10 +++----
Twidder (Lab3)/server.py | 26 ++----------------
Twidder (Lab3)/static/client.js | 16 -----------
6 files changed, 6 insertions(+), 46 deletions(-)
diff --git a/Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc b/Twidder (Lab3)/__pycache__/database_helper.cpython-310.pyc
index 7e35810d1e1129c923a339515a845bc52bbdcae7..1e2d17a70bc4b6ffdd1d42f00a892c514cc26315 100644
GIT binary patch
delta 326
zcmaDOzfF!WpO=@5fq{YHg!I4ULxLOmA{kx7^h1kNi;DGg6Du-vQ}tc)lS^|`^Gb^K
zgUeG>QuFjfTwGi%&Go}mlLCtJ(~A;wb2IbO^+U=tQ&Lik6f}GilZ-X>H{W5*V`9r<
zU|^`yn;gKRZLd(nynrc%sfMA3F^y><6C*<&2Uvs|AyUJ%fMp>ABSSbt3QI5pBN#?9
zq_74vXtGT{#iBb|k=0^y3#*~nO4cHfql?5D7#NCpK!gMX1H<G?tiB>31`{J2BL^cN
zGY2CFlMs^t^JH_jJ4{8=leO7x7#${Ou%BV{+ic3g%*Yr$*^+ZJW7_1moYxtPCLiVc
z!&pE05cd(rj>+vj_ZTNkPUGFjIBT;i9}6Sn!pU0v>xIQQ_&9huxH)(@csV#ZI5@a?
F*a6ONQbGU#
delta 503
zcmdlc_eP#CpO=@5fq{YHnb-GZ4&jY_k&N|i$yPC;#i>QbG0FM4scA7T`N^fZsd**E
zG0yp=Ma3}z8L2tBi7~;cxv9k^MX3rF3K~9{dD-~|nR)4&F(EE4E|%sBx(eZ`NeTf)
z`RPT8xw)Bn=`rD{Nyyxg^30T!)FK59pTs0%&6t$LlEkFM;?($z&D$7LnAoZq7#OO|
zCM&RL`>T|&q%buzGBVUKFJMYxu3@NQOk-Ne#K@4xQ^JzM0+(S$$kZ?`U|q<-$Pmtu
z!WPWH2!@diDeS=vnjDk6SadZt+%k)bOB6~nb5j)xN=r&I^U@Vci&KjfGV>IC{N3GM
zT|E6lgI$AyCvRi1)Y1%2P0r6tAx8N-79&|rwjxlN7Kt-3Fck5C2nhxThFh!!MVWae
zlg(ItC1e;F7?>E@7&#dEm^m0Zm^c`Pm^hdOm?lqWy~C(ES&>zGawVGuqtoO~Y-bn)
zHrKN=Gcv|bZsyp`m@%23OLVdi=OM<D$^2Y@7#k<^a35jpntYM_9^<6R8+i6H&e@#L
h%fiUGcybBfdSM9;J`P?EZVny}UJgzU4h}9Jb^ws4j6VPX
diff --git a/Twidder (Lab3)/__pycache__/server.cpython-310.pyc b/Twidder (Lab3)/__pycache__/server.cpython-310.pyc
index 1489a928a291509ee805a1a5ed1b5981a0319a4d..f35c5f24951f019c99a46b894fc4bb3d7b7ab1de 100644
GIT binary patch
delta 2943
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
C^OWQO
delta 2605
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
diff --git a/Twidder (Lab3)/database.db b/Twidder (Lab3)/database.db
index bd4569e38b3cb72f36be9709fc76c9f269776383..63da7616e3c379258cbc9721301d94f66fc4e410 100644
GIT binary patch
delta 262
zcmZozz|^pSX@az%0RsaACj$cm3j+fK69WT-{6rmNMuUwBOZeFs`FAq#@7%0tu%2Jr
zl95AFR8(G4Q!+QPA~QF&B(=CCH!&wQCo?ZQzaTR&y|_FzB{dHuJo$;d0vjX$BL@CQ
zn-vXi@N)<<YjT1mUg_&{vN13)ure?(aBNmIxX(ZNKR+uQBmZ6o{=J(O4L0-Znldtn
zYI>NNxP@c~SD2Ri8|NCk80RFFghqO2xa8+X7UdQv8~FL8ctQ;Hm%?FFyc8P){}%@S
hXJBg>`6fDwO>*GatYmPHf8qqGNdjz}*&2TF0|4>KO^E;i
literal 36864
zcmWFz^vNtqRY=P(%1ta$FlG>7U}WTRP*7lCVB%n4VBln6U|?ZjU|?ckV335e8K8g>
zO5>rJI2iQ8y?A-nFtBk4Fz`h2h4UZeE#?#94#1;nRBAK?MnhmU1V%$(Gz3ONU^E0q
zLtr!nhD-=Fv2(MF%gQn~Czd28<)r$$1_wL3y9UE(4(A|O#}HSA5Jx8;R|S};2A6_D
zW{QHRUx=%_Ymg3?f`Y5Bqo+@NkgKz2fTycph(efSkh6zlkcP2=rh<Z>e~5x#sE?11
zg08M}YEEgULSbp9LQ(4B<@uQ<3OT6?xv9m)iRr0ubAny{TwH^28G>R;YF=4>W-8c_
z#LOHn1(+KZLR=$4kgVoXPzVU}^mPo1RPc6<)W}Rxa10Ic_w;iPa`kof3(@4#3}9mu
z*Vbl?1cyU$VNPaAYJ72OVQFe!aw-~^9VJxIBsKC9b5nJSQwufu{27i9nS_Abp^b8!
z?BeR`jE&Xcpz-l{cXxI1^a~Ak4GKo#u%ZMDiWDftg!p^A`oSaB1e7uqP-6(3ir^~1
zX$MUOQXDF1fRyKGa%oy}v5EVtGcsi6rKDCsV<WM&Bp=L=M{!5IAqtm`{|y7E+sM$A
z&dx3_F3#Ah3-%+}Z(xE6#ZO=%kY5zsJcEKm;{6<bU19E3&@eL9Q~&{ZdgoG5P;hhf
z_4J7(Mx{F>)x*rwFoT!|G7*u5Kt?)yhD0jBl^H<;5{o+jP`{8MqLhMy(g$HCEa)-K
z3~&q%4)+goL8!%TKSpHvXmV+4a<GZpisOnbZ~(^}f+=PO21w)}Crw@k1_ow+R|fuF
z{LTEX$TFks(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc2c4S~@R7!3iG5U^q95EqqH
zl+>2=D$U7Eb<fYpOH0j7%t`gh%*#H!tspZmJ-9qIB{eS#B<+x%o0yrSmz<xQSe05-
zQfbP>AucH@Dyb>ye0WQ4s#|_hNoF2ccV&K_TTx<Oa%ysZZYsJq3q}q}QBiqGb;;bs
zip<>9lGNf7kglA}yzG3CmBnBya}z5NIt`7CO-#*@-OdH>|L<YozreqT|1q-6D0?&n
zMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU@(M$Ftauz+K2+P5VIyD>SzIz
z0JAzL$|wL9w}aO5gVy?k7H^<qEXqfPMnhmU1V%$(Gz3ONU^E0qLtr!nMnhmU1V%$(
zGz3ONU^E1VQV4+7|1<D^Vc_4(ziKGCd(^F?Aut*OqaiRF0;3@?8UmvsFd71*Aut*O
zqaiRF0;3@?Y(v0YGut(%ILpApKi|dNFbU*ObIpjL((>@o(Bx91Fn6zD4<C!Him>bq
zkDS2VsPbTwob)L3yb{zE0U&)a3|jvW?*Bg;UHuOWlTms!1V%$(Gz3ONU^E0qLtr!n
zMnhmU1V%$(Gz3ONU^E1VKnMuuCRP~1_xyt#EQGuN51RjH<bTG%{|uyX6px0$Xb6mk
zz-S1JhQMeDjE2By2#kinXb6mkz-S1JhQMeD4BZgmVPuwNgxxk`i0ltg|KE^fJ_G-G
z{#E>~{IUEN{QP{+`3~^S<}2e1<kR9~<9*1xhj%(}F|Qx5CNC?`L!P}nGkMB*f_U_J
zIJqBk@8zD!UBd0pt<BBG^@wXf*DS6It{^T^&bORLIHz)EbJ}xCaD3o6!7(4%)=~Co
z2#kinXb6mkz-S1JhQMeD;0ytELskY&O-a=G3shc8aanPCl9~ZXp*X4(D$gUeQbAEo
zpOrydQxxskBvgeVsl_F#dLZ*eQ6*4$AZ1#*Ame258W)+b06rF4Lx+_?Qya}MXgZzq
zOOx|Ub+uU;w6zt{<j}az>Z!#g3c2~2T<TgNx1t%0>ek47kV-X8Rt9xV(0S4D>7iUq
zb%_<$8XyB5QKe9MPWgFR`K3h)S*Z%S>WKvfsW~~R3gGjrRn%D-)YZjNPMkvFq!y(X
zr7Ea_RPm!opl}kERY595Q3O#qpaZWJRX~aaQN&R=si{iJASIwlF@&ell%y&vfz;r!
z3*=@cMUWx_1}T8l;4>&SHC0)jfFh93l;l8)@Yt4=Riq?KSdE$tNR2d#k5M>DkeF1K
z2C2j2a<HSMK#K4<DlIKdNs@q?l(aNO36L5*(Uy{?Bo0!7&#LrvB{4#3($bVf38+a<
zNmddepav9a!XPzx!UvQ@l!b^;q$CJZgvVzoDQU_AAT@YwD@iR$Rpuw4C^faHNSTk2
zqN3CyC0>vsJWfhYO;zOqsX;9~P!du~8VD+LgOuTMIXIlSh*88zNKr{@i7E$35gu2i
zrxd59q^Yrklo8Ga>TDo&vMByS;Xrc>moh6zAs%mnvWprEND*OMm6<{6@EDd_lA5Z_
zL_iV9MrB4K6d~8Pp#DEIe+>iwDgK50HOMlf?9mVy4S~@R7!85Z5Eu=C(GVC7fzc2c
z4S~@R7!85Z5Eu;sYJ`At6lj=L5OrV`l^2<>9tlz;nVVRYj2OQ}RRkF{)`$QNMN6WM
P5~JxWOfF1GMs_;@zdS>>
diff --git a/Twidder (Lab3)/database_helper.py b/Twidder (Lab3)/database_helper.py
index 877fefc..76a3cf7 100644
--- a/Twidder (Lab3)/database_helper.py
+++ b/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:
diff --git a/Twidder (Lab3)/server.py b/Twidder (Lab3)/server.py
index e3056fa..4a46b7f 100644
--- a/Twidder (Lab3)/server.py
+++ b/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()
-
diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js
index b4e5786..a997292 100644
--- a/Twidder (Lab3)/static/client.js
+++ b/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
--
GitLab