From 7bee4f6519b519b261045b2d6805e7eb8d814765 Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Sat, 3 Aug 2024 23:51:09 +0200
Subject: [PATCH] Websocket :     - Connect with token : good     - Connect
 with mail/pass : good but wait for front     - Open private msg : good but it
 cant send message     - fixed some bug on printDebug on class User on
 wsServer

---
 site/module_livechat/note,txt                 |  68 ------------
 site/module_livechat/server/Class/User.py     | 102 ++++++++++++------
 .../Class/__pycache__/User.cpython-312.pyc    | Bin 4414 -> 0 bytes
 site/module_livechat/server/main.py           |  27 +++--
 .../getPrivateListUser.cpython-312.pyc        | Bin 1210 -> 0 bytes
 .../__pycache__/login.cpython-312.pyc         | Bin 3871 -> 0 bytes
 .../typeRequets/getPrivateListMessage.py      |  69 ++++++++++++
 .../server/typeRequets/getPrivateListUser.py  |  24 +++--
 .../server/typeRequets/login.py               |  59 +++++-----
 site/module_livechat/site/main.js             |  66 +++---------
 .../site/typeResponse/typeLogin.js            |  11 +-
 .../typeResponse/typePrivateListMessage.js    |  36 +++++++
 site/module_livechat/site/websocket.js        |  12 ++-
 13 files changed, 270 insertions(+), 204 deletions(-)
 delete mode 100644 site/module_livechat/note,txt
 delete mode 100644 site/module_livechat/server/Class/__pycache__/User.cpython-312.pyc
 delete mode 100644 site/module_livechat/server/typeRequets/__pycache__/getPrivateListUser.cpython-312.pyc
 delete mode 100644 site/module_livechat/server/typeRequets/__pycache__/login.cpython-312.pyc
 create mode 100644 site/module_livechat/server/typeRequets/getPrivateListMessage.py
 create mode 100644 site/module_livechat/site/typeResponse/typePrivateListMessage.js

diff --git a/site/module_livechat/note,txt b/site/module_livechat/note,txt
deleted file mode 100644
index 515155f..0000000
--- a/site/module_livechat/note,txt
+++ /dev/null
@@ -1,68 +0,0 @@
-# async def sendData(websocket):
-# 	while True:
-# 		try:
-# 			await websocket.send(json.dumps({"message": "Hello client"}))
-# 		except websockets.exceptions.ConnectionClosed as e:
-# 			connected_clients.remove(websocket)
-# 			print("Client disconnected with error :", e)
-# 			break
-# 		await asyncio.sleep(1)
-
-# async def receiveData(websocket):
-# 	try :
-# 		async for message in websocket:
-# 			print(f"Message reçu : {message}")
-# 	except websockets.exceptions.ConnectionClosed as e:
-# 		print("Client disconnected with error :", e)
-
-# def verifyToken(websocket):
-# 	try:
-# 		token = websocket.request_headers["Sec-WebSocket-Protocol"]
-# 		print(f"Token reçu : {token}")
-# 		if token == validTokens:
-# 			return True
-# 		else:
-# 			return False
-# 	except KeyError as e:
-# 		print(f"Error: {e}")
-# 		return False
-
-# async def handler(websocket, path):
-# 	print("client connected")
-# 	connected_clients.add(websocket)
-# 	websocket.request_headers["Sec-WebSocket-Protocol"] = "123456"
-# 	await websocket.send("Connection established")
-
-# 	# try:
-# 	# if path != "/":
-# 	# 	print("client disconnected")
-# 	# 	await websocket.send(json.dumps({"error": "Invalid path", "code": 9010}))
-# 	# 	await websocket.close()
-# 	# 	return
-# 	# if verifyToken(websocket) == False:
-# 	# 	print("client disconnected")
-# 	# 	await websocket.send(json.dumps({"error": "Invalid token", "code": 9000}))
-# 	# 	await websocket.close()
-# 	# 	return
-	
-# 	# send_task = asyncio.create_task(sendData(websocket))
-# 	# receive_task = asyncio.create_task(receiveData(websocket))
-# 	# await asyncio.gather(receive_task, send_task) 
-# 	# # except websockets.exceptions.ConnectionClosed as e:
-# 	# 	# print("Client disconnected with error :", e)
-# 	# 	# connected_clients.remove(websocket)
-# 	# # 	return
-# 	# # finally:
-# 	# # 	connected_clients.remove(websocket)
-# 	# # 	websocket.close()
-
-
-
-# try:
-# 	start_server = websockets.serve(handler, "localhost", 8000, reuse_address=True)
-# except OSError as e:
-# 	print(f"Error: {e}")
-# 	exit(1)
-# asyncio.get_event_loop().run_until_complete(start_server)
-# print("Server started")
-# asyncio.get_event_loop().run_forever()
\ No newline at end of file
diff --git a/site/module_livechat/server/Class/User.py b/site/module_livechat/server/Class/User.py
index 1d1f304..7088b66 100644
--- a/site/module_livechat/server/Class/User.py
+++ b/site/module_livechat/server/Class/User.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/03 15:54:14 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/03 17:17:39 by edbernar         ###   ########.fr        #
+#    Updated: 2024/08/03 23:30:42 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -15,7 +15,7 @@ import asyncio
 import json
 
 
