From 98ddde7233ce429e701258649b62c61fb815d334 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Sun, 15 Sep 2024 00:49:44 +0200
Subject: [PATCH] switch login method to async to work with the login request

---
 .../file/server/server/typeRequests/login.py    | 10 ++++++----
 .../file/server/server/websocket.py             | 17 +++++++++--------
 listError.txt                                   |  1 +
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
index 7c471fb..1c70cc6 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/03 08:10:38 by edbernar          #+#    #+#              #
-#    Updated: 2024/09/14 18:54:47 by tomoron          ###   ########.fr        #
+#    Updated: 2024/09/15 00:47:18 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -17,6 +17,7 @@ import requests
 import json
 import os
 
+@sync_to_async
 def loginByPass(socket, content):
 	password_hash = hashlib.md5((content["mail"] + content["password"]).encode()).hexdigest()
 	user = User.objects.filter(mail=content["mail"], password=password_hash)
@@ -30,14 +31,15 @@ def loginByPass(socket, content):
 				"username":user[0].username,
 				"id": user[0].id,
 			}}))
+		else:
+			socket.sendError("An unknown error occured",9027)
 	else:
 		socket.sync_send(json.dumps({"type": "error", "content": "Invalid email or password", "code": 9007}))
 
-@sync_to_async
-def login(socket, content):
+async def login(socket, content):
 	try:
 		if (content["type"] == "byPass"):
-			loginByPass(socket, content)
+			await loginByPass(socket, content)
 		else:
 			socket.sendError("Invalid login type", 9006)
 	except Exception as e:
diff --git a/docker-compose/requirements/djangoserver/file/server/server/websocket.py b/docker-compose/requirements/djangoserver/file/server/server/websocket.py
index 6eacedf..c870051 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/websocket.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/websocket.py
@@ -6,7 +6,7 @@
 #    By: tomoron <tomoron@student.42.fr>            +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/09/09 14:31:30 by tomoron           #+#    #+#              #
-#    Updated: 2024/09/14 21:21:19 by tomoron          ###   ########.fr        #
+#    Updated: 2024/09/15 00:48:29 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -61,16 +61,17 @@ class WebsocketHandler(AsyncWebsocketConsumer):
 		print("\033[32monline : ", self.onlinePlayers)
 		return(0)
 
-	def login(self, uid: int, username: str) -> int:
-		if(self.session_get("logged_in", False)):
+	async def login(self, uid: int, username: str) -> int:
+		if(await self.session_get("logged_in", False)):
+			print("already logged in")
 			return(0)
 		if(not self.add_to_online(uid)):
-			socket.sendError("Already logged in", 9012)
+			self.sendError("Already logged in", 9012)
 			return(0)
-		self.session_set("logged_in",True)
-		self.session_set("id",uid)
-		self.session_set("username",username)
-		self.session_save()
+		await self.session_set("logged_in",True)
+		await self.session_set("id",uid)
+		await self.session_set("username",username)
+		await self.session_save()
 		self.logged_in = True
 		self.id = uid
 		self.username = username
diff --git a/listError.txt b/listError.txt
index b2a1383..45063c3 100644
--- a/listError.txt
+++ b/listError.txt
@@ -28,6 +28,7 @@
 - 9024 : An error occured while creating the account	
 - 9025 : Account not verified, please verify your account before logging in
 - 9026 : An error occured while sending the email, glhf
+- 9027 : An unknown error occured
 
 - 9100 : Action out of range
 - 9101 : No game started