mirror of
https://github.com/django/django.git
synced 2025-11-07 07:15:35 +00:00
[1.11.x] Fixed #27891 -- Added PasswordResetConfirmView.post_reset_login_backend.
Backport of 5db465d5a6 from master
This commit is contained in:
@@ -10,7 +10,9 @@ from importlib import import_module
|
||||
from django.apps import apps
|
||||
from django.conf import settings
|
||||
from django.contrib.admin.models import LogEntry
|
||||
from django.contrib.auth import REDIRECT_FIELD_NAME, SESSION_KEY
|
||||
from django.contrib.auth import (
|
||||
BACKEND_SESSION_KEY, REDIRECT_FIELD_NAME, SESSION_KEY,
|
||||
)
|
||||
from django.contrib.auth.forms import (
|
||||
AuthenticationForm, PasswordChangeForm, SetPasswordForm,
|
||||
)
|
||||
@@ -331,6 +333,22 @@ class PasswordResetTest(AuthViewsTestCase):
|
||||
self.assertRedirects(response, '/reset/done/', fetch_redirect_response=False)
|
||||
self.assertIn(SESSION_KEY, self.client.session)
|
||||
|
||||
@override_settings(
|
||||
AUTHENTICATION_BACKENDS=[
|
||||
'django.contrib.auth.backends.ModelBackend',
|
||||
'django.contrib.auth.backends.AllowAllUsersModelBackend',
|
||||
]
|
||||
)
|
||||
def test_confirm_login_post_reset_custom_backend(self):
|
||||
# This backend is specified in the url().
|
||||
backend = 'django.contrib.auth.backends.AllowAllUsersModelBackend'
|
||||
url, path = self._test_confirm_start()
|
||||
path = path.replace('/reset/', '/reset/post_reset_login_custom_backend/')
|
||||
response = self.client.post(path, {'new_password1': 'anewpassword', 'new_password2': 'anewpassword'})
|
||||
self.assertRedirects(response, '/reset/done/', fetch_redirect_response=False)
|
||||
self.assertIn(SESSION_KEY, self.client.session)
|
||||
self.assertEqual(self.client.session[BACKEND_SESSION_KEY], backend)
|
||||
|
||||
def test_confirm_login_post_reset_already_logged_in(self):
|
||||
url, path = self._test_confirm_start()
|
||||
path = path.replace('/reset/', '/reset/post_reset_login/')
|
||||
|
||||
@@ -90,6 +90,13 @@ urlpatterns = auth_urlpatterns + [
|
||||
views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset'))),
|
||||
url(r'^reset/post_reset_login/{}/$'.format(uid_token),
|
||||
views.PasswordResetConfirmView.as_view(post_reset_login=True)),
|
||||
url(
|
||||
r'^reset/post_reset_login_custom_backend/{}/$'.format(uid_token),
|
||||
views.PasswordResetConfirmView.as_view(
|
||||
post_reset_login=True,
|
||||
post_reset_login_backend='django.contrib.auth.backends.AllowAllUsersModelBackend',
|
||||
),
|
||||
),
|
||||
url(r'^password_change/custom/$',
|
||||
views.PasswordChangeView.as_view(success_url='/custom/')),
|
||||
url(r'^password_change/custom/named/$',
|
||||
|
||||
Reference in New Issue
Block a user