From c7a35459296b7a37455dbece1b514c8a6a49a0f1 Mon Sep 17 00:00:00 2001 From: Ryan P Kilby Date: Mon, 22 Apr 2019 13:27:09 -0700 Subject: [PATCH] Update auth views There are a few changes from FBVs to CBVs - Some of the redirect arguments are now `success_url` - `is_admin_site` looks like it's functionally a noop, with no replacement argument. --- tests/django_urls.py | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/tests/django_urls.py b/tests/django_urls.py index c1fb050..559c753 100644 --- a/tests/django_urls.py +++ b/tests/django_urls.py @@ -8,23 +8,21 @@ from django.contrib.auth.urls import urlpatterns # special urls for auth test cases urlpatterns += [ - url(r'^logout/custom_query/$', views.logout, dict(redirect_field_name='follow')), - url(r'^logout/next_page/$', views.logout, dict(next_page='/somewhere/')), - url(r'^logout/next_page/named/$', views.logout, dict(next_page='password_reset')), - url(r'^password_reset_from_email/$', views.password_reset, dict(from_email='staffmember@example.com')), - url(r'^password_reset/custom_redirect/$', views.password_reset, dict(post_reset_redirect='/custom/')), - url(r'^password_reset/custom_redirect/named/$', views.password_reset, dict(post_reset_redirect='password_reset')), - url(r'^password_reset/html_email_template/$', views.password_reset, - dict(html_email_template_name='registration/html_password_reset_email.html')), + url(r'^logout/custom_query/$', views.LogoutView.as_view(redirect_field_name='follow')), + url(r'^logout/next_page/$', views.LogoutView.as_view(next_page='/somewhere/')), + url(r'^logout/next_page/named/$', views.LogoutView.as_view(next_page='password_reset')), + url(r'^password_reset_from_email/$', views.PasswordResetView.as_view(from_email='staffmember@example.com')), + url(r'^password_reset/custom_redirect/$', views.PasswordResetView.as_view(success_url='/custom/')), + url(r'^password_reset/custom_redirect/named/$', views.PasswordResetView.as_view(success_url='password_reset')), + url(r'^password_reset/html_email_template/$', views.PasswordResetView.as_view( + html_email_template_name='registration/html_password_reset_email.html')), url(r'^reset/custom/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', - views.password_reset_confirm, - dict(post_reset_redirect='/custom/')), + views.PasswordResetConfirmView.as_view(success_url='/custom/')), url(r'^reset/custom/named/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', - views.password_reset_confirm, - dict(post_reset_redirect='password_reset')), - url(r'^password_change/custom/$', views.password_change, dict(post_change_redirect='/custom/')), - url(r'^password_change/custom/named/$', views.password_change, dict(post_change_redirect='password_reset')), - url(r'^admin_password_reset/$', views.password_reset, dict(is_admin_site=True)), - url(r'^login_required/$', login_required(views.password_reset)), - url(r'^login_required_login_url/$', login_required(views.password_reset, login_url='/somewhere/')), + views.PasswordResetConfirmView.as_view(success_url='password_reset')), + url(r'^password_change/custom/$', views.PasswordChangeView.as_view(success_url='/custom/')), + url(r'^password_change/custom/named/$', views.PasswordChangeView.as_view(success_url='password_reset')), + url(r'^admin_password_reset/$', views.PasswordResetView.as_view()), + url(r'^login_required/$', login_required(views.PasswordResetView.as_view())), + url(r'^login_required_login_url/$', login_required(views.PasswordResetView.as_view(), login_url='/somewhere/')), ]