p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removed unnecessary token regex in auth_tests URLs. 

All URLs in django.contrib.auth use a "<uidb64>/<token>" pattern.
This commit is contained in:
Claude Paroz 2020-02-12 10:29:32 +01:00 committed by Mariusz Felisiak
parent c25a8c77d7
commit 27f67317da
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/auth_tests/urls.py
View File

@ -78,8 +78,6 @@ def login_and_permission_required_exception(request):
pass pass
uid_token = r'(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})'
# special urls for auth test cases # special urls for auth test cases
urlpatterns = auth_urlpatterns + [ urlpatterns = auth_urlpatterns + [
path('logout/custom_query/', views.LogoutView.as_view(redirect_field_name='follow')), path('logout/custom_query/', views.LogoutView.as_view(redirect_field_name='follow')),
@ -106,24 +104,24 @@ urlpatterns = auth_urlpatterns + [
views.PasswordResetView.as_view( views.PasswordResetView.as_view(
html_email_template_name='registration/html_password_reset_email.html' html_email_template_name='registration/html_password_reset_email.html'
)), )),
re_path( path(
'^reset/custom/{}/$'.format(uid_token), 'reset/custom/<uidb64>/<token>/',
views.PasswordResetConfirmView.as_view(success_url='/custom/'), views.PasswordResetConfirmView.as_view(success_url='/custom/'),
), ),
re_path( path(
'^reset/custom/named/{}/$'.format(uid_token), 'reset/custom/named/<uidb64>/<token>/',
views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset')), views.PasswordResetConfirmView.as_view(success_url=reverse_lazy('password_reset')),
), ),
re_path( path(
'^reset/custom/token/{}/$'.format(uid_token), 'reset/custom/token/<uidb64>/<token>/',
views.PasswordResetConfirmView.as_view(reset_url_token='set-passwordcustom'), views.PasswordResetConfirmView.as_view(reset_url_token='set-passwordcustom'),
), ),
re_path( path(
'^reset/post_reset_login/{}/$'.format(uid_token), 'reset/post_reset_login/<uidb64>/<token>/',
views.PasswordResetConfirmView.as_view(post_reset_login=True), views.PasswordResetConfirmView.as_view(post_reset_login=True),
), ),
re_path( path(
'^reset/post_reset_login_custom_backend/{}/$'.format(uid_token), 'reset/post_reset_login_custom_backend/<uidb64>/<token>/',
views.PasswordResetConfirmView.as_view( views.PasswordResetConfirmView.as_view(
post_reset_login=True, post_reset_login=True,
post_reset_login_backend='django.contrib.auth.backends.AllowAllUsersModelBackend', post_reset_login_backend='django.contrib.auth.backends.AllowAllUsersModelBackend',