-class User(websockets.WebSocketServerProtocol):
+class User():
 	debugMode = True
 	websocket = None
 	username = ""
@@ -24,56 +24,92 @@ class User(websockets.WebSocketServerProtocol):
 
 	def __init__(self, websocket):
 		if (self.debugMode):
-			print("\033[0;34m|------ New user Connected ------|\033[0;0m")
+			print("\033[42m|------ New user Connected ------|\033[1;0m")
 		self.websocket = websocket
 
 	def __del__(self):
 		if (self.debugMode):
-			print("\033[0;31m|------ User disconnected ------|\033[0;0m")
+			print("\033[43m|------ User disconnected -------|\033[1;0m")
+			print("User          :", self.username)
+			print("Id            :", self.id)
+
+	async def	sendError(self, message, code, error=None):
+		try:
+			jsonVar = {"type": "error", "content": message, "code": code}
+			self.printDebug(jsonVar, 2, error)
+			await self.websocket.send(json.dumps(jsonVar))
+		except:
+			if (self.debugMode):
+				print("\033[0;31m|------ Error in sendError ------|\033[0;0m")
 
-	async def	sendError(self, message, code):
-		jsonVar = {"type": "error", "content": message, "code": code}
-		self.printDebug( jsonVar, 2)
-		await self.websocket.send(json.dumps(jsonVar))
 
 	async def	send(self, content):
-		self.printDebug(content, 1)
-		if (type(content) == dict):
-			await self.websocket.send(json.dumps(content))
-		else:
-			await self.websocket.send(content)
+		try:
+			if (type(content) == dict):
+				self.printDebug(content, 1)
+				await self.websocket.send(json.dumps(content))
+			else:
+				self.printDebug(json.loads(content), 1)
+				await self.websocket.send(content)
+		except Exception as e:
+			if (self.debugMode):
+				print("\033[0;31m|--------- Error in send --------|\033[0;0m")
+				print("Error message :", e)
 
 	async def	verifyToken(self, token):
-		if (self.token != token or self.token == ""):
-			await self.sendError("Invalid token", 9001)
-			return False
-		return True
-	
-	def printDebug(self, infoUser, request, typeRequest):
 		try:
+			if (self.token != token or self.token == ""):
+				await self.sendError("Invalid token", 9001)
+				return False
+			return True
+		except:
+			if (self.debugMode):
+				print("\033[0;31m|----- Error in verifyToken -----|\033[0;0m")
+	
+	def printDebug(self, request, typeRequest, error=None):
+		try:				
 			if (self.debugMode and typeRequest == 0):
 				print("\033[0;34m|----- New received request -----|\033[0;0m")
-				print("User          :", infoUser.username)
-				print("Token         :", infoUser.token)
-				print("Id            :", infoUser.id)
-				print("Var type      :", type(request["type"]))
-				print("Type          :", request["type"])
-				print("Content       :", request["content"])
+				print("User          :", self.username)
+				print("Token         :", self.token)
+				print("Id            :", self.id)
+				try:
+					print("Var type      :", type(request["type"]))
+					print("Type          :", request["type"])
+				except:
+					pass
+				try:
+					print("Content type  :", type(request["content"]))
+				except:
+					pass
 			elif (self.debugMode and typeRequest == 1):
 				print("\033[0;32m|------- New sent request -------|\033[0;0m")
