fix: fixed django4 warnings (#29644)
This commit is contained in:
Mohammad Ahtasham ul Hassan
committed by
GitHub
GitHub
parent
533b971d83
commit
68e0885ca8
@@ -1,19 +1,15 @@
|
||||
"""
|
||||
Authn API urls
|
||||
"""
|
||||
|
||||
from django.conf.urls import url
|
||||
|
||||
from django.urls import path
|
||||
from openedx.core.djangoapps.user_authn.api.views import MFEContextView, SendAccountActivationEmail
|
||||
from openedx.core.djangoapps.user_authn.api.optional_fields import OptionalFieldsView
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^third_party_auth_context$', MFEContextView.as_view(), name='third_party_auth_context'),
|
||||
url(r'^mfe_context$', MFEContextView.as_view(), name='mfe_context'),
|
||||
url(
|
||||
r'^send_account_activation_email$',
|
||||
SendAccountActivationEmail.as_view(),
|
||||
name='send_account_activation_email'
|
||||
),
|
||||
url(r'^optional_fields$', OptionalFieldsView.as_view(), name='optional_fields'),
|
||||
path('third_party_auth_context', MFEContextView.as_view(), name='third_party_auth_context'),
|
||||
path('mfe_context', MFEContextView.as_view(), name='mfe_context'),
|
||||
path('send_account_activation_email', SendAccountActivationEmail.as_view(),
|
||||
name='send_account_activation_email'
|
||||
),
|
||||
path('optional_fields', OptionalFieldsView.as_view(), name='optional_fields'),
|
||||
]
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
""" URLs for User Authentication """
|
||||
|
||||
from django.conf.urls import include, url
|
||||
from django.urls import include, path
|
||||
|
||||
from .views import login, login_form
|
||||
|
||||
urlpatterns = [
|
||||
# TODO move contents of urls_common here once CMS no longer has its own login
|
||||
url(r'', include('openedx.core.djangoapps.user_authn.urls_common')),
|
||||
url(r'^api/', include('openedx.core.djangoapps.user_authn.api.urls')),
|
||||
url(r'^account/finish_auth$', login.finish_auth, name='finish_auth'),
|
||||
path('', include('openedx.core.djangoapps.user_authn.urls_common')),
|
||||
path('api/', include('openedx.core.djangoapps.user_authn.api.urls')),
|
||||
path('account/finish_auth', login.finish_auth, name='finish_auth'),
|
||||
]
|
||||
|
||||
|
||||
# Backwards compatibility with old URL structure, but serve the new views
|
||||
urlpatterns += [
|
||||
url(r'^login$', login_form.login_and_registration_form,
|
||||
{'initial_mode': 'login'}, name='signin_user'),
|
||||
url(r'^register$', login_form.login_and_registration_form,
|
||||
{'initial_mode': 'register'}, name='register_user'),
|
||||
url(r'^password_assistance', login_form.login_and_registration_form,
|
||||
{'initial_mode': 'reset'}, name='password_assistance'),
|
||||
path('login', login_form.login_and_registration_form,
|
||||
{'initial_mode': 'login'}, name='signin_user'),
|
||||
path('register', login_form.login_and_registration_form,
|
||||
{'initial_mode': 'register'}, name='register_user'),
|
||||
path('password_assistance', login_form.login_and_registration_form,
|
||||
{'initial_mode': 'reset'}, name='password_assistance'),
|
||||
]
|
||||
|
||||
@@ -12,95 +12,85 @@ which leads to inconsistent prefixing.
|
||||
|
||||
|
||||
from django.conf import settings
|
||||
from django.conf.urls import url
|
||||
from django.contrib.auth.views import PasswordResetCompleteView
|
||||
from django.urls import path, re_path
|
||||
|
||||
from .views import auto_auth, login, logout, password_reset, register
|
||||
from .views.password_reset import PasswordResetConfirmWrapper
|
||||
|
||||
urlpatterns = [
|
||||
# Registration
|
||||
url(r'^create_account$', register.RegistrationView.as_view(), name='create_account'),
|
||||
path('create_account', register.RegistrationView.as_view(), name='create_account'),
|
||||
|
||||
# Moved from user_api/legacy_urls.py
|
||||
url(
|
||||
r'^api/user/v1/account/registration/$',
|
||||
register.RegistrationView.as_view(),
|
||||
name="user_api_registration"
|
||||
),
|
||||
path('api/user/v1/account/registration/', register.RegistrationView.as_view(),
|
||||
name="user_api_registration"
|
||||
),
|
||||
# `user_api` prefix is preserved for backwards compatibility.
|
||||
url(r'^user_api/v1/account/registration/$', register.RegistrationView.as_view(),
|
||||
name="user_api_registration_legacy"),
|
||||
path('user_api/v1/account/registration/', register.RegistrationView.as_view(),
|
||||
name="user_api_registration_legacy"),
|
||||
|
||||
# V2 is created to avoid backward compatibility issue with confirm_email
|
||||
url(
|
||||
r'^api/user/v2/account/registration/$',
|
||||
register.RegistrationView.as_view(),
|
||||
name="user_api_registration_v2"
|
||||
),
|
||||
path('api/user/v2/account/registration/', register.RegistrationView.as_view(),
|
||||
name="user_api_registration_v2"
|
||||
),
|
||||
# legacy url
|
||||
url(r'^user_api/v2/account/registration/$', register.RegistrationView.as_view(),
|
||||
name="user_api_registration_v2_legacy"),
|
||||
path('user_api/v2/account/registration/', register.RegistrationView.as_view(),
|
||||
name="user_api_registration_v2_legacy"),
|
||||
|
||||
# Moved from user_api/urls.py
|
||||
# `api/user` prefix is preserved for backwards compatibility.
|
||||
url(
|
||||
r'^api/user/v1/validation/registration$',
|
||||
register.RegistrationValidationView.as_view(),
|
||||
name='registration_validation'
|
||||
),
|
||||
path('api/user/v1/validation/registration', register.RegistrationValidationView.as_view(),
|
||||
name='registration_validation'
|
||||
),
|
||||
|
||||
url(r'^login_ajax$', login.login_user, name="login_api"),
|
||||
path('login_ajax', login.login_user, name="login_api"),
|
||||
|
||||
# Moved from user_api/legacy_urls.py
|
||||
url(
|
||||
re_path(
|
||||
r'^api/user/(?P<api_version>v(1|2))/account/login_session/$',
|
||||
login.LoginSessionView.as_view(),
|
||||
name="user_api_login_session"
|
||||
),
|
||||
# `user_api` prefix is preserved for backwards compatibility.
|
||||
url(r'^user_api/(?P<api_version>v(1|2))/account/login_session/$', login.LoginSessionView.as_view(),
|
||||
name="user_api_login_session_legacy"),
|
||||
re_path(r'^user_api/(?P<api_version>v(1|2))/account/login_session/$', login.LoginSessionView.as_view(),
|
||||
name="user_api_login_session_legacy"),
|
||||
|
||||
# Login Refresh of JWT Cookies
|
||||
url(r'^login_refresh$', login.login_refresh, name="login_refresh"),
|
||||
path('login_refresh', login.login_refresh, name="login_refresh"),
|
||||
|
||||
# WARNING: This is similar to auth_backends ^logout/$ (which has a
|
||||
# trailing slash); LMS uses this view, but Studio links to the
|
||||
# auth_backends logout view.
|
||||
url(r'^logout$', logout.LogoutView.as_view(), name='logout'),
|
||||
path('logout', logout.LogoutView.as_view(), name='logout'),
|
||||
|
||||
# Moved from user_api/legacy_urls.py
|
||||
url(
|
||||
r'^api/user/v1/account/password_reset/$',
|
||||
password_reset.PasswordResetView.as_view(),
|
||||
name="user_api_password_reset"
|
||||
),
|
||||
path('api/user/v1/account/password_reset/', password_reset.PasswordResetView.as_view(),
|
||||
name="user_api_password_reset"
|
||||
),
|
||||
# legacy url
|
||||
url(r'^user_api/v1/account/password_reset/$', password_reset.PasswordResetView.as_view(),
|
||||
name="user_api_password_reset_legacy"),
|
||||
path('user_api/v1/account/password_reset/', password_reset.PasswordResetView.as_view(),
|
||||
name="user_api_password_reset_legacy"),
|
||||
|
||||
# Password reset api views.
|
||||
url(r'^password_reset/$', password_reset.password_reset, name='password_reset'),
|
||||
url(
|
||||
path('password_reset/', password_reset.password_reset, name='password_reset'),
|
||||
re_path(
|
||||
r'^password_reset_confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
|
||||
PasswordResetConfirmWrapper.as_view(),
|
||||
name='password_reset_confirm',
|
||||
),
|
||||
url(r'^account/password$', password_reset.password_change_request_handler, name='password_change_request'),
|
||||
path('account/password', password_reset.password_change_request_handler, name='password_change_request'),
|
||||
|
||||
# authn MFE flow
|
||||
url(
|
||||
r'^api/user/v1/account/password_reset/token/validate/$',
|
||||
password_reset.PasswordResetTokenValidation.as_view(),
|
||||
name="user_api_password_reset_token_validate"
|
||||
),
|
||||
path('api/user/v1/account/password_reset/token/validate/', password_reset.PasswordResetTokenValidation.as_view(),
|
||||
name="user_api_password_reset_token_validate"
|
||||
),
|
||||
# legacy url
|
||||
url(r'^user_api/v1/account/password_reset/token/validate/$', password_reset.PasswordResetTokenValidation.as_view(),
|
||||
name="user_api_password_reset_token_validate_legacy"),
|
||||
path('user_api/v1/account/password_reset/token/validate/', password_reset.PasswordResetTokenValidation.as_view(),
|
||||
name="user_api_password_reset_token_validate_legacy"),
|
||||
|
||||
# authn MFE reset flow
|
||||
url(
|
||||
re_path(
|
||||
r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
|
||||
password_reset.LogistrationPasswordResetView.as_view(),
|
||||
name='logistration_password_reset',
|
||||
@@ -109,15 +99,13 @@ urlpatterns = [
|
||||
|
||||
# password reset django views (see above for password reset views)
|
||||
urlpatterns += [
|
||||
url(
|
||||
r'^password_reset_complete/$',
|
||||
PasswordResetCompleteView.as_view(),
|
||||
name='password_reset_complete',
|
||||
),
|
||||
path('password_reset_complete/', PasswordResetCompleteView.as_view(),
|
||||
name='password_reset_complete',
|
||||
),
|
||||
]
|
||||
|
||||
# enable automatic login
|
||||
if settings.FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'):
|
||||
urlpatterns += [
|
||||
url(r'^auto_auth$', auto_auth.auto_auth),
|
||||
path('auto_auth', auto_auth.auto_auth),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user