Browse Source

Improve anonymize_content docstring

Rafał Pitoń 7 years ago
parent
commit
25edb605f5
2 changed files with 7 additions and 3 deletions
  1. 2 2
      misago/users/authbackends.py
  2. 5 1
      misago/users/models/user.py

+ 2 - 2
misago/users/authbackends.py

@@ -7,8 +7,8 @@ UserModel = get_user_model()
 
 
 class MisagoBackend(ModelBackend):
 class MisagoBackend(ModelBackend):
     def authenticate(self, request, username=None, password=None, **kwargs):
     def authenticate(self, request, username=None, password=None, **kwargs):
-        if username is None:
-            username = kwargs.get(UserModel.USERNAME_FIELD)
+        if kwargs.get('email'):
+            username = kwargs['email']  # Bias to email if it was passed explictly
 
 
         try:
         try:
             user = UserModel.objects.get_by_username_or_email(username)
             user = UserModel.objects.get_by_username_or_email(username)

+ 5 - 1
misago/users/models/user.py

@@ -317,7 +317,11 @@ class User(AbstractBaseUser, PermissionsMixin):
         self.save(update_fields=['is_active', 'is_deleting_account'])
         self.save(update_fields=['is_active', 'is_deleting_account'])
 
 
     def anonymize_content(self):
     def anonymize_content(self):
-        # Replace username on associated items with anonymous one
+        """Replaces username with anonymized one, then send anonymization signal.
+
+        Items associated with this user then anonymize their user-specific data
+        like username or IP addresses.
+        """
         self.username = settings.MISAGO_ANONYMOUS_USERNAME
         self.username = settings.MISAGO_ANONYMOUS_USERNAME
         self.slug = slugify(self.username)
         self.slug = slugify(self.username)