mirror of
https://github.com/Tivix/django-rest-auth.git
synced 2024-11-22 09:06:40 +03:00
Update serializers.py
This commit is contained in:
parent
3c36004c44
commit
a215b79d3a
|
@ -1,14 +1,21 @@
|
||||||
from django.contrib.auth import get_user_model, authenticate
|
from django.contrib.auth import get_user_model, authenticate
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
|
from django.contrib.auth.forms import PasswordResetForm, SetPasswordForm
|
||||||
from django.contrib.auth.tokens import default_token_generator
|
|
||||||
from django.utils.http import urlsafe_base64_decode as uid_decoder
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from django.utils.encoding import force_text
|
from django.utils.encoding import force_text
|
||||||
|
|
||||||
from rest_framework import serializers, exceptions
|
from rest_framework import serializers, exceptions
|
||||||
from rest_framework.exceptions import ValidationError
|
from rest_framework.exceptions import ValidationError
|
||||||
|
|
||||||
|
try:
|
||||||
|
from allauth.account.forms import default_token_generator
|
||||||
|
from allauth.account.utils import url_str_to_user_pk
|
||||||
|
decoder = url_str_to_user_pk
|
||||||
|
except ImportError:
|
||||||
|
from django.contrib.auth.tokens import default_token_generator
|
||||||
|
from django.utils.http import urlsafe_base64_decode as uid_decoder
|
||||||
|
decoder = uid_decoder
|
||||||
|
|
||||||
from .models import TokenModel
|
from .models import TokenModel
|
||||||
from .utils import import_callable
|
from .utils import import_callable
|
||||||
|
|
||||||
|
@ -205,7 +212,7 @@ class PasswordResetConfirmSerializer(serializers.Serializer):
|
||||||
|
|
||||||
# Decode the uidb64 to uid to get User object
|
# Decode the uidb64 to uid to get User object
|
||||||
try:
|
try:
|
||||||
uid = force_text(uid_decoder(attrs['uid']))
|
uid = force_text(decoder(attrs['uid']))
|
||||||
self.user = UserModel._default_manager.get(pk=uid)
|
self.user = UserModel._default_manager.get(pk=uid)
|
||||||
except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
|
except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
|
||||||
raise ValidationError({'uid': ['Invalid value']})
|
raise ValidationError({'uid': ['Invalid value']})
|
||||||
|
|
Loading…
Reference in New Issue
Block a user