-				print("To            :", infoUser.username)
-				print("Var type      :", type(request["type"]))
-				print("Type          :", request["type"])
-				print("Content       :", request["content"])
+				print("To            :", self.username)
+				print("Id            :", self.id)
+				try:
+					print("Var type      :", type(request["type"]))
+					print("Type          :", request["type"])
+				except:
+					pass
+				try:
+					print("Content       :", request["content"])
+				except:
+					pass
+				if ("type" not in request or "content" not in request):
+					print("Warning       : not usual json format")
 			elif (self.debugMode and typeRequest == 2):
 				print("\033[0;31m|------------- Error ------------|\033[0;0m")
-				print("User          :", infoUser.username)
-				print("Token         :", infoUser.token)
-				print("Id            :", infoUser.id)
+				print("User          :", self.username)
+				print("Token         :", self.token)
+				print("Id            :", self.id)
 				print("Error message :", request["content"])
 				print("Error code    :", request["code"])
+				if (error != None):
+					print("Error python  :", error)
+					print("File          :", error.__traceback__.tb_frame.f_globals["__file__"])
+					print("Line          :", error.__traceback__.tb_lineno)
 		except:
-			print("\033[0;31m|------- Error in printDebug -----|\033[0;0m")
+			print("\033[0;31m|------ Error in printDebug -----|\033[0;0m")
 	
 	async def	close(self):
 		try:
diff --git a/site/module_livechat/server/Class/__pycache__/User.cpython-312.pyc b/site/module_livechat/server/Class/__pycache__/User.cpython-312.pyc
deleted file mode 100644
index cc4478a0b8706326dba147d687044875c3f6144e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4414
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
QBkSJCiZ}9Cf*9ZBpL)z?xc~qF

diff --git a/site/module_livechat/server/main.py b/site/module_livechat/server/main.py
index ec56d44..ac1ef4e 100644
--- a/site/module_livechat/server/main.py
+++ b/site/module_livechat/server/main.py
@@ -6,10 +6,11 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/03 08:10:40 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/03 17:20:07 by edbernar         ###   ########.fr        #
+#    Updated: 2024/08/03 23:13:58 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
+from typeRequets.getPrivateListMessage import getPrivateListMessage
 from typeRequets.getPrivateListUser import getPrivateListUser
 from typeRequets.login import login
 from Class.User import User
@@ -17,10 +18,15 @@ import websockets
 import asyncio
 import json
 
-connected_clients = set()
+# Todo :
+# - verifier que l'utilisateur n'est pas déjà connecté
+# - envoyer des messages avec des caractères spéciaux type ", ', {, }, [, ]
 
-typeRequest = ["login", "get_private_list_user"]
-functionRequest = [login, getPrivateListUser]
+
+connected_clients = []
+
+typeRequest = ["login", "get_private_list_user", "get_private_list_message"]
+functionRequest = [login, getPrivateListUser, getPrivateListMessage]
 
 async def	handler(websocket, path):
 	if (path != "/"):
@@ -28,7 +34,7 @@ async def	handler(websocket, path):
 		await websocket.close()
 		return
 	userClass = User(websocket)
-	connected_clients.add(userClass)
+	connected_clients.append(userClass)
 	try:
 		async for resquet in userClass.websocket:
 			try:
@@ -37,17 +43,18 @@ async def	handler(websocket, path):
 				await userClass.sendError("Invalid JSON", 9002)
 				continue
 			try:
+				userClass.printDebug(jsonRequest, 0)
 				if (jsonRequest["type"] in typeRequest):
 					if jsonRequest["type"] == "login":
-						await functionRequest[typeRequest.index(jsonRequest["type"])](websocket, jsonRequest["content"])
+						await functionRequest[typeRequest.index(jsonRequest["type"])](userClass, jsonRequest["content"])
 					else:
-						if (userClass.verifyToken(websocket, jsonRequest["token"]) == False):
+						if (await userClass.verifyToken(jsonRequest["token"]) == False):
 							continue
-						await functionRequest[typeRequest.index(jsonRequest["type"])](websocket)
+						await functionRequest[typeRequest.index(jsonRequest["type"])](userClass, jsonRequest["content"])
 				else:
 					await userClass.sendError("Invalid type", 9004)
-			except:
-				await userClass.sendError("Invalid request", 9005)
+			except Exception as e:
+				await userClass.sendError("Invalid request", 9005, e)
 	except websockets.ConnectionClosed:
 		pass
 	await userClass.close()
