Fix/blank true (#270)

* fix: Improved the email verification message if the user hasn't verified email (#245)

Author: TreyWW

backend/migrations/0029_alter_invoice_organization_alter_invoice_user_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.0.3 on 2024-04-01 19:49
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("backend", "0028_quotalimit_quotaincreaserequest_quotaoverrides_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="invoice",
+            name="organization",
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to="backend.team"),
+        ),
+        migrations.AlterField(
+            model_name="invoice",
+            name="user",
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name="user",
+            name="logged_in_as_team",
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to="backend.team"),
+        ),
+    ]

backend/models.py

@@ -44,7 +44,7 @@ def get_queryset(self):
 class User(AbstractUser):
     objects = CustomUserManager()
 
-    logged_in_as_team = models.ForeignKey("Team", on_delete=models.SET_NULL, null=True)
+    logged_in_as_team = models.ForeignKey("Team", on_delete=models.SET_NULL, null=True, blank=True)
     awaiting_email_verification = models.BooleanField(default=True)
 
     class Role(models.TextChoices):
@@ -265,8 +265,8 @@ class Invoice(models.Model):
         ("overdue", "Overdue"),
     )
 
-    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True)
-    organization = models.ForeignKey(Team, on_delete=models.CASCADE, null=True)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, null=True, blank=True)
+    organization = models.ForeignKey(Team, on_delete=models.CASCADE, null=True, blank=True)
     invoice_id = models.IntegerField(unique=True, blank=True, null=True)  # todo: add
 
     client_to = models.ForeignKey(Client, on_delete=models.SET_NULL, blank=True, null=True)

backend/views/core/auth/create_account.py

@@ -79,8 +79,10 @@ def post(self, request):
             return render(request, "pages/auth/create_account_manual.html")
 
         created_user = User.objects.create_user(email=email, username=email, password=password)
-        created_user.is_active = False
+        created_user.awaiting_email_verification = True
         created_user.save()
+        # created_user.is_active = False
+        # created_user.save()
 
         user = authenticate(request, username=email, password=password)
         if not user:

backend/views/core/auth/login.py

@@ -5,7 +5,7 @@
 from django.contrib.auth.hashers import check_password
 from django.core.validators import validate_email
 from django.http import HttpRequest
-from django.urls import reverse, resolve
+from django.urls import resolve
 from django.urls.exceptions import Resolver404
 from django.utils.decorators import method_decorator
 from django.views import View
@@ -73,6 +73,10 @@ def login_manual(request: HttpRequest):  # HTMX POST
         messages.error(request, "Incorrect email or password")
         return render_toast_message(request)
 
+    if user.awaiting_email_verification and ARE_EMAILS_ENABLED:
+        messages.error(request, "You must verify your email before logging in.")
+        return render_toast_message(request)
+
     login(request, user)
     messages.success(request, "Successfully logged in")
 
@@ -83,7 +87,7 @@ def login_manual(request: HttpRequest):  # HTMX POST
         response["HX-Location"] = next
     except Resolver404:
         print(f"did not resolve: {next}")
-        ...
+        response["HX-Location"] = "/dashboard/"
 
     return response
 
@@ -140,7 +144,7 @@ def send_magic_link_email(self, request: HttpRequest, user: User, uuid: str, pla
             message=f"""
             Hi {user.first_name if user.first_name else "User"},
 
-            A login request was made on your MyFinances account. If this was not you, please ignore 
+            A login request was made on your MyFinances account. If this was not you, please ignore
             this email.
 
             If you would like to login, please use the following link: \n {magic_link_url}