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

Merge pull request #18980 from edx/arch/jwt-http-cookies

Browse Source 
Refactor Login Cookies
This commit is contained in:
Nimisha Asthagiri
2018-09-25 09:46:37 -04:00
committed by GitHub
parent 636ce3b7d7 b7deedfb36
commit 0a88746aef
11 changed files with 159 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/student/tests/test_views.py
View File

@@ -29,7 +29,7 @@ from openedx.core.djangoapps.content.course_overviews.models import CourseOvervi
from openedx.core.djangoapps.content.course_overviews.tests.factories import CourseOverviewFactory
from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration_context
from pyquery import PyQuery as pq
from openedx.core.djangoapps.user_authn.cookies import get_user_info_cookie_data
from openedx.core.djangoapps.user_authn.cookies import _get_user_info_cookie_data
from student.helpers import DISABLE_UNENROLL_CERT_STATES
from student.models import CourseEnrollment, UserProfile
from student.signals import REFUND_ORDER
@@ -301,7 +301,7 @@ class StudentDashboardTests(SharedModuleStoreTestCase, MilestonesTestCaseMixin,
request = RequestFactory().get(self.path)
request.user = self.user
expected = json.dumps(get_user_info_cookie_data(request))
expected = json.dumps(_get_user_info_cookie_data(request, self.user))
self.client.get(self.path)
actual = self.client.cookies[settings.EDXMKTG_USER_INFO_COOKIE_NAME].value
self.assertEqual(actual, expected)

4
common/djangoapps/student/views/dashboard.py
View File

@@ -44,7 +44,7 @@ from openedx.features.enterprise_support.api import get_dashboard_consent_notifi
from openedx.features.journals.api import journals_enabled
from shoppingcart.api import order_history
from shoppingcart.models import CourseRegistrationCode, DonationConfiguration
from openedx.core.djangoapps.user_authn.cookies import set_user_info_cookie
from openedx.core.djangoapps.user_authn.cookies import _set_deprecated_user_info_cookie
from student.helpers import cert_info, check_verify_status_by_course
from student.models import (
CourseEnrollment,
@@ -848,5 +848,5 @@ def student_dashboard(request):
})
response = render_to_response('dashboard.html', context)
set_user_info_cookie(response, request)
_set_deprecated_user_info_cookie(response, request, user) # pylint: disable=protected-access
return response