refactor

Author: yusuffugurlu

API/Apps/Auth/api/views.py

@@ -1,18 +1,11 @@
-import os
 import threading
-
-from django.http import HttpResponseRedirect
-from pytz import timezone
-
-from Apps.Auth.serializers import RegisterSerializer, ChangePasswordSerializer, RegisterWith42Serializer
+from Apps.Auth.serializers import RegisterSerializer, ChangePasswordSerializer
 from rest_framework.exceptions import AuthenticationFailed
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import *
+from ..auth_tools import Authenticator, TokenGenerator
 from ..utils import *
-from rest_framework_simplejwt.tokens import RefreshToken
-from .permissions import IsEmailVerified
-from ...Profile.api.Serializers import UserSerializer
-from ...Profile.api.api_42 import api_42
+from ...Profile.api.api_42 import connect_api_42
 
 
 @api_view(['POST'])
@@ -40,39 +33,18 @@ def send_email_for_verification(request):
 @api_view(['POST'])
 @permission_classes([AllowAny])
 def email_verification_and_login(request):
-    try:
-        username = request.data['username']
-        verification_code = request.data['verification_code']
-        db_verification_code = VerificationCode.objects.get(code=verification_code, username=username)
-        user = User.objects.get(username=username)
-    except VerificationCode.DoesNotExist:
-        return Response(data={'message': 'Invalid verification code!'}, status=400)
-    except User.DoesNotExist:
-        return Response(data={'message': 'User not found!'}, status=400)
-    if verification_code != db_verification_code.code:
-        return Response(data={'message': 'Incorrect verification code!'}, status=400)
-
-    expiration_time = timedelta(minutes=15)
-    if (datetime.now().astimezone(timezone('UTC')) - db_verification_code.expired_date) > expiration_time:
-        db_verification_code.delete()
-        return Response(data={'message': 'Verification code expired!'}, status=400)
-    db_verification_code.delete()
-
-    profile = user.profile
-    profile.is_verified = True
-    profile.save()
-
-    tokens = RefreshToken.for_user(user)
-
-    response = Response()
-    response.data = {
-        'tokens': {'access': str(tokens.access_token), 'refresh': str(tokens)},
-        'user_id': user.pk,
-        'username': user.username
-    }
-
-    response.status_code = 200
-    return response
+    username = request.data.get('username')
+    verification_code = request.data.get('verification_code')
+
+    if not username or not verification_code:
+        return Response(data={'message': 'Username and verification code are required!'}, status=400)
+
+    user, error_response = Authenticator.authenticate_user(username, verification_code)
+    if error_response:
+        return error_response
+
+    response_data = TokenGenerator.generate_tokens(user)
+    return Response(data=response_data, status=200)
 
 
 @api_view(['POST'])
@@ -105,5 +77,4 @@ def direct_42_login_page(request):
 
 @api_view(['POST'])
 def login_with_42(request, code):
-    response = api_42(code)
-    return response
+    return connect_api_42(code)

API/Apps/Auth/auth_tools.py

@@ -0,0 +1,40 @@
+from datetime import timedelta, datetime
+from django.utils import timezone
+from rest_framework.response import Response
+from .models import VerificationCode
+from rest_framework_simplejwt.tokens import RefreshToken
+
+
+class Authenticator:
+    @staticmethod
+    def authenticate_user(username, verification_code):
+        try:
+            db_verification_code = VerificationCode.objects.get(code=verification_code, username=username)
+        except VerificationCode.DoesNotExist:
+            return None, Response(data={'message': 'Invalid verification code!'}, status=400)
+
+        if verification_code != db_verification_code.code:
+            return None, Response(data={'message': 'Incorrect verification code!'}, status=400)
+
+        if (datetime.now().astimezone(timezone('UTC')) - db_verification_code.expired_date) > timedelta(minutes=15):
+            db_verification_code.delete()
+            return None, Response(data={'message': 'Verification code expired!'}, status=400)
+
+        db_verification_code.delete()
+
+        user = db_verification_code.user
+        user.profile.is_verified = True
+        user.profile.save()
+
+        return user, None
+
+
+class TokenGenerator:
+    @staticmethod
+    def generate_tokens(user):
+        tokens = RefreshToken.for_user(user)
+        return {
+            'tokens': {'access': str(tokens.access_token), 'refresh': str(tokens)},
+            'user_id': user.pk,
+            'username': user.username
+        }

API/Apps/Auth/models.py

@@ -1,5 +1,4 @@
 from time import timezone
-
 from django.db import models
 
 

API/Apps/Auth/serializers.py

@@ -1,3 +1,5 @@
+import uuid
+
 from rest_framework import serializers
 from django.contrib.auth.models import User
 from rest_framework.validators import UniqueValidator
@@ -88,14 +90,14 @@ class RegisterWith42Serializer(serializers.Serializer):
 
     class Meta:
         model = User
-        fields = ('username', 'email',)
+        fields = ('username', 'email')
 
     def create(self, validated_data):
-        print(validated_data)
         user = User.objects.create(
             username=validated_data['username'],
             email=validated_data['email'],
         )
+        user.set_password(str(uuid.uuid1()))
 
         profile = Profile.objects.create(
             user=user,

API/Apps/Chat/api/views.py

@@ -1,5 +1,4 @@
 # chat/views.py
-from django.contrib.auth.models import User
 from django.db.models import Q
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.pagination import PageNumberPagination

API/Apps/Chat/consumers.py

@@ -2,10 +2,7 @@
 
 from asgiref.sync import async_to_sync
 from channels.generic.websocket import WebsocketConsumer
-from django.contrib.auth.models import User
-from rest_framework_simplejwt.backends import TokenBackend
 from Apps.Chat.models import Message
-from urllib.parse import parse_qsl
 
 from Apps.Profile.models import Profile
 

API/Apps/Profile/api/api_42.py

@@ -9,7 +9,7 @@
 from Apps.Profile.api.Serializers import UserSerializer
 
 
-def api_42(code):
+def connect_api_42(code):
     response = requests.post(f"{os.getenv("42_API_URL")}/oauth/token", data={
         'grant_type': 'authorization_code',
         'code': code,

API/static/styles/verification.css

@@ -46,10 +46,10 @@ input::-webkit-outer-spin-button {
     border-radius: 20px!important;
     background: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.1));
     transition-duration: 0.5s;
-    color: white!important;
+    color: white;
 }
 
 button:hover {
     background-color: white;
-    color: black;
+    color: black !important;
 }