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

fix crash when trying to log back in 42 account

Browse Source
This commit is contained in:
tomoron
2024-11-11 15:50:34 +01:00
parent e77455493b
commit 280c66f5ca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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/10/22 17:40:28 by tomoron ### ########.fr # # Updated: 2024/11/11 15:48:44 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -25,7 +25,7 @@ def userExists(mail, password):
if(not user.exists()): if(not user.exists()):
return({"found":False}) return({"found":False})
else: else:
return({"found":True, "id":user[0].id, "username":user[0].username, "mail_verified":user[0].mail_verified, "pfp":user[0].pfp, "elo" : int(user[0].elo)}) return({"found":True, "id":int(user[0].id), "username":user[0].username, "mail_verified":user[0].mail_verified, "pfp":user[0].pfp, "elo" : int(user[0].elo)})
async def loginByPass(socket, content): async def loginByPass(socket, content):
try: try:

4
docker-compose/requirements/djangoserver/file/server/server/views.py
View File

@ -121,9 +121,9 @@ def login42(request):
User.objects.filter(id=db_user[0].id).update(last_login=timezone.now()) User.objects.filter(id=db_user[0].id).update(last_login=timezone.now())
request.session["logged_in"] = True request.session["logged_in"] = True
request.session["username"] = db_user[0].username request.session["username"] = db_user[0].username
request.session["id"] = db_user[0].id request.session["id"] = int(db_user[0].id)
request.session["pfp"] = db_user[0].pfp request.session["pfp"] = db_user[0].pfp
request.session["elo"] = db_user[0].elo request.session["elo"] = int(db_user[0].elo)
request.session.save() request.session.save()
return redirect("/") return redirect("/")