p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #24315 -- Fixed auth.views.password_reset_confirm() with a UUID user.

This commit is contained in:
Tim Graham 2015-02-13 09:12:30 -05:00
parent fdf20093e0
commit 002425fe39
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/contrib/auth/views.py
View File

@ -17,6 +17,7 @@ from django.http import HttpResponseRedirect, QueryDict
from django.shortcuts import resolve_url from django.shortcuts import resolve_url
from django.template.response import TemplateResponse from django.template.response import TemplateResponse
from django.utils.deprecation import RemovedInDjango20Warning from django.utils.deprecation import RemovedInDjango20Warning
from django.utils.encoding import force_text
from django.utils.http import is_safe_url, urlsafe_base64_decode from django.utils.http import is_safe_url, urlsafe_base64_decode
from django.utils.six.moves.urllib.parse import urlparse, urlunparse from django.utils.six.moves.urllib.parse import urlparse, urlunparse
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
@ -230,7 +231,8 @@ def password_reset_confirm(request, uidb64=None, token=None,
else: else:
post_reset_redirect = resolve_url(post_reset_redirect) post_reset_redirect = resolve_url(post_reset_redirect)
try: try:
uid = urlsafe_base64_decode(uidb64) # urlsafe_base64_decode() decodes to bytestring on Python 3
uid = force_text(urlsafe_base64_decode(uidb64))
user = UserModel._default_manager.get(pk=uid) user = UserModel._default_manager.get(pk=uid)
except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist): except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
user = None user = None

23
tests/auth_tests/test_views.py
View File

@ -334,10 +334,11 @@ class PasswordResetTest(AuthViewsTestCase):
@override_settings(AUTH_USER_MODEL='auth.CustomUser') @override_settings(AUTH_USER_MODEL='auth.CustomUser')
class CustomUserPasswordResetTest(AuthViewsTestCase): class CustomUserPasswordResetTest(AuthViewsTestCase):
fixtures = ['custom_user.json'] fixtures = ['custom_user.json']
user_email = 'staffmember@example.com'
def _test_confirm_start(self): def _test_confirm_start(self):
# Start by creating the email # Start by creating the email
response = self.client.post('/password_reset/', {'email': 'staffmember@example.com'}) response = self.client.post('/password_reset/', {'email': self.user_email})
self.assertEqual(response.status_code, 302) self.assertEqual(response.status_code, 302)
self.assertEqual(len(mail.outbox), 1) self.assertEqual(len(mail.outbox), 1)
return self._read_signup_email(mail.outbox[0]) return self._read_signup_email(mail.outbox[0])
@ -352,6 +353,26 @@ class CustomUserPasswordResetTest(AuthViewsTestCase):
response = self.client.get(path) response = self.client.get(path)
# redirect to a 'complete' page: # redirect to a 'complete' page:
self.assertContains(response, "Please enter your new password") self.assertContains(response, "Please enter your new password")
# then submit a new password
response = self.client.post(path, {
'new_password1': 'anewpassword',
'new_password2': 'anewpassword',
})
self.assertRedirects(response, '/reset/done/')
@override_settings(AUTH_USER_MODEL='auth.UUIDUser')
class UUIDUserPasswordResetTest(CustomUserPasswordResetTest):
fixtures = None
def _test_confirm_start(self):
# instead of fixture
UUIDUser.objects.create_user(
email=self.user_email,
username='foo',
password='foo',
)
return super(UUIDUserPasswordResetTest, self)._test_confirm_start()
class ChangePasswordTest(AuthViewsTestCase): class ChangePasswordTest(AuthViewsTestCase):