add UserInactiveError

df_auth/backends.py

@@ -9,6 +9,7 @@
 
 from .exceptions import (
  UserDoesNotExistError,
+ UserInactiveError,
  WrongOTPError,
 )
 from .settings import api_settings
@@ -58,7 +59,7 @@ def generate_challenge(
 
  if not user:
  user = User.objects.filter(
- **{self.identity_field: kwargs.get(self.identity_field)}, is_active=True
+ **{self.identity_field: kwargs.get(self.identity_field)}
  ).first()
  if not user:
  if api_settings.OTP_AUTO_CREATE_ACCOUNT and api_settings.SIGNUP_ALLOWED:
@@ -75,6 +76,8 @@ def generate_challenge(
  )
  else:
  raise UserDoesNotExistError()
+ if not user.is_active:
+ raise UserInactiveError()
 
  device, _ = self.DeviceModel.objects.get_or_create(
  user=user,

df_auth/exceptions.py

@@ -43,6 +43,15 @@ class UserDoesNotExistError(DfAuthValidationError):
  default_code = "user_does_not_exist"
 
 
+class UserInactiveError(DfAuthValidationError):
+ """
+ This exception is used when user already exists
+ """
+
+ default_detail = _("Your account was deactivated. Please contact support")
+ default_code = "user_inactive"
+
+
 class DeviceTakenError(DfAuthValidationError):
  """
  This exception is used when device is already registered

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "django-df-auth"
-version = "1.0.0"
+version = "1.0.1"
 description = "Opinionated Django REST auth endpoints for JWT authentication and social accounts."
 readme = "README.md"
 authors = [{name = "Apexive OSS", email = "open-source@apexive.com"}]

tests/test_app/tests.py

@@ -781,6 +781,33 @@ def test_user_2fa_update(self) -> None:
  self.assertTrue(response.data["is_required"])
 
 
+class InactiveUserAPITest(APITestCase):
+ def setUp(self) -> None:
+ # Create a test user and set up any other objects you need
+ self.email = "test@te.st"
+ self.user = User.objects.create_user(
+ username="testuser", password="testpass", is_active=False, email=self.email
+ )
+ self.client = APIClient()
+
+ def test_inactive_user_request_otp(self) -> None:
+ email_device = EmailDevice.objects.create(
+ user=self.user,
+ name=self.email,
+ email=self.email,
+ confirmed=True,
+ )
+
+ response = self.client.post(
+ "/api/v1/auth/otp/",
+ {
+ "email": email_device.email,
+ },
+ )
+ self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+ self.assertEqual(response.json()["errors"][0]["code"], "user_inactive")
+
+
 def test_create_superuser() -> None:
  User.objects.create_superuser(
  username="testuser",