Fixed Captcha Store

5 files changed, 65 insertions, 3 deletions

diff --git a/users/migrations/0005_captchastore_id_alter_captchastore_csrf_token.py b/users/migrations/0005_captchastore_id_alter_captchastore_csrf_token.py
new file mode 100644
index 00000000..bc3d86e5
--- /dev/null
+++ b/users/migrations/0005_captchastore_id_alter_captchastore_csrf_token.py
@@ -0,0 +1,24 @@
+# Generated by Django 4.0.6 on 2022-09-05 23:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0004_remove_captchastore_id_alter_captchastore_csrf_token'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='captchastore',
+            name='id',
+            field=models.BigAutoField(auto_created=True, default=1, primary_key=True, serialize=False, verbose_name='ID'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='captchastore',
+            name='csrf_token',
+            field=models.CharField(max_length=100),
+        ),
+    ]
diff --git a/users/migrations/0006_delete_captchastore.py b/users/migrations/0006_delete_captchastore.py
new file mode 100644
index 00000000..f324ff2f
--- /dev/null
+++ b/users/migrations/0006_delete_captchastore.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.0.6 on 2022-09-05 23:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0005_captchastore_id_alter_captchastore_csrf_token'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='CaptchaStore',
+        ),
+    ]
diff --git a/users/migrations/0007_captchastore.py b/users/migrations/0007_captchastore.py
new file mode 100644
index 00000000..15ac458a
--- /dev/null
+++ b/users/migrations/0007_captchastore.py
@@ -0,0 +1,22 @@
+# Generated by Django 4.0.6 on 2022-09-05 23:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0006_delete_captchastore'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CaptchaStore',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('captcha_string', models.CharField(max_length=6)),
+                ('csrf_token', models.CharField(max_length=100)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
index dab44f38..65840495 100644
--- a/users/models.py
+++ b/users/models.py
@@ -19,7 +19,7 @@ class UserProfile(models.Model):
         
 class CaptchaStore(models.Model):
     captcha_string = models.CharField(max_length=6)
-    csrf_token = models.CharField(max_length=100, primary_key=True)
+    csrf_token = models.CharField(max_length=100)
     created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
diff --git a/users/views.py b/users/views.py
index 3887480f..98ebd9e9 100644
--- a/users/views.py
+++ b/users/views.py
@@ -122,7 +122,7 @@ def send_verification_email(request):
     })
     message = strip_tags(message)
     send_mail(subject, message, 'That Computer Scientist <' + settings.EMAIL_HOST_USER + '>', [user.email])
-    messages.success(request, 'Verification email was sent! Please check your email.')
+    messages.success(request, 'Verification email was sent! Please check your email.', extra_tags='loginError')
     return HttpResponseRedirect(request.META.get('HTTP_REFERER'))
 
 def verify_email(request, uidb64, token):
@@ -135,7 +135,7 @@ def verify_email(request, uidb64, token):
     if user is not None and account_activation_token.check_token(user, token):
         user_profile.email_verified = True
         user_profile.save()
-        messages.success(request, 'Your email has been verified! You can now login.')
+        messages.success(request, 'Your email has been verified! You can now login.', extra_tags='loginError')
         return redirect('/')
     else:
         messages.error(request, 'The verification link is invalid!')