Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: moved user_authn all urls in urls.py (#34396)

Browse Source
This commit is contained in:
Syed Sajjad Hussain Shah
2024-03-25 22:05:55 +05:00
committed by GitHub
parent b0e3136d77
commit fc63719ceb
5 changed files with 93 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/djangoapps/contentstore/views/public.py
View File

@@ -46,7 +46,7 @@ def redirect_to_lms_login_for_admin(request):
"""
This view redirect the admin/login url to the site's login page.
"""
return redirect('/login?next=/admin')
return redirect('/login/?next=/admin')
def _build_next_param(request):

2
cms/urls.py
View File

@@ -49,7 +49,7 @@ LIBRARY_KEY_PATTERN = r'(?P<library_key_string>library-v1:[^/+]+\+[^/+]+)'
# oauth2_urlpatterns needs to be first to override any other login and
# logout related views.
urlpatterns = oauth2_urlpatterns + [
path('', include('openedx.core.djangoapps.user_authn.urls_common')),
path('', include('openedx.core.djangoapps.user_authn.urls')),
path('', include('common.djangoapps.student.urls')),
path('transcripts/upload', contentstore_views.upload_transcripts, name='upload_transcripts'),
path('transcripts/download', contentstore_views.download_transcripts, name='download_transcripts'),

94
openedx/core/djangoapps/user_authn/urls.py
View File

@@ -1,17 +1,103 @@
""" URLs for User Authentication """
from django.urls import include, path
from django.conf import settings
from django.urls import include, path, re_path
from django.contrib.auth.views import PasswordResetCompleteView
from .views import auth, auto_auth, login, login_form, logout, password_reset, register
from .views.password_reset import PasswordResetConfirmWrapper
from .views import auth, login, login_form
urlpatterns = [
# TODO move contents of urls_common here once CMS no longer has its own login
path('', include('openedx.core.djangoapps.user_authn.urls_common')),
# Registration
path('create_account', register.RegistrationView.as_view(), name='create_account'),
path('api/user/v1/account/registration/', register.RegistrationView.as_view(),
name="user_api_registration"
),
# `user_api` prefix is preserved for backwards compatibility.
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
path('api/user/v2/account/registration/', register.RegistrationView.as_view(),
name="user_api_registration_v2"
),
# legacy url
path('user_api/v2/account/registration/', register.RegistrationView.as_view(),
name="user_api_registration_v2_legacy"),
# `api/user` prefix is preserved for backwards compatibility.
path('api/user/v1/validation/registration', register.RegistrationValidationView.as_view(),
name='registration_validation'
),
path('login_ajax', login.login_user, name="login_api"),
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.
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
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.
path('logout', logout.LogoutView.as_view(), name='logout'),
path('api/user/v1/account/password_reset/', password_reset.PasswordResetView.as_view(),
name="user_api_password_reset"
),
# legacy url
path('user_api/v1/account/password_reset/', password_reset.PasswordResetView.as_view(),
name="user_api_password_reset_legacy"),
# Password reset api views.
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',
),
path('account/password', password_reset.password_change_request_handler, name='password_change_request'),
# authn MFE flow
path('api/user/v1/account/password_reset/token/validate/', password_reset.PasswordResetTokenValidation.as_view(),
name="user_api_password_reset_token_validate"
),
# legacy url
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
re_path(
r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
password_reset.LogistrationPasswordResetView.as_view(),
name='logistration_password_reset',
),
path('api/', include('openedx.core.djangoapps.user_authn.api.urls')),
path('account/finish_auth', login.finish_auth, name='finish_auth'),
path('auth/jwks.json', auth.get_public_signing_jwks, name='get_public_signing_jwks'),
]
# password reset django views (see above for password reset views)
urlpatterns += [
path('password_reset_complete/', PasswordResetCompleteView.as_view(),
name='password_reset_complete',
),
]
# enable automatic login
if settings.FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'):
urlpatterns += [
path('auto_auth', auto_auth.auto_auth),
]
# Backwards compatibility with old URL structure, but serve the new views
urlpatterns += [

111
openedx/core/djangoapps/user_authn/urls_common.py
View File

@@ -1,111 +0,0 @@
"""
Common URLs for User Authentication
Note: The split between urls.py and urls_common.py is hopefully temporary.
For now, this is needed because of difference in CMS and LMS that have
not yet been cleaned up.
This is also home to urls for endpoints that have been consolidated from other djangoapps,
which leads to inconsistent prefixing.
"""
from django.conf import settings
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
path('create_account', register.RegistrationView.as_view(), name='create_account'),
# Moved from user_api/legacy_urls.py
path('api/user/v1/account/registration/', register.RegistrationView.as_view(),
name="user_api_registration"
),
# `user_api` prefix is preserved for backwards compatibility.
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
path('api/user/v2/account/registration/', register.RegistrationView.as_view(),
name="user_api_registration_v2"
),
# legacy url
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.
path('api/user/v1/validation/registration', register.RegistrationValidationView.as_view(),
name='registration_validation'
),
path('login_ajax', login.login_user, name="login_api"),
# Moved from user_api/legacy_urls.py
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.
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
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.
path('logout', logout.LogoutView.as_view(), name='logout'),
# Moved from user_api/legacy_urls.py
path('api/user/v1/account/password_reset/', password_reset.PasswordResetView.as_view(),
name="user_api_password_reset"
),
# legacy url
path('user_api/v1/account/password_reset/', password_reset.PasswordResetView.as_view(),
name="user_api_password_reset_legacy"),
# Password reset api views.
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',
),
path('account/password', password_reset.password_change_request_handler, name='password_change_request'),
# authn MFE flow
path('api/user/v1/account/password_reset/token/validate/', password_reset.PasswordResetTokenValidation.as_view(),
name="user_api_password_reset_token_validate"
),
# legacy url
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
re_path(
r'^password/reset/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',
password_reset.LogistrationPasswordResetView.as_view(),
name='logistration_password_reset',
),
]
# password reset django views (see above for password reset views)
urlpatterns += [
path('password_reset_complete/', PasswordResetCompleteView.as_view(),
name='password_reset_complete',
),
]
# enable automatic login
if settings.FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'):
urlpatterns += [
path('auto_auth', auto_auth.auto_auth),
]

2
openedx/core/djangoapps/user_authn/views/tests/test_auto_auth.py
View File

@@ -27,7 +27,7 @@ class AutoAuthTestCase(UrlResetMixin, TestCase):
"""
Base class for AutoAuth Tests that properly resets the urls.py
"""
URLCONF_MODULES = ['openedx.core.djangoapps.user_authn.urls_common', 'openedx.core.djangoapps.user_authn.urls']
URLCONF_MODULES = ['openedx.core.djangoapps.user_authn.urls']
@ddt.ddt