Update msg tips of user login (#6708)

* Update serializers.py

* Update forms.py

* Update serializers.py

* update-uni-test

seahub/api2/serializers.py

@@ -74,14 +74,22 @@ def validate(self, attrs):
             raise serializers.ValidationError('invalid params')
 
         if login_id and password:
-            user = authenticate(username=login_id, password=password)
-            if user:
+            # First check the user is active or not
+            username = Profile.objects.convert_login_str_to_username(login_id)
+            if username is None:
+                username = login_id
+            try:
+                user = User.objects.get(username)
                 if not user.is_active:
                     raise serializers.ValidationError('User account is disabled.')
-            else:
+            except User.DoesNotExist:
+                pass
+
+            # Second check the password correct or not
+            user = authenticate(username=login_id, password=password)
+            if not user:
                 """try login id/contact email"""
                 # convert login id or contact email to username if any
-                username = Profile.objects.convert_login_str_to_username(login_id)
                 user = authenticate(username=username, password=password)
                 # After local user authentication process is completed, authenticate LDAP user
                 if user is None and ENABLE_LDAP:

seahub/auth/forms.py

@@ -46,6 +46,17 @@ def clean(self):
         password = self.cleaned_data.get('password')
 
         if username and password:
+            # First check user account active or not
+            email = Profile.objects.convert_login_str_to_username(username)
+            try:
+                user = User.objects.get(email=email)
+                if not user.is_active:
+                    self.errors['inactive'] = _("This account is inactive.")
+                    raise forms.ValidationError(_("This account is inactive."))
+            except User.DoesNotExist:
+                pass
+
+            # Second check the password correct or not
             self.user_cache = authenticate(username=username, password=password)
             if self.user_cache is None:
                 """then try login id/contact email/primary id"""

tests/api/test_serializers.py

@@ -91,7 +91,8 @@ def test_inactive_user_incorrect_password(self):
         }
 
         s = AuthTokenSerializer(data=d, context={'request': self.fake_request})
-        self.assertFailed(s)
+        assert s.is_valid() is False
+        assert 'User account is disabled.' in s.errors['non_field_errors']
 
     def test_login_failed(self):
         d = {

tests/seahub/auth/forms/test_authentication.py

@@ -51,7 +51,8 @@ def test_inactive_user_incorrect_password(self):
         }
 
         form = AuthenticationForm(None, data)
-        self.assertFailed(form)
+        assert form.is_valid() is False
+        assert 'This account is inactive.' in form.non_field_errors()
 
     def test_login_success(self):
         data = {