Fix: Always annotate deterministic email on queryset in user admin

So admins of User subclasses have access to search field

froide/account/admin.py

@@ -24,7 +24,14 @@
 from . import account_email_changed
 from .auth import MFAAndRecentAuthRequiredAdminMixin, RecentAuthRequiredAdminMixin
 from .forms import UserChangeForm, UserCreationForm
-from .models import AccountBlocklist, TaggedUser, User, UserPreference, UserTag
+from .models import (
+    AccountBlocklist,
+    TaggedUser,
+    User,
+    UserPreference,
+    UserTag,
+    annotate_deterministic_email,
+)
 from .services import AccountService
 from .tasks import merge_accounts_task, send_bulk_mail, start_export_task
 from .utils import (
@@ -135,6 +142,12 @@ class UserAdmin(RecentAuthRequiredAdminMixin, DjangoUserAdmin):
 
     def get_queryset(self, request):
         qs = super().get_queryset(request)
+        # Anotate deterministic email on queryset
+        # as the user admin may also be used on
+        # subclasses of User with other default managers
+        # where deterministic email would otherwise not be available
+        qs = annotate_deterministic_email(qs)
+
         if has_foirequests:
             qs = qs.annotate(request_count=Count("foirequest"))
 

froide/account/models.py

@@ -46,16 +46,19 @@ class Meta:
         verbose_name_plural = _("tagged users")
 
 
+def annotate_deterministic_email(queryset):
+    return queryset.annotate(
+        email_deterministic=Collate("email", "und-x-icu"),
+    )
+
+
 class UserManager(BaseUserManager):
     def get_public_profiles(self) -> QuerySet:
         return super().get_queryset().filter(is_active=True, private=False)
 
     def get_queryset(self) -> QuerySet:
         qs = super().get_queryset()
-        qs = qs.annotate(
-            email_deterministic=Collate("email", "und-x-icu"),
-        )
-        return qs
+        return annotate_deterministic_email(qs)
 
     def _create_user(
         self,