diff --git a/apps/account/custom_user_login.py b/apps/account/custom_user_login.py index 5f78bac..8b64339 100644 --- a/apps/account/custom_user_login.py +++ b/apps/account/custom_user_login.py @@ -20,6 +20,9 @@ class CustomLoginBackend(BaseBackend): def get_user(self, username): try: - return User.objects.filter(Q(email=username) | Q(phone_number=str(username)) | Q(id=int(username))).first() + if isinstance(username, int): + return User.objects.filter(id=int(username)).first() + return User.objects.filter(Q(email=username) | Q(phone_number=str(username))).first() + except User.DoesNotExist: return None diff --git a/apps/account/views/user.py b/apps/account/views/user.py index 10a5698..134b2bc 100644 --- a/apps/account/views/user.py +++ b/apps/account/views/user.py @@ -193,7 +193,7 @@ class UserVerifyView(CreateAPIView): user.set_password(kwargs['password']) user.save() else: - user = User.objects.flter(device_id=kwargs['device_id']).first() + user = User.objects.filter(device_id=kwargs['device_id']).first() if not user: user = User.objects.create(**kwargs)