tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix async function not executing when in a sync function (python is wierd)

Browse Source
This commit is contained in:
tomoron
2024-09-15 11:16:07 +02:00
parent 53ec541fbf
commit d785c6f006
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/08/03 08:10:38 by edbernar #+# #+# # # Created: 2024/08/03 08:10:38 by edbernar #+# #+# #
# Updated: 2024/09/15 00:47:18 by tomoron ### ########.fr # # Updated: 2024/09/15 11:14:32 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -18,18 +18,25 @@ import json
import os import os
@sync_to_async @sync_to_async
def loginByPass(socket, content): def userExists(mail, password):
password_hash = hashlib.md5((content["mail"] + content["password"]).encode()).hexdigest() password_hash = hashlib.md5((mail + password).encode()).hexdigest()
user = User.objects.filter(mail=content["mail"], password=password_hash) user = User.objects.filter(mail=mail, password=password_hash)
if(user.exists()): if(not user.exists()):
if(user[0].mail != None and not user[0].mail_verified): return({"found":False})
else:
return({"found":True, "id":user[0].id, "username":user[0].username, "mail_verified":user[0].mail_verified})
async def loginByPass(socket, content):
u_info = await userExists(content["mail"],content["password"])
if(u_info["found"]):
if(not u_info["mail_verified"]):
socket.sendError("Account not verified, please verify your account before logging in",9025) socket.sendError("Account not verified, please verify your account before logging in",9025)
return return
if(socket.login(user[0].id, user[0].username)): if(await socket.login(u_info["id"], u_info["username"])):
socket.sync_send(json.dumps({"type":"logged_in", "content":{ socket.sync_send(json.dumps({"type":"logged_in", "content":{
"status":True, "status":True,
"username":user[0].username, "username":u_info["username"],
"id": user[0].id, "id": u_info["id"],
}})) }}))
else: else:
socket.sendError("An unknown error occured",9027) socket.sendError("An unknown error occured",9027)