fixes

activist-org · Jun 9, 2024 · b2b2d8d · b2b2d8d
1 parent 585f7fd
commit b2b2d8d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 23 deletions.
diff --git a/backend/authentication/factories.py b/backend/authentication/factories.py
@@ -39,6 +39,7 @@ class Meta:
     description = factory.Faker("text", max_nb_chars=500)
     verified = factory.Faker("boolean")
     verification_method = factory.Faker("word")
+    verification_code = factory.Faker("uuid4")
     email = factory.Faker("email")
     social_links = factory.List([factory.Faker("user_name") for _ in range(3)])
     is_private = factory.Faker("boolean")

diff --git a/backend/authentication/models.py b/backend/authentication/models.py
@@ -92,8 +92,8 @@ class UserModel(AbstractUser, PermissionsMixin):
     icon_url = models.ForeignKey(
         "content.Image", on_delete=models.SET_NULL, blank=True, null=True
     )
+    verifictaion_code = models.UUIDField(blank=True, null=True)
     email = models.EmailField(blank=True)
-    code = models.UUIDField(blank=True, null=True)
     is_confirmed = models.BooleanField(default=False)
     social_links = ArrayField(models.CharField(max_length=255), blank=True, null=True)
     is_private = models.BooleanField(default=False)

diff --git a/backend/authentication/templates/pwreset_email.html b/backend/authentication/templates/pwreset_email.html
@@ -7,9 +7,9 @@
 <body>
     <p>Hi {{username}},</p>
     <p>We have received a request to reset your password. To proceed with the password reset, please click on the link below:</p>
-    <p><a href={{pwreset_link}}>Reset Password</a></p>
-    <p>If you did not request a password reset, please ignore this email.</p>
+    <p><a href="{{pwreset_link}}">Reset Password</a></p>
+    <p>If you did not request a password reset, then it's safe to ignore this email.</p>
     <p>Best regards,</p>
-    <p>Your activist.org Team</p>
+    <p>Your activist team</p>
 </body>
-</html>
+</html>
diff --git a/backend/authentication/templates/signup_email.html b/backend/authentication/templates/signup_email.html
@@ -11,6 +11,7 @@
     <p>Please click the button below to confirm your email address:</p>
     <a href="{{confirmation_link}}" style="display: inline-block; padding: 10px 20px; background-color: #000; color: #fff; text-decoration: none;">Confirm Email</a>
 
-    <p>Kind Regards</p>
+    <p>Best regards,</p>
+    <p>Your activist team</p>
 </body>
-</html>
+</html>
diff --git a/backend/authentication/tests.py b/backend/authentication/tests.py
@@ -112,7 +112,7 @@ def test_signup(client: Client) -> None:
     assert response.status_code == 201
     assert UserModel.objects.filter(username=username)
     # code for Email confirmation is generated and is a UUID
-    assert isinstance(user.code, UUID)
+    assert isinstance(user.verifictaion_code, UUID)
     assert user.is_confirmed is False
     # Confirmation Email was sent
     assert len(mail.outbox) == 1
@@ -148,7 +148,7 @@ def test_signup(client: Client) -> None:
     assert UserModel.objects.filter(username=second_username).exists()
     assert user.email == ""
     assert user.is_confirmed is False
-    assert user.code is None
+    assert user.verifictaion_code is None
 
 
 @pytest.mark.django_db

diff --git a/backend/authentication/views.py b/backend/authentication/views.py
@@ -2,18 +2,13 @@
 import uuid
 from uuid import UUID
 
-
 import dotenv
 from django.contrib.auth import login
 from django.core.mail import send_mail
 from django.template.loader import render_to_string
-from drf_spectacular.utils import OpenApiParameter, extend_schema
-
-from django.contrib.auth import get_user_model, login
-from django.contrib.auth.models import User
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
-
+from drf_spectacular.utils import OpenApiParameter, extend_schema
 from rest_framework import status, viewsets
 from rest_framework.permissions import AllowAny, IsAuthenticated
 from rest_framework.request import Request
@@ -96,9 +91,9 @@ def post(self, request: Request) -> Response:
         user: UserModel = serializer.save()
 
         if user.email != "":
-            user.code = uuid.uuid4()
+            user.verifictaion_code = uuid.uuid4()
 
-            confirmation_link = f"{FRONTEND_BASE_URL}/confirm/{user.code}"
+            confirmation_link = f"{FRONTEND_BASE_URL}/confirm/{user.verifictaion_code}"
             message = f"Welcome to activist.org, {user.username}!, Please confirm your email address by clicking the link: {confirmation_link}"
             html_message = render_to_string(
                 template_name="signup_email.html",
@@ -124,11 +119,13 @@ def post(self, request: Request) -> Response:
             status=status.HTTP_201_CREATED,
         )
 
-    @extend_schema(parameters=[OpenApiParameter(name="code", type=str, required=True)])
+    @extend_schema(
+        parameters=[OpenApiParameter(name="verifictaion_code", type=str, required=True)]
+    )
     def get(self, request: Request) -> Response:
         """Confirm a user's email address."""
-        code = request.GET.get("code")
-        user = UserModel.objects.filter(code=code).first()
+        verifictaion_code = request.GET.get("verifictaion_code")
+        user = UserModel.objects.filter(verifictaion_code=verifictaion_code).first()
 
         if user is None:
             return Response(
@@ -137,7 +134,7 @@ def get(self, request: Request) -> Response:
             )
 
         user.is_confirmed = True
-        user.code = ""
+        user.verifictaion_code = ""
         user.save()
 
         return Response(
@@ -186,9 +183,9 @@ def get(self, request: Request) -> Response:
                 status=status.HTTP_404_NOT_FOUND,
             )
 
-        user.code = uuid.uuid4()
+        user.verifictaion_code = uuid.uuid4()
 
-        pwreset_link = f"{FRONTEND_BASE_URL}/pwreset/{user.code}"
+        pwreset_link = f"{FRONTEND_BASE_URL}/pwreset/{user.verifictaion_code}"
         message = "Reset your password at activist.org"
         html_message = render_to_string(
             template_name="pwreset_email.html",