Remove auth.User model

Author: davegaeddert

bolt-auth/bolt/auth/forms.py

@@ -2,7 +2,6 @@
 
 from bolt import forms
 from bolt.auth import authenticate, get_user_model, password_validation
-from bolt.auth.models import User
 from bolt.auth.tokens import default_token_generator
 from bolt.db.forms import ModelForm
 from bolt.exceptions import ValidationError
@@ -98,7 +97,7 @@ class BaseUserCreationForm(ModelForm):
     )
 
     class Meta:
-        model = User
+        model = get_user_model()
         fields = ("username",)
         field_classes = {"username": UsernameField}
 
@@ -149,7 +148,10 @@ class UserCreationForm(BaseUserCreationForm):
     def clean_username(self):
         """Reject usernames that differ only in case."""
         username = self.cleaned_data.get("username")
-        if username and User.objects.filter(username__iexact=username).exists():
+        if (
+            username
+            and get_user_model().objects.filter(username__iexact=username).exists()
+        ):
             raise forms.ValidationError(self.error_messages["unique"], code="unique")
         else:
             return username
@@ -166,7 +168,7 @@ class UserChangeForm(ModelForm):
     )
 
     class Meta:
-        model = User
+        model = get_user_model()
         fields = "__all__"
         field_classes = {"username": UsernameField}
 

bolt-auth/bolt/auth/migrations/0003_delete_user.py

@@ -0,0 +1,15 @@
+# Generated by Bolt 5.0.dev20240205033503 on 2024-02-05 03:42
+
+from bolt.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("auth", "0002_remove_user_is_superuser"),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name="User",
+        ),
+    ]

bolt-auth/bolt/auth/models.py

@@ -205,15 +205,3 @@ def normalize_username(cls, username):
             if isinstance(username, str)
             else username
         )
-
-
-class User(AbstractUser):
-    """
-    Users within the Bolt authentication system are represented by this
-    model.
-
-    Username and password are required. Other fields are optional.
-    """
-
-    class Meta(AbstractUser.Meta):
-        swappable = "AUTH_USER_MODEL"