From fd382d18f9c4b341b9d7e41c2a0b36ce7f0673b3 Mon Sep 17 00:00:00 2001 From: Gaurav Sheni Date: Thu, 21 Jun 2018 13:08:53 -0400 Subject: [PATCH] Update serializers.py --- rest_auth/serializers.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_auth/serializers.py b/rest_auth/serializers.py index 45729b2..dc7dcdb 100644 --- a/rest_auth/serializers.py +++ b/rest_auth/serializers.py @@ -1,13 +1,14 @@ from django.contrib.auth import get_user_model, authenticate from django.conf import settings 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.encoding import force_text from rest_framework import serializers, exceptions from rest_framework.exceptions import ValidationError +from allauth.account.forms import default_token_generator +from allauth.account.utils import url_str_to_user_pk from .models import TokenModel from .utils import import_callable @@ -202,7 +203,7 @@ class PasswordResetConfirmSerializer(serializers.Serializer): # Decode the uidb64 to uid to get User object try: - uid = force_text(uid_decoder(attrs['uid'])) + uid = url_str_to_user_pk(attrs['uid']) self.user = UserModel._default_manager.get(pk=uid) except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist): raise ValidationError({'uid': ['Invalid value']})