Tivix/django-rest-auth
1
1
Fork 0
mirror of https://github.com/Tivix/django-rest-auth.git synced 2025-07-04 19:23:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update serializers.py

Browse Source 
Login via username or email fixed in LoginSerializer!
This commit is contained in:
Dominic Michael Silveira 2019-06-20 22:59:20 +05:30 committed by GitHub
parent 624ad01afb
commit a6ad8d20b1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
rest_auth/serializers.py
View File

@ -16,71 +16,37 @@ from .utils import import_callable
UserModel = get_user_model() UserModel = get_user_model()
class LoginSerializer(serializers.Serializer): class LoginSerializer(Serializer):
username = serializers.CharField(required=False, allow_blank=True) username = CharField(required=False, allow_blank=True)
email = serializers.EmailField(required=False, allow_blank=True) email = EmailField(required=False, allow_blank=True)
password = serializers.CharField(style={'input_type': 'password'}) password = CharField(style={'input_type': 'password'})
def authenticate(self, **kwargs): def authenticate(self, **kwargs):
return authenticate(self.context['request'], **kwargs) return authenticate(self.context['request'], **kwargs)
def _validate_email(self, email, password):
user = None
if email and password:
user = self.authenticate(email=email, password=password)
else:
msg = _('Must include "email" and "password".')
raise exceptions.ValidationError(msg)
return user
def _validate_username(self, username, password):
user = None
if username and password:
user = self.authenticate(username=username, password=password)
else:
msg = _('Must include "username" and "password".')
raise exceptions.ValidationError(msg)
return user
def _validate_username_email(self, username, email, password): def _validate_username_email(self, username, email, password):
user = None user = None
if email and password: if email and password:
user = self.authenticate(email=email, password=password) # Get User object with email
user_obj=User.objects.get(email=email)
#Get access to username via the User object
user = self.authenticate(username=user_obj.username, password=password)
elif username and password: elif username and password:
user = self.authenticate(username=username, password=password) user = self.authenticate(username=username, password=password)
else: else:
msg = _('Must include either "username" or "email" and "password".') msg = _('Must include either "username" or "email" and "password".')
raise exceptions.ValidationError(msg) raise exceptions.ValidationError(msg)
return user return user
def validate(self, attrs): def validate(self, attrs):
username = attrs.get('username') username = attrs.get('username')
email = attrs.get('email') email = attrs.get('email')
password = attrs.get('password') password = attrs.get('password')
user = None user = None
if 'allauth' in settings.INSTALLED_APPS: if 'allauth' in settings.INSTALLED_APPS:
from allauth.account import app_settings # those if-elif loop doesn't work, it focuses only on (username and password) everytime
# authenticate if (email and password) or (username and password)
# Authentication through email
if app_settings.AUTHENTICATION_METHOD == app_settings.AuthenticationMethod.EMAIL:
user = self._validate_email(email, password)
# Authentication through username
elif app_settings.AUTHENTICATION_METHOD == app_settings.AuthenticationMethod.USERNAME:
user = self._validate_username(username, password)
# Authentication through either username or email
else:
user = self._validate_username_email(username, email, password) user = self._validate_username_email(username, email, password)
else: else:
# Authentication without using allauth # Authentication without using allauth
if email: if email:
@ -88,10 +54,8 @@ class LoginSerializer(serializers.Serializer):
username = UserModel.objects.get(email__iexact=email).get_username() username = UserModel.objects.get(email__iexact=email).get_username()
except UserModel.DoesNotExist: except UserModel.DoesNotExist:
pass pass
if username: if username:
user = self._validate_username_email(username, '', password) user = self._validate_username_email(username, '', password)
# Did we get back an active user? # Did we get back an active user?
if user: if user:
if not user.is_active: if not user.is_active:
@ -100,7 +64,6 @@ class LoginSerializer(serializers.Serializer):
else: else:
msg = _('Unable to log in with provided credentials.') msg = _('Unable to log in with provided credentials.')
raise exceptions.ValidationError(msg) raise exceptions.ValidationError(msg)
# If required, is the email verified? # If required, is the email verified?
if 'rest_auth.registration' in settings.INSTALLED_APPS: if 'rest_auth.registration' in settings.INSTALLED_APPS:
from allauth.account import app_settings from allauth.account import app_settings
@ -108,7 +71,6 @@ class LoginSerializer(serializers.Serializer):
email_address = user.emailaddress_set.get(email=user.email) email_address = user.emailaddress_set.get(email=user.email)
if not email_address.verified: if not email_address.verified:
raise serializers.ValidationError(_('E-mail is not verified.')) raise serializers.ValidationError(_('E-mail is not verified.'))
attrs['user'] = user attrs['user'] = user
return attrs return attrs