From 862ab1df4e3b6f23d93b4fd2ba9b413b7c4d89b3 Mon Sep 17 00:00:00 2001
From: tomoron <tomoron@student.42angouleme.fr>
Date: Sun, 25 Aug 2024 15:22:37 +0200
Subject: [PATCH] login and account creation now works using database

---
 .../requirements/djangoserver/Dockerfile      |   2 +-
 .../djangoserver/file/server/server/asgi.py   |   4 +--
 .../djangoserver/file/server/server/models.py |   5 +--
 .../file/server/server/settings.py            |   2 --
 .../{typeRequets => typeRequests}/.DS_Store   | Bin
 .../createAccount.py                          |  29 ++++++-----------
 .../getPrivateListMessage.py                  |   0
 .../getPrivateListUser.py                     |   0
 .../{typeRequets => typeRequests}/login.py    |  30 ++++++++----------
 .../login42/.DS_Store                         | Bin
 .../login42/login42.py                        |   0
 .../sendPrivateMessage.py                     |   0
 .../file/server/server/websocket.py           |  18 +++++++----
 13 files changed, 42 insertions(+), 48 deletions(-)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/.DS_Store (100%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/createAccount.py (80%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/getPrivateListMessage.py (100%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/getPrivateListUser.py (100%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/login.py (79%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/login42/.DS_Store (100%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/login42/login42.py (100%)
 rename docker-compose/requirements/djangoserver/file/server/server/{typeRequets => typeRequests}/sendPrivateMessage.py (100%)

diff --git a/docker-compose/requirements/djangoserver/Dockerfile b/docker-compose/requirements/djangoserver/Dockerfile
index 794eead..4b4a3aa 100644
--- a/docker-compose/requirements/djangoserver/Dockerfile
+++ b/docker-compose/requirements/djangoserver/Dockerfile
@@ -12,7 +12,7 @@ RUN apt install -y python3.12 postgresql-client
 RUN curl https://bootstrap.pypa.io/get-pip.py -o /root/get-pip.py
 RUN python3.12 /root/get-pip.py
 
-RUN pip3 install requests django psycopg "channels[daphne]"
+RUN pip3 install requests django psycopg "channels[daphne]" bcrypt
 
 ARG DB_HOST=;
 ARG DB_NAME=;
diff --git a/docker-compose/requirements/djangoserver/file/server/server/asgi.py b/docker-compose/requirements/djangoserver/file/server/server/asgi.py
index e424ae7..e672bfa 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/asgi.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/asgi.py
@@ -14,10 +14,10 @@ from django.urls import path
 from django.core.asgi import get_asgi_application
 from channels.sessions import SessionMiddlewareStack 
 
-from .websocket import WebsocketHandler
-
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'server.settings')
 
+from .websocket import WebsocketHandler
+
 django = get_asgi_application()
 
 application = ProtocolTypeRouter({
diff --git a/docker-compose/requirements/djangoserver/file/server/server/models.py b/docker-compose/requirements/djangoserver/file/server/server/models.py
index 6768377..7b1205e 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/models.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/models.py
@@ -2,9 +2,10 @@ from django.db import models
 
 class User(models.Model):
 	id = models.AutoField(primary_key=True)
-	nickname = models.CharField(max_length=20)
-	mail = models.EmailField()
+	username = models.CharField(max_length=20, unique=True)
+	mail = models.EmailField(unique=True)
 	password = models.CharField(max_length=100)
+	id42 = models.DecimalField(decimal_places=0, unique=True, default=0)
 
 class Message(models.Model):
 	id = models.AutoField(primary_key=True)
diff --git a/docker-compose/requirements/djangoserver/file/server/server/settings.py b/docker-compose/requirements/djangoserver/file/server/server/settings.py
index 8daaef5..85fe174 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/settings.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/settings.py
@@ -27,7 +27,6 @@ DEBUG = True
 
 ALLOWED_HOSTS = ['*']
 
-
 # Application definition
 
 INSTALLED_APPS = [
@@ -141,4 +140,3 @@ SESSION_COOKIE_SECURE = False
 SESSION_COOKIE_HTTPONLY = True
 SESSION_COOKIE_SAMESITE = 'Lax'
 SESSION_EXPIRE_AT_BROWSER_CLOSE = False
-
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/.DS_Store b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/.DS_Store
similarity index 100%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/.DS_Store
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/.DS_Store
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/createAccount.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/createAccount.py
similarity index 80%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/createAccount.py
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/createAccount.py
index d12bf8f..a4c09c1 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/createAccount.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/createAccount.py
@@ -6,13 +6,16 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/09 08:08:00 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/24 01:11:45 by tomoron          ###   ########.fr        #
+#    Updated: 2024/08/25 14:49:14 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 from .login import userList
+from ..models import User
 import random
 import re
+import json
+import hashlib
 
 pattern = r'^(?=.*[a-z])(?=.*[A-Z])(?=.*[\W_]).+$'
 
@@ -49,30 +52,18 @@ def createAccount(socket, content):
 		if (content["password"].find(content["username"]) != -1):
 			socket.sendError("Password must not contain the username", 9015)
 			return
-		# |Tom| Au lieu d'utiliser userList, faire une requête à la base de donnée pour savoir si on a un utilisateur avec cet email ou cet username
-		if (content["mail"] in userList):
+		if (len(User.objects.filter(mail=content["mail"]))):
 			socket.sendError("Mail already used", 9016)
 			return
-		if (content["username"] in userList):
+		if (len(User.objects.filter(username=content["username"]))):
 			socket.sendError("Username already used", 9017)
 			return
-		content["token"] = generateToken()
-		while (True):
-			content["id"] = random.randint(1000000, 9999999)
-			if (content["id"] not in userList):
-				break
-		userList.append(content)
-		socket.send(text_data=json.dumps({"type": "create_account", "content": "Account created"}))
 		socket.scope["session"]["logged_in"] = True
 		socket.scope["session"]["username"] = content["username"]
 		socket.scope["session"].save()
+		password = hashlib.md5((content["mail"] + content["password"]).encode()).hexdigest()
+		new_user = User.objects.create(username=content["username"], mail=content["mail"], password=password)
+		new_user.save()
+		socket.send(text_data=json.dumps({"type": "create_account", "content": "Account created"}))
 	except Exception as e:
 		socket.sendError("Error create account", 9005, e)
-
-def generateToken():
-	list = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-	token = ""
-
-	for i in range(0, 35):
-		token += list[random.randint(0, len(list) - 1)]
-	return token
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/getPrivateListMessage.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getPrivateListMessage.py
similarity index 100%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/getPrivateListMessage.py
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/getPrivateListMessage.py
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/getPrivateListUser.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/getPrivateListUser.py
similarity index 100%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/getPrivateListUser.py
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/getPrivateListUser.py
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/login.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
similarity index 79%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/login.py
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
index 5668caf..39f78e0 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/login.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login.py
@@ -6,11 +6,13 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/08/03 08:10:38 by edbernar          #+#    #+#              #
-#    Updated: 2024/08/24 01:11:15 by tomoron          ###   ########.fr        #
+#    Updated: 2024/08/25 15:20:21 by tomoron          ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
 from .login42.login42 import main42login
+from ..models import User
+import hashlib
 import requests
 import json
 import os
@@ -57,17 +59,16 @@ userList = [
 ]
 
 def loginByPass(socket, content):
-	# |TOM| Requete pour savoir si le mail et le mot de passe sont valides
-	# et créer un token si celui-ci n'existe pas
-	for user in userList:
-		if (user["mail"] == content["mail"] and user["password"] == content["password"]):
-			jsonVar = {"type": "login", "content": {"username": user["username"]}}
-			socket.scope["session"]["logged_in"] = True
-			socket.scope["session"]["username"] = jsonVar["content"]["username"]
-			socket.scope["session"].save()
-			socket.send(text_data=json.dumps(jsonVar))
-			return
-	socket.send(text_data=json.dumps({"type": "error", "content": "Invalid username or password", "code": 9007}))
+	password_hash = hashlib.md5((content["mail"] + content["password"]).encode()).hexdigest()
+	user = User.objects.filter(mail=content["mail"], password=password_hash)
+	if(len(user)):
+		jsonVar = {"type": "login", "content": {"username": user[0].username}}
+		socket.scope["session"]["logged_in"] = True
+		socket.scope["session"]["username"] = jsonVar["content"]["username"]
+		socket.scope["session"].save()
+		socket.send(text_data=json.dumps(jsonVar))
+		return
+	socket.send(text_data=json.dumps({"type": "error", "content": "Invalid email or password", "code": 9007}))
 
 
 
@@ -81,14 +82,11 @@ def loginBy42(socket, content):
 
 def login(socket, content):
 	# |TOM| Faire 3 types de requêtes:
-	# - byToken: Récupérer les informations de l'utilisateur en fonction de son token
-	# 	- nope
 	# - 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)
+	#	- will probably change
 	print(json.dumps(content))
 	try:
-#		if (content["type"] == "byToken"):
-#			loginByToken(socket, content)
 		if (content["type"] == "byPass"):
 			loginByPass(socket, content)
 		elif (content["type"] == "by42"):
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/login42/.DS_Store b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login42/.DS_Store
similarity index 100%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/login42/.DS_Store
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/login42/.DS_Store
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/login42/login42.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/login42/login42.py
similarity index 100%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/login42/login42.py
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/login42/login42.py
diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequets/sendPrivateMessage.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
similarity index 100%
rename from docker-compose/requirements/djangoserver/file/server/server/typeRequets/sendPrivateMessage.py
rename to docker-compose/requirements/djangoserver/file/server/server/typeRequests/sendPrivateMessage.py
diff --git a/docker-compose/requirements/djangoserver/file/server/server/websocket.py b/docker-compose/requirements/djangoserver/file/server/server/websocket.py
index 7ea8614..a6db3cf 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/websocket.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/websocket.py
@@ -1,11 +1,14 @@
 from channels.generic.websocket import WebsocketConsumer
 import json
 
-from .typeRequets.getPrivateListMessage import getPrivateListMessage
-from .typeRequets.getPrivateListUser import getPrivateListUser
-from .typeRequets.sendPrivateMessage import sendPrivateMessage
-from .typeRequets.createAccount import createAccount
-from .typeRequets.login import login
+import django
+django.setup()
+
+from .typeRequests.getPrivateListMessage import getPrivateListMessage
+from .typeRequests.getPrivateListUser import getPrivateListUser
+from .typeRequests.sendPrivateMessage import sendPrivateMessage
+from .typeRequests.createAccount import createAccount
+from .typeRequests.login import login
 
 typeRequest = ["login", "get_private_list_user", "get_private_list_message",
 			   "send_private_message", "create_account"]
@@ -19,7 +22,10 @@ class WebsocketHandler(WebsocketConsumer):
 
 	def connect(self):
 		self.accept()
-		self.send(text_data=json.dumps({"type":"is_logged_in", "content":self.scope["session"].get("logged_in",False)}))
+		self.send(text_data=json.dumps({"type":"logged_in", "content":{
+			"status":self.scope["session"].get("logged_in",False),
+			"username":self.scope["session"].get("username",None)
+		}}))
 		print("new client")
 	
 	def disconnect(self, close_code):