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

Merge pull request #25133 from edx/aehsan/van-71/added_domain_name_in_login_redirection

Browse Source 
added host in redirection url
This commit is contained in:
Adeel Ehsan
2020-10-13 19:11:12 +05:00
committed by GitHub
parent 438d412dca 1bbb59ebc7
commit ddb7460812
3 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
openedx/core/djangoapps/user_authn/views/login.py
View File

@@ -446,8 +446,9 @@ def login_user(request):
if is_user_third_party_authenticated:
running_pipeline = pipeline.get(request)
redirect_url = pipeline.get_complete_url(backend_name=running_pipeline['backend'])
elif should_redirect_to_logistration_mircrofrontend():
redirect_url = get_next_url_for_login_page(request)
redirect_url = get_next_url_for_login_page(request, include_host=True)
response = JsonResponse({
'success': True,

23
openedx/core/djangoapps/user_authn/views/tests/test_login.py
View File

@@ -18,7 +18,6 @@ from django.http import HttpResponse
from django.test.client import Client
from django.test.utils import override_settings
from django.urls import NoReverseMatch, reverse
from freezegun import freeze_time
from mock import patch
from six.moves import range
@@ -90,25 +89,19 @@ class LoginTest(SiteMixin, CacheIsolationTestCase):
{
'next_url': None,
'course_id': None,
'expected_redirect': '/dashboard',
'expected_redirect': settings.LMS_ROOT_URL + '/dashboard',
},
# A relative path is an acceptable redirect.
# Added root url in next .
{
'next_url': '/harmless-relative-page',
'course_id': None,
'expected_redirect': '/harmless-relative-page',
},
# Paths without trailing slashes are also considered relative.
{
'next_url': 'courses',
'course_id': None,
'expected_redirect': 'courses',
'expected_redirect': settings.LMS_ROOT_URL + '/harmless-relative-page',
},
# An absolute URL to a non-whitelisted domain is not an acceptable redirect.
{
'next_url': 'https://evil.sketchysite',
'course_id': None,
'expected_redirect': '/dashboard',
'expected_redirect': settings.LMS_ROOT_URL + '/dashboard',
},
# An absolute URL to a whitelisted domain is acceptable.
{
@@ -121,7 +114,8 @@ class LoginTest(SiteMixin, CacheIsolationTestCase):
'next_url': None,
'course_id': 'coursekey',
'expected_redirect': (
'/account/finish_auth?course_id=coursekey&next=%2Fdashboard'
'{root_url}/account/finish_auth?course_id=coursekey&next=%2Fdashboard'.
format(root_url=settings.LMS_ROOT_URL)
),
},
# If valid course_id AND next_url are provided, redirect to finish_auth with
@@ -130,7 +124,7 @@ class LoginTest(SiteMixin, CacheIsolationTestCase):
'next_url': 'freshpage',
'course_id': 'coursekey',
'expected_redirect': (
'/account/finish_auth?course_id=coursekey&next=freshpage'
settings.LMS_ROOT_URL + '/account/finish_auth?course_id=coursekey&next=freshpage'
)
},
# If course_id is provided with invalid next_url, redirect to finish_auth with
@@ -139,7 +133,8 @@ class LoginTest(SiteMixin, CacheIsolationTestCase):
'next_url': 'http://scam.scam',
'course_id': 'coursekey',
'expected_redirect': (
'/account/finish_auth?course_id=coursekey&next=%2Fdashboard'
'{root_url}/account/finish_auth?course_id=coursekey&next=%2Fdashboard'.
format(root_url=settings.LMS_ROOT_URL)
),
},
)