diff --git a/apps/auth/backend.py b/apps/auth/backend.py index 125f411a..41568b52 100644 --- a/apps/auth/backend.py +++ b/apps/auth/backend.py @@ -6,16 +6,12 @@ User = get_user_model() class CaseInsensitiveModelBackend(ModelBackend): - def authenticate(self, username=None, password=None): + def authenticate(self, request, username=None, password=None, **kwargs): + if username is None: + username = kwargs.get(User.USERNAME_FIELD) try: user = User.objects.get(**{f'{User.USERNAME_FIELD}__iexact': username}) - if user.check_password(password): + if user.check_password(password) and self.user_can_authenticate(user): return user except User.DoesNotExist: return None - - def get_user(self, user_id): - try: - return User.objects.get(pk=user_id) - except User.DoesNotExist: - return None