Merge branch 'feat-add-fields-to-handle-authentication' into feat-han…

…dle-user-authentication

bc/users/admin.py

@@ -14,7 +14,7 @@ class UserChannelInline(admin.TabularInline):
 class UserAdmin(BaseUserAdmin):
     fieldsets = BaseUserAdmin.fieldsets + (  # type: ignore
         # Custom fields added on to the bottom
-        ("Extra Fields", {"fields": ["affiliation"]}),
+        ("Extra Fields", {"fields": ["affiliation", "email_confirmed"]}),
     )
     add_fieldsets = (
         (None, {"classes": ["wide"], "fields": ["email"]}),

bc/users/migrations/0003_user_activation_key_user_email_confirmed_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.7 on 2023-05-31 16:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("users", "0002_alter_user_affiliation_noop"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="user",
+            name="activation_key",
+            field=models.CharField(default="", max_length=40),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="email_confirmed",
+            field=models.BooleanField(
+                default=False,
+                help_text="The user has confirmed their email address",
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="key_expires",
+            field=models.DateTimeField(
+                blank=True,
+                help_text="The time and date when the user's activation_key expires",
+                null=True,
+            ),
+        ),
+    ]

bc/users/models.py

@@ -9,6 +9,16 @@ class User(AbstractDateTimeModel, AbstractUser):
         help_text="The email address of the user.",
         unique=True,
     )
+    activation_key = models.CharField(max_length=40, default="")
+    key_expires = models.DateTimeField(
+        help_text="The time and date when the user's activation_key expires",
+        blank=True,
+        null=True,
+    )
+    email_confirmed = models.BooleanField(
+        help_text="The user has confirmed their email address",
+        default=False,
+    )
     affiliation = models.TextField(help_text="User's affiliations", blank=True)
 
     @property