diff --git a/site/module_livechat/server/typeRequets/__pycache__/getPrivateListUser.cpython-312.pyc b/site/module_livechat/server/typeRequets/__pycache__/getPrivateListUser.cpython-312.pyc
deleted file mode 100644
index 666afcb5c5e788557f86d807e2752239ad11c3da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1210
zcmaJ<&2Jk;6rb^~KjPRe2~GH_)E-bJAJ(&WY$pbU6q1l8v>~MAVj)H2ow2>i?#{9^
z8?y#Qg(A3crk4uN6@tHl8y7wfMB8I8^cLg`%89q@II4uiNHg>My?OI~@6Ehl%H<-0
z@p$v6-dq8prwN&knF}!P0(giRV%R~Q$&NcX<(W=~WthfvmVKnL9Luvpie|u8OwlaZ
zN+~J>x{{)+fL=&YKiARN+?S}MN4PToED_v^XLq=ip~pnv(l{qP$M*Q>-GNfRe1ni7
zbsV4iJdlRvP_JqUmkfQw5}x9oBBAdH$|R|q^(A69i6w+%_&wh+>(xWQU(sUSqb`qg
zQc)GkSc9{8=3Z!7LQy%0^P<;F1vjUHcGb5%+wG@Hb<_NW)K|!IleAj^mYeNXuf4Kl
zHoCnUWmes4)M~9-oAQ+&?<I<HaaF27_+rR|(f%|jNZE40nXN|uQ$d56OOpyHWWdup
z7<YwdNQXu|FmA6;B_s_UWgqj=+El`>Ri(!)HhCf%sG$gsq*1$Lo7-F4!3Ud;I9y+f
zjMWW$=V)lCCX@y<4OrOYOb&!~G^$L)C4u0rWVPQX$xfEdcEjk3D9Nhod;K`KO9O{T
zBQm|>cV$%#r%&fXwUlf~Yolcy?VGEs#{PgO7cG3zXvvm^`2gm47nb)BhQ|909X{^?
z_GB=uG7|(i^C<Jfh0g<M&`&jlzRf(;zRG4HLWGvlH`yPxA+BgU@j{=g13$2jsp1EY
zE!9CNc~Hs3x{7=r=Pw#5F-Y#QSZ7qx3XW$Iw>5`KDHEle=O2-Qa5>?OMPyxAp$qLN
z$(mrC?0$H6gGgI(;tCcziOw;%22>G<am)jfNbT{DLk>3}pWR71cOaX6@TmGxJpW&F
zun4+!nDQnpf1!Wwqq71k%zb_G`N^+0T0b{_TfF^8e(O)X^*i1=mnCre;`%N89e!Q^
zK6eXOvT<?9yApmCWaB)Qk!RT=)(@rdf)~L%6?lxs08y|2%X#6gNda#M*MTN=%M)16
zG>q~1RfOlCpes+%ETmC-<+QwTTHO0PuWR~Q36)+tEiaxH?_Khj({uVfhx7L@`C{td
byyVwX{^o=?Zxk~3_3=Ac$J;n~4N~|Qcdcjv

diff --git a/site/module_livechat/server/typeRequets/__pycache__/login.cpython-312.pyc b/site/module_livechat/server/typeRequets/__pycache__/login.cpython-312.pyc
deleted file mode 100644
index 79ef181b02b186f895564f93499b5536027485c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3871
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

diff --git a/site/module_livechat/server/typeRequets/getPrivateListMessage.py b/site/module_livechat/server/typeRequets/getPrivateListMessage.py
new file mode 100644
index 0000000..97245cd
--- /dev/null
+++ b/site/module_livechat/server/typeRequets/getPrivateListMessage.py
@@ -0,0 +1,69 @@
+# **************************************************************************** #
+#                                                                              #
+#                                                         :::      ::::::::    #
+#    getPrivateListMessage.py                           :+:      :+:    :+:    #
+#                                                     +:+ +:+         +:+      #
+#    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
+#                                                 +#+#+#+#+#+   +#+            #
+#    Created: 2024/08/03 22:53:14 by edbernar          #+#    #+#              #
+#    Updated: 2024/08/03 23:43:09 by edbernar         ###   ########.fr        #
+#                                                                              #
+# **************************************************************************** #
+
+import random
+
+listMessage = {
+	"type": "private_list_message", 
+	"content": [
+		{
+			"from": 0,
+			"content": "",
+			"date": "10:05 31/07/2024"
+		},
+		{
+			"from": 0,
+			"content": "",
+			"date": "10:05 31/07/2024"
+		},
+		{
+			"from": 0,
+			"content": "",
+			"date": "10:06 31/07/2024"
+		},
+		{
+			"from": 0,
+			"content": "",
+			"date": "10:06 31/07/2024"
+		},
+		{
+			"from": 0,
+			"content": "",
+			"date": "10:45 31/07/2024"
+		},
+		{
+			"from": 0,
+			"content": "",
+			"date": "10:46 31/07/2024"
+		}
+	]
+}
+
+def generate_random_string():
+	char = "abcdefghijklmnopqrstuvwxyz 123456789"
+	string = ""
+
+	for i in range(20):
+		string += char[random.randint(0, len(char) - 1)]
+	return string
+
+async def getPrivateListMessage(userClass, content):
+	# |TOM| Requete pour avoir la liste des messages privés grace à l'id de l'utilisateur
+	copyListMessage = listMessage.copy()
+	for message in copyListMessage["content"]:
+		if (random.randint(1, 10) % 2 == 0):
+			message["from"] = 4561268
+		else:
+			message["from"] = content["id"]
+		message["content"] = generate_random_string()
+	await userClass.send(copyListMessage)
+		
diff --git a/site/module_livechat/server/typeRequets/getPrivateListUser.py b/site/module_livechat/server/typeRequets/getPrivateListUser.py
index fecc737..2486161 100644
--- a/site/module_livechat/server/typeRequets/getPrivateListUser.py
+++ b/site/module_livechat/server/typeRequets/getPrivateListUser.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/03 15:10:23 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/03 17:07:21 by edbernar         ###   ########.fr        #
+#    Updated: 2024/08/03 22:30:13 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -18,37 +18,43 @@ data = [
 		{
 			"name": "Nessundorma",
 			"status": "online",
-			"pfp": "https://wallpapers-clan.com/wp-content/uploads/2023/05/cool-pfp-02.jpg"
+			"pfp": "https://wallpapers-clan.com/wp-content/uploads/2023/05/cool-pfp-02.jpg",
+			"id": 145564
 		},
 		{
 			"name": "Succotash",
 			"status": "offline",
-			"pfp": "https://i.pinimg.com/200x/28/75/96/287596f98304bf1adc2c411619ae8fef.jpg"
+			"pfp": "https://i.pinimg.com/200x/28/75/96/287596f98304bf1adc2c411619ae8fef.jpg",
+			"id": 256981
 		},
 		{
 			"name": "Astropower",
 			"status": "online",
-			"pfp": "https://ashisheditz.com/wp-content/uploads/2024/03/cool-anime-pfp-demon-slayer-HD.jpg"
+			"pfp": "https://ashisheditz.com/wp-content/uploads/2024/03/cool-anime-pfp-demon-slayer-HD.jpg",
+			"id": 301547
 		},
 		{
 			"name": "Assaultive",
 			"status": "offline",
-			"pfp": "https://i1.sndcdn.com/artworks-1Li0JIJrQGlojD3y-AEiNkw-t500x500.jpg"
+			"pfp": "https://i1.sndcdn.com/artworks-1Li0JIJrQGlojD3y-AEiNkw-t500x500.jpg",
+			"id": 432448
 		},
 		{
 			"name": "Redshock",
 			"status": "offline",
-			"pfp": "https://cdn.pfps.gg/pfps/7094-boy-pfp.png"
+			"pfp": "https://cdn.pfps.gg/pfps/7094-boy-pfp.png",
+			"id": 543211
 		},
 		{
 			"name": "Parley",
 			"status": "offline",
-			"pfp": "https://pbs.twimg.com/media/EscE6ckU0AA-Uhe.png"
+			"pfp": "https://pbs.twimg.com/media/EscE6ckU0AA-Uhe.png",
+			"id": 654123
 		},
 ]
 
-async def getPrivateListUser(userClass):
+async def getPrivateListUser(userClass, content=None):
 	# |TOM| Faire une requête à la base de données pour récupérer la liste des
 	# utilisateurs qui doivent apparaitre dans la liste du chat privé
 	# (ceux qui ont eu conversation avec l'utilisateur)
-	await userClass.send({"type": "get_private_list_user", "content": data})
\ No newline at end of file
+	await userClass.send({"type": "private_list_user", "content": data})
\ No newline at end of file
diff --git a/site/module_livechat/server/typeRequets/login.py b/site/module_livechat/server/typeRequets/login.py
index a587555..c1dd828 100644
--- a/site/module_livechat/server/typeRequets/login.py
+++ b/site/module_livechat/server/typeRequets/login.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/03 08:10:38 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/03 17:08:07 by edbernar         ###   ########.fr        #
+#    Updated: 2024/08/03 22:35:45 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -21,11 +21,11 @@ import json
 
 userList = [
 	{
-		"username": "user1",
-		"token": "123456",
-		"mail": "aa@aa.fr",
+		"username": "Nexalith",
+		"token": "IDSNCSDAd465sd13215421",
+		"mail": "eddy@ediwor.fr",
 		"password": "ABC123",
-		"id": 1
+		"id": 4561268
 	},
 	{
 		"username": "user2",
@@ -43,26 +43,31 @@ userList = [
 	}
 ]
 
-async def loginByToken(websocket, content):
+async def loginByToken(userClass, content):
 	# |TOM| Requete pour savoir si le token est valide
 	for user in userList:
 		if (user["token"] == content["token"]):
 			jsonVar = {"type": "login", "content": {"username": user["username"], "token": user["token"], "id": user["id"]}}
-			await websocket.send(json.dumps(jsonVar))
+			userClass.username = jsonVar["content"]["username"]
+			userClass.token = jsonVar["content"]["token"]
+			userClass.id = jsonVar["content"]["id"]
+			await userClass.send(jsonVar)
 			return
 	jsonVar = {"type": "error", "content": "Invalid token", "code": 9001}
-	await websocket.send(json.dumps(jsonVar))
+	await userClass.send(json.dumps(jsonVar))
 
-async def loginByPass(websocket, content):
+async def loginByPass(userClass, content):
 	# |TOM| Requete pour savoir si le mail et le mot de passe sont valides
-	# et créer un token s'il n'existe pas
+	# et créer un token si celui-ci n'existe pas
 	for user in userList:
-		if (user["username"] == content["username"] and user["password"] == content["password"]):
+		if (user["mail"] == content["mail"] and user["password"] == content["password"]):
 			jsonVar = {"type": "login", "content": {"username": user["username"], "token": user["token"], "id": user["id"]}}
-			await websocket.send(json.dumps(jsonVar))
+			userClass.username = jsonVar["content"]["username"]
+			userClass.token = jsonVar["content"]["token"]
+			userClass.id = jsonVar["content"]["id"]
+			await userClass.send(jsonVar)
 			return
-	jsonVar = {"type": "error", "content": "Invalid username or password", "code": 9007}
-	await websocket.send(json.dumps(jsonVar))
+	await userClass.send({"type": "error", "content": "Invalid username or password", "code": 9007})
 
 async def verifyToken42(token42):
 	url = "https://api.intra.42.fr/v2/me"
@@ -74,30 +79,30 @@ async def verifyToken42(token42):
 	# dans la base de données
 	return (response.status_code == 200)
 
-async def loginBy42(websocket, content):
-		# |TOM| Requete pour récuperer les informations de l'utilisateur selon l'intra de la personne
-		# et créer un token s'il n'existe pas
+async def loginBy42(userClass, content):
+	# |TOM| Requete pour récuperer les informations de l'utilisateur selon l'intra de la personne
+	# et créer un token si celui-ci n'existe pas
 	for user in userList:
 		if (await verifyToken42(content["token42"])):
 			jsonVar = {"type": "login", "content": {"username": user["username"], "token": user["token"], "id": user["id"]}}
-			await websocket.send(json.dumps(jsonVar))
+			await userClass.send(json.dumps(jsonVar))
+			return
 	jsonVar = {"type": "error", "content": "Invalid 42 token", "code": 9008}
-	await websocket.send(json.dumps(jsonVar))
+	await userClass.send(json.dumps(jsonVar))
 
-async def login(websocket, content):
+async def login(userClass, content):
 	# |TOM| Faire 3 types de requêtes:
 	# - byToken: Récupérer les informations de l'utilisateur en fonction de son token
 	# - byPass: Récupérer les informations de l'utilisateur en fonction de mail et de son mot de passe
 	# - by42: Récupérer les informations de l'utilisateur en fonction de son token42 (qui sera different du token)
-
 	try:
 		if (content["type"] == "byToken"):
-			await loginByToken(websocket, content)
+			await loginByToken(userClass, content)
 		elif (content["type"] == "byPass"):
-			await loginByPass(websocket, content)
+			await loginByPass(userClass, content)
 		elif (content["type"] == "by42"):
-			await loginBy42(websocket, content)
+			await loginBy42(userClass, content)
 		else:
-			await sendError(websocket, "Invalid login type", 9006)
-	except:
-		await sendError(websocket, "Invalid request", 9005)
\ No newline at end of file
+			await userClass.sendError("Invalid login type", 9006)
+	except Exception as e:
+		await userClass.sendError("Invalid request", 9005, e)
\ No newline at end of file
diff --git a/site/module_livechat/site/main.js b/site/module_livechat/site/main.js
index c8837a0..1ebb20f 100644
--- a/site/module_livechat/site/main.js
+++ b/site/module_livechat/site/main.js
@@ -6,12 +6,14 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/30 13:50:35 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/03 14:57:19 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/03 23:44:10 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
-import { socket, sendRequest } from "./websocket.js";
+import { sendRequest } from "./websocket.js";
 import { userList, waitForUserList } from "./typeResponse/typePrivateListUser.js";
+import { messageList, waitForMessageList } from "./typeResponse/typePrivateListMessage.js";
+import { userMeInfo } from "./typeResponse/typeLogin.js";
 
 document.addEventListener('DOMContentLoaded', () => {
 	liveChat();
@@ -72,17 +74,17 @@ async function	showListUserMessage() {
 	divMessageListChatHome.innerHTML += "<p style='text-align: center; margin-top: 20px;'>New conversation +</p>";
 	divUser = document.getElementsByClassName("user");
 	for (let i = 0; i < divUser.length; i++) {
-		divUser[i].addEventListener("click", () => {
-			launchPrivateChat(userList[i]);
+		divUser[i].addEventListener("click", async () => {
+			await launchPrivateChat(userList[i]);
 		});
 	}
 }
 
-function	showActualGameMessage() {
+function	showActualGameMessage(id) {
 	const	divMessageListChatHome = document.getElementById("messageListChatHome");
 	let		me = "Kumita";
 	let		request = {
-		isInGame: true,
+		isInGame: false,
 		opponent: {
 			name: "Astropower",
 			pfp: "https://ashisheditz.com/wp-content/uploads/2024/03/cool-anime-pfp-demon-slayer-HD.jpg"
@@ -147,50 +149,13 @@ function	showActualGameMessage() {
 	`;
 }
 
-function	launchPrivateChat(user) {
+async function	launchPrivateChat(user) {
 	const	divMessageListChatHome = document.getElementById("messageListChatHome");
 	const	divButtonTypeChatHome = document.getElementById("buttonTypeChatHome");
 	let		returnButton;
-	let		me = "Kumita";
-	let		request = {
-		opponent: {
-			name: user.name,
-			pfp: user.pfp
-		},
-		listMessage: [
-			{
-				from: user.name,
-				content: "Salut !",
-				date: "10:05 31/07/2024"
-			},
-			{
-				from: "Kumita",
-				content: "Hey",
-				date: "10:05 31/07/2024"
-			},
-			{
-				from: user.name,
-				content: "Tu veux coder un peu ?",
-				date: "10:06 31/07/2024"
-			},
-			{
-				from: "Kumita",
-				content: "Ouais, je suis partant !",
-				date: "10:06 31/07/2024"
-			},
-			{
-				from: "Kumita",
-				content: "Ce bug était vraiment galère à résoudre, mais on y est arrivé.",
-				date: "10:45 31/07/2024"
-			},
-			{
-				from: user.name,
-				content: "Ouais, mais t'as trouvé la solution. À la prochaine !",
-				date: "10:46 31/07/2024"
-			},
-		]
-	}; //Remplace temporairement la requete qui devra être de la meme forme
-
+	
+	sendRequest("get_private_list_message", {id: user.id});
+	await waitForMessageList();
 	let h2Button = divButtonTypeChatHome.getElementsByTagName("h2");
 	let len = h2Button.length;
 	for (let i = 0; i < len; i++) {
@@ -208,17 +173,16 @@ function	launchPrivateChat(user) {
 			<h2 id="selected">Private</h2>
 			<h2>Game</h2>
 		`;
-		liveChat();
+		showListUserMessage();
 	});
 
 
-
 	divMessageListChatHome.style.height = "230px";
 	divMessageListChatHome.style.paddingBottom = "20px";
 	divMessageListChatHome.innerHTML = '';
-	request.listMessage.forEach(element => {
+	messageList.forEach(element => {
 		divMessageListChatHome.innerHTML += `
-		<div class="${element.from === me ? "meMessage" : "opponentMessage"}">
+		<div class="${element.from === userMeInfo.id ? "meMessage" : "opponentMessage"}">
 		<p class="content">${element.content}</p>
 		<p class="time">${element.date}</p>
 		</div>
diff --git a/site/module_livechat/site/typeResponse/typeLogin.js b/site/module_livechat/site/typeResponse/typeLogin.js
index d352d45..bebe714 100644
--- a/site/module_livechat/site/typeResponse/typeLogin.js
+++ b/site/module_livechat/site/typeResponse/typeLogin.js
@@ -6,13 +6,20 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/02 00:39:53 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/02 00:46:21 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/03 23:37:33 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
+let userMeInfo = {
+	username: "",
+	id: 42
+};
+
 function	typeLogin(content)
 {
 	console.log("Welcome " + content.username + "\nYou're id is " + content.id);
+	userMeInfo.username = content.username;
+	userMeInfo.id = content.id;
 }
 
-export { typeLogin };
\ No newline at end of file
+export { userMeInfo, typeLogin };
\ No newline at end of file
diff --git a/site/module_livechat/site/typeResponse/typePrivateListMessage.js b/site/module_livechat/site/typeResponse/typePrivateListMessage.js
new file mode 100644
index 0000000..e843c0c
--- /dev/null
+++ b/site/module_livechat/site/typeResponse/typePrivateListMessage.js
@@ -0,0 +1,36 @@
+/* ************************************************************************** */
+/*                                                                            */
+/*                                                        :::      ::::::::   */
+/*   typePrivateListMessage.js                          :+:      :+:    :+:   */
+/*                                                    +:+ +:+         +:+     */
+/*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
+/*                                                +#+#+#+#+#+   +#+           */
+/*   Created: 2024/08/03 22:20:35 by edbernar          #+#    #+#             */
+/*   Updated: 2024/08/03 23:23:42 by edbernar         ###   ########.fr       */
+/*                                                                            */
+/* ************************************************************************** */
+
+let messageList = [];
+let messageListAvailable = false;
+let messageListResolve = null;
+
+function waitForMessageList() {
+	return new Promise((resolve) => {
+		if (messageListAvailable)
+			resolve();
+		else
+			messageListResolve = resolve;
+	});
+}
+
+function typePrivateListMessage(list) {
+	messageList = list;
+	messageListAvailable = true;
+	if (messageListResolve)
+	{
+		messageListResolve();
+		messageListResolve = null;
+	}
+}
+
+export { messageList, typePrivateListMessage, waitForMessageList };
\ No newline at end of file
diff --git a/site/module_livechat/site/websocket.js b/site/module_livechat/site/websocket.js
index 5826aab..1b16742 100644
--- a/site/module_livechat/site/websocket.js
+++ b/site/module_livechat/site/websocket.js
@@ -6,23 +6,27 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/31 22:17:24 by edbernar          #+#    #+#             */
-/*   Updated: 2024/08/03 15:04:37 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/08/03 23:23:45 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 import { typeLogin } from "./typeResponse/typeLogin.js";
 import { typePrivateListUser } from "./typeResponse/typePrivateListUser.js";
+import { typePrivateListMessage } from "./typeResponse/typePrivateListMessage.js";
 
 const socket = new WebSocket('ws://localhost:8000/');
-const token = "123456";
+const token = "IDSNCSDAd465sd13215421";
 
-const typeResponse = ["login", "private_list_user"];
-const functionResponse = [typeLogin, typePrivateListUser];
+const typeResponse = ["login", "private_list_user", "private_list_message"];
+const functionResponse = [typeLogin, typePrivateListUser, typePrivateListMessage];
 
 socket.onopen = () => {
 	console.log('Connected');
 	if (token)
 		sendRequest("login", {"type": "byToken", "token": token});
+	// |Eddy| Requete pour se connecter par mail et password. En attente du front pour le faire (déjà fonctionnel côté back)
+	// sendRequest("login", {type: "byPass", mail: "aa@aa.fr", password: "ABC123"});
+
 };
 
 socket.onmessage = (event) => {