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

Site/Django

Browse Source 
- Moving forward on the settings
This commit is contained in:
Kum1ta
2024-09-26 01:04:24 +02:00
parent c20110e7c1
commit e375c65c2f
9 changed files with 218 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose/requirements/djangoserver/file/server/server/templates/settingsPage.html
View File

@ -6,7 +6,7 @@
<input type="text" id="username" placeholder="Username">
<div class="form-footer">
<small>Your username allows other players to find you.</small>
<button class="save-btn-settings">SAVE</button>
<button class="save-btn-settings" id="usernameButtonSave">SAVE</button>
</div>
</div>
@ -24,7 +24,7 @@
<input type="text" id="discord" placeholder="Discord">
<div class="form-footer">
<small>Share your discord for more fun!</small>
<button class="save-btn-settings">SAVE</button>
<button class="save-btn-settings" id="discordButtonSave">SAVE</button>
</div>
</div>
</div>

86
docker-compose/requirements/djangoserver/file/server/server/typeRequests/changePrivateInfo.py Normal file
View File

@ -0,0 +1,86 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# changePrivateInfo.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/09/25 23:28:49 by edbernar #+# #+# #
# Updated: 2024/09/26 00:41:16 by edbernar ### ########.fr #
# #
# **************************************************************************** #
from asgiref.sync import sync_to_async
from ..models import User
import hashlib
import json
import re
mail_pattern = "^((?!\\.)[\\w\\-_.]*[^.])(@\\w+)(\\.\\w+(\\.\\w+)?[^.\\W])$"
password_pattern = "^(?=.*?[A-Z])(?=.*?[a-z])(?=.*?[0-9])(?=.*?[#?!@$%^&*-]).{8,}$"
discord_pattern = "^[a-zA-Z0-9_.]{0,32}$"
@sync_to_async
def changePrivateInfo(socket, content):
try:
data = []
if (content.get("username")):
data.append("username")
if (content.get("password")):
data.append("password")
if (content.get("discord")):
data.append("discord")
if (len(data) != 1):
socket.sendError("You must provide exactly one field to update", 9028)
return
if (content.get("username")):
if (content["username"].find(' ') != -1):
socket.sendError("Username must not contain spaces", 9015)
return
if (len(content["username"]) < 3):
socket.sendError("Username must be at least 3 characters long", 9016)
return
if (len(content["username"]) > 20):
socket.sendError("Username must be at most 20 characters long", 9017)
return
if (not all(c in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_" for c in content["username"])):
socket.sendError("Username must contain only letters and numbers", 9018)
return
if (User.objects.filter(username=content["username"]).exists()):
socket.sendError("Username already used", 9023)
return
if (content.get("password")):
if (len(content["password"]) < 8):
socket.sendError("Password must be at least 8 characters long", 9019)
return
if (content["password"].find(content["username"]) != -1):
socket.sendError("Password must not contain the username", 9021)
return
if (not bool(re.match(password_pattern, content["password"]))):
socket.sendError("Password must contain at least one lowercase letter, one uppercase letter and one special character", 9020)
return
if (content.get("discord")):
if (len(content["discord"]) > 32):
socket.sendError("Discord must be at most 32 characters long", 9024)
return
if (not bool(re.match(discord_pattern, content["discord"]))):
socket.sendError("Discord must contain only letters, numbers and underscores or points", 9025)
return
user = User.objects.get(id=socket.id)
if (content.get("username")):
user.username = content["username"]
socket.username = content["username"]
socket.scope["session"]['username'] = content["username"]
if (content.get("password")):
user.password = hashlib.sha256(user['mail' + content["password"]].encode()).hexdigest()
if (content.get("discord")):
if (content["discord"] != ""):
user.discord_username = content["discord"]
else:
user.discord_username = None
user.save()
socket.scope["session"].save()
socket.sync_send(json.dumps({"type": "change_private_info", "content": "Successfully updated."}))
except Exception as e:
socket.sendError("An unknown error occured", 9027, e)

28
docker-compose/requirements/djangoserver/file/server/server/typeRequests/getPrivateInfo.py Normal file
View File

@ -0,0 +1,28 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# getPrivateInfo.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/09/25 22:51:55 by edbernar #+# #+# #
# Updated: 2024/09/25 23:04:18 by edbernar ### ########.fr #
# #
# **************************************************************************** #
from asgiref.sync import sync_to_async
from ..models import User
import json
@sync_to_async
def getPrivateInfo(socket, content):
response = {}
user = User.objects.filter(id=socket.id).values().first()
if (user.get('id42') == None):
response["is42Account"] = False
else:
response["is42Account"] = True
response["username"] = user.get('username')
response["mail"] = user.get('mail')
response["discord_username"] = user.get('discord_username')
socket.sync_send({"type":"private_info", "content": response})

10
docker-compose/requirements/djangoserver/file/server/server/websocket.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/09/09 14:31:30 by tomoron #+# #+# #
# Updated: 2024/09/24 17:25:54 by edbernar ### ########.fr #
# Updated: 2024/09/26 00:17:17 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -29,15 +29,19 @@ from .typeRequests.getAllListUser import getAllListUser
from .typeRequests.changeBanner import changeBanner
from .typeRequests.gameRequest import gameRequest
from .typeRequests.getUserInfo import getUserInfo
from .typeRequests.getPrivateInfo import getPrivateInfo
from .typeRequests.changePrivateInfo import changePrivateInfo
from .typeRequests.changePfp import changePfp
typeRequest = ["login", "get_private_list_user", "get_private_list_message",
"send_private_message", "create_account", "get_all_list_user", "game",
"search_user", "get_user_info", "change_pfp", "change_banner"
"search_user", "get_user_info", "change_pfp", "change_banner",
"get_private_info", "change_private_info"
]
functionRequest = [login, getPrivateListUser, getPrivateListMessage,
sendPrivateMessage, createAccount, getAllListUser, gameRequest,
searchUser, getUserInfo, changePfp, changeBanner
searchUser, getUserInfo, changePfp, changeBanner,
getPrivateInfo, changePrivateInfo
]
from random import randint