.

Author: yusuffugurlu

API/Apps/Auth/api/urls.py

@@ -1,13 +1,12 @@
 from django.urls import path
-from rest_framework_simplejwt.views import TokenRefreshView, TokenObtainPairView, TokenBlacklistView
+from rest_framework_simplejwt.views import TokenBlacklistView
 from Apps.Auth.api.views import *
 from rest_framework_simplejwt.views import TokenRefreshView
 
 urlpatterns = [
     path('register/', register, name='register'),
-    path('login/', login, name='login'),
     path('send-email-for-verification/', send_email_for_verification, name='email_verification'),
-    path('email-verification/', email_verification, name='email_verification'),
+    path('email-verification/', email_verification_and_login, name='email_verification'),
     path('change-password/', change_password, name='change_password'),
     path('token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
     path('login-with-42/<str:code>/', login_with_42, name='login_with_42'),

API/Apps/Auth/api/views.py

@@ -1,4 +1,5 @@
 import os
+import threading
 
 from django.http import HttpResponseRedirect
 from pytz import timezone
@@ -23,23 +24,6 @@ def register(request):
     return Response(serializer.data, status=201)
 
 
-@api_view(['POST'])
-@permission_classes([IsEmailVerified])
-def login(request):
-    user = User.objects.filter(username=request.data['username']).first()
-
-    refresh = RefreshToken.for_user(user)
-    response = Response()
-    response.set_cookie(key='jwt', value=str(refresh.access_token), httponly=True)
-    response.data = {
-        'tokens': {'access': str(refresh.access_token), 'refresh': str(refresh)},
-        'user_id': user.pk,
-        'username': user.username
-    }
-    response.status_code = 200
-    return response
-
-
 @api_view(['POST'])
 @permission_classes([AllowAny])
 def send_email_for_verification(request):
@@ -48,13 +32,14 @@ def send_email_for_verification(request):
     user = User.objects.get(username=username)
     if user is None or not user.check_password(password):
         raise AuthenticationFailed("Wrong Password or Username!")
-    send_email(user)
+    thread = threading.Thread(target=send_email, args=[user])
+    thread.start()
     return Response(data={'message': 'Email sent successfully!'}, status=200)
 
 
 @api_view(['POST'])
 @permission_classes([AllowAny])
-def email_verification(request):
+def email_verification_and_login(request):
     try:
         username = request.data['username']
         verification_code = request.data['verification_code']
@@ -69,6 +54,7 @@ def email_verification(request):
 
     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()
 

API/Apps/Auth/utils.py

@@ -1,3 +1,5 @@
+import os
+
 import pyotp
 from datetime import datetime, timedelta
 
@@ -28,12 +30,24 @@ def generate_otp():
 
 def send_email(user):
     otp_code = generate_otp()
-    receiver = user.email  # test
-    subject = 'LAST DANCE Email Verification'
-    message = f'Hi! {user} your one-time verification code is {otp_code['otp']}'
-    from_email = '[email protected]'
+    receiver = user.email
+    subject = 'Transcendence Email Verification'
+    message = f'''
+    Hello {user.username},
+
+    You can use the following one-time code to verify your Transcendence account:
+
+    Verification Code: {otp_code['otp']}
+
+    This code will help you securely verify your account.
+
+    Regards,
+    Transcendence Team
+    '''
+    from_email = os.getenv("EMAIL_HOST_USER")
     recipient_list = [receiver]
     send_mail(subject, message, from_email, recipient_list)
 
     VerificationCode.objects.create(code=otp_code['otp'], expired_date=otp_code['otp'], username=user)
 
+