Update contrib.auth for Django 5.1 (#2555)

* Update contrib.auth for Django 5.1

From django/django@00e1879:
* `django.contrib.auth.base_user.BaseUserManager.make_random_password` removed

From django/django@f64c528:

* `django.contrib.auth.forms.AdminPasswordChangeForm.clean_password2` removed
* `django.contrib.auth.forms.BaseUserCreationForm.clean_password2` removed
* `django.contrib.auth.forms.SetPasswordForm.clean_new_password2` removed
* `django.contrib.auth.forms.SetPasswordMixin` added

From django/django@e626716:

* `django.contrib.auth.forms.AdminPasswordChangeForm.usable_password_help_text` added

From django/django@da22e6c:

* `django.contrib.auth.forms.SetUnusablePasswordMixin` added
* `django.contrib.auth.forms.AdminUserCreationForm` added

From django/django@c7fc9f2:

* `django.contrib.auth.middleware.LoginRequiredMiddleware` added

* ClassVar

Co-authored-by: sobolevn <mail@sobolevn.me>

* _ErrorMessagesDict

* import

---------

Co-authored-by: sobolevn <mail@sobolevn.me>

Author: adamchainz

django-stubs/contrib/auth/base_user.pyi

@@ -12,7 +12,6 @@ _T = TypeVar("_T", bound=Model)
 class BaseUserManager(models.Manager[_T]):
     @classmethod
     def normalize_email(cls, email: str | None) -> str: ...
-    def make_random_password(self, length: int = ..., allowed_chars: str = ...) -> str: ...
     def get_by_natural_key(self, username: str | None) -> _T: ...
 
 class AbstractBaseUser(models.Model):

django-stubs/contrib/auth/forms.pyi

@@ -11,6 +11,7 @@ from django.db.models.fields import _ErrorMessagesDict
 from django.forms.fields import _ClassLevelWidgetT
 from django.forms.widgets import Widget
 from django.http.request import HttpRequest
+from django.utils.functional import _StrOrPromise
 from typing_extensions import TypeAlias
 
 logger: Logger
@@ -31,12 +32,42 @@ class UsernameField(forms.CharField):
     def to_python(self, value: Any | None) -> Any | None: ...
     def widget_attrs(self, widget: Widget) -> dict[str, Any]: ...
 
+class SetPasswordMixin:
+    error_messages: _ErrorMessagesDict
+
+    @staticmethod
+    def create_password_fields(
+        label1: _StrOrPromise = ..., label2: _StrOrPromise = ...
+    ) -> tuple[forms.CharField, forms.CharField]: ...
+    def validate_passwords(
+        self,
+        password1_field_name: str = ...,
+        password2_field_name: str = ...,
+    ) -> None: ...
+    def validate_password_for_user(self, user: AbstractBaseUser, password_field_name: str = "password2") -> None: ...
+    def set_password_and_save(
+        self, user: AbstractBaseUser, password_field_name: str = "password1", commit: bool = True
+    ) -> AbstractBaseUser: ...
+
+class SetUnusablePasswordMixin:
+    usable_password_help_text: _StrOrPromise
+
+    @staticmethod
+    def create_usable_password_field(help_text: _StrOrPromise = ...) -> forms.ChoiceField: ...
+    def validate_passwords(
+        self,
+        password1_field_name: str = ...,
+        password2_field_name: str = ...,
+        usable_password_field_name: str = ...,
+    ) -> None: ...
+    def validate_password_for_user(self, user: AbstractBaseUser, **kwargs: Any) -> None: ...
+    def set_password_and_save(self, user: _User, commit: bool = True, **kwargs: Any) -> _User: ...
+
 class BaseUserCreationForm(forms.ModelForm[_User]):
     error_messages: _ErrorMessagesDict
     password1: forms.Field
     password2: forms.Field
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-    def clean_password2(self) -> str: ...
     def save(self, commit: bool = ...) -> _User: ...
 
 class UserCreationForm(BaseUserCreationForm[_User]):
@@ -90,7 +121,6 @@ class SetPasswordForm(forms.Form):
     new_password2: forms.Field
     user: AbstractBaseUser
     def __init__(self, user: AbstractBaseUser, *args: Any, **kwargs: Any) -> None: ...
-    def clean_new_password2(self) -> str: ...
     def save(self, commit: bool = ...) -> AbstractBaseUser: ...
 
 class PasswordChangeForm(SetPasswordForm):
@@ -101,11 +131,14 @@ class PasswordChangeForm(SetPasswordForm):
 class AdminPasswordChangeForm(forms.Form):
     error_messages: _ErrorMessagesDict
     required_css_class: str
+    usable_password_help_text: str
     password1: forms.Field
     password2: forms.Field
     user: AbstractBaseUser
     def __init__(self, user: AbstractBaseUser, *args: Any, **kwargs: Any) -> None: ...
-    def clean_password2(self) -> str: ...
     def save(self, commit: bool = ...) -> AbstractBaseUser: ...
     @property
     def changed_data(self) -> list[str]: ...
+
+class AdminUserCreationForm(SetUnusablePasswordMixin, UserCreationForm):
+    usable_password: forms.ChoiceField = ...

django-stubs/contrib/auth/middleware.pyi

@@ -1,6 +1,8 @@
+from typing import Any, Callable, ClassVar
+
 from django.contrib.auth.base_user import _UserModel
 from django.contrib.auth.models import AnonymousUser
-from django.http.request import HttpRequest
+from django.http import HttpRequest, HttpResponseBase, HttpResponseRedirect
 from django.utils.deprecation import MiddlewareMixin
 
 def get_user(request: HttpRequest) -> AnonymousUser | _UserModel: ...
@@ -9,6 +11,22 @@ async def auser(request: HttpRequest) -> AnonymousUser | _UserModel: ...
 class AuthenticationMiddleware(MiddlewareMixin):
     def process_request(self, request: HttpRequest) -> None: ...
 
+class LoginRequiredMiddleware(MiddlewareMixin):
+    redirect_field_name: ClassVar[str]
+
+    def process_view(
+        self,
+        request: HttpRequest,
+        view_func: Callable[..., HttpResponseBase],
+        view_args: tuple[Any, ...],
+        view_kwargs: dict[Any, Any],
+    ) -> HttpResponseBase | None: ...
+    def get_login_url(self, view_func: Callable[..., HttpResponseBase]) -> str: ...
+    def get_redirect_field_name(self, view_func: Callable[..., HttpResponseBase]) -> str: ...
+    def handle_no_permission(
+        self, request: HttpRequest, view_func: Callable[..., HttpResponseBase]
+    ) -> HttpResponseRedirect: ...
+
 class RemoteUserMiddleware(MiddlewareMixin):
     header: str
     force_logout_if_no_header: bool

scripts/stubtest/allowlist_todo.txt

@@ -67,6 +67,7 @@ django.contrib.auth.backends.RemoteUserBackend.authenticate
 django.contrib.auth.base_user.AbstractBaseUser.last_login
 django.contrib.auth.base_user.AbstractBaseUser.password
 django.contrib.auth.decorators.login_required
+django.contrib.auth.forms.AdminUserCreationForm.declared_fields
 django.contrib.auth.forms.BaseUserCreationForm.declared_fields
 django.contrib.auth.forms.UserChangeForm.declared_fields
 django.contrib.auth.forms.UserCreationForm.declared_fields

scripts/stubtest/allowlist_todo_django51.txt

@@ -3,16 +3,6 @@
 # Only discrepancies that appeared after Django 5.0 -> 5.1 update.
 # Unsorted: there are real problems and things we can really ignore:
 
-django.contrib.auth.base_user.BaseUserManager.make_random_password
-django.contrib.auth.forms.AdminPasswordChangeForm.clean_password2
-django.contrib.auth.forms.AdminPasswordChangeForm.usable_password_help_text
-django.contrib.auth.forms.BaseUserCreationForm.clean_password2
-django.contrib.auth.forms.SetPasswordForm.clean_new_password2
-django.contrib.auth.forms.SetPasswordMixin
-django.contrib.auth.forms.SetUnusablePasswordMixin
-django.contrib.auth.forms.AdminUserCreationForm
-django.contrib.auth.middleware.LoginRequiredMiddleware
-django.contrib.auth.models.BaseUserManager.make_random_password
 django.contrib.contenttypes.fields.GenericForeignKey.cache_name
 django.contrib.contenttypes.fields.GenericForeignKey.get_attname_column
 django.contrib.contenttypes.models.ContentType.get_object_for_this_type