From 415291fd2740ef649d9e9428ea67616f3e0b4602 Mon Sep 17 00:00:00 2001 From: muhammad-ammar Date: Thu, 9 Jun 2022 21:28:01 +0500 Subject: [PATCH] feat: add source query param in data sharing consent url --- openedx/features/enterprise_support/api.py | 1 + openedx/features/enterprise_support/tests/test_api.py | 1 + requirements/constraints.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/openedx/features/enterprise_support/api.py b/openedx/features/enterprise_support/api.py index a09600dfa3..373eaf4bd5 100644 --- a/openedx/features/enterprise_support/api.py +++ b/openedx/features/enterprise_support/api.py @@ -753,6 +753,7 @@ def get_enterprise_consent_url(request, course_id, user=None, return_to=None, en url_params = { 'enterprise_customer_uuid': enterprise_customer_uuid_for_request(request), 'course_id': course_id, + 'source': 'lms-courseware', 'next': request.build_absolute_uri(return_path), 'failure_url': request.build_absolute_uri( reverse('dashboard') + '?' + urlencode( diff --git a/openedx/features/enterprise_support/tests/test_api.py b/openedx/features/enterprise_support/tests/test_api.py index 08e108a67e..5114bab8b1 100644 --- a/openedx/features/enterprise_support/tests/test_api.py +++ b/openedx/features/enterprise_support/tests/test_api.py @@ -709,6 +709,7 @@ class TestEnterpriseApi(EnterpriseServiceMockMixin, CacheIsolationTestCase): expected_path = request_mock.path if is_return_to_null else '/courses/course-v1:edX+DemoX+Demo_Course/info' expected_url_args = { 'course_id': ['course-v1:edX+DemoX+Demo_Course'], + 'source': ['lms-courseware'], 'failure_url': ['http://localhost:8000/dashboard?consent_failed=course-v1%3AedX%2BDemoX%2BDemo_Course'], 'enterprise_customer_uuid': ['cf246b88-d5f6-4908-a522-fc307e0b0c59'], 'next': [f'http://localhost:8000{expected_path}'] diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 63a65cfee1..67000d939a 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -25,7 +25,7 @@ django-storages<1.9 # The team that owns this package will manually bump this package rather than having it pulled in automatically. # This is to allow them to better control its deployment and to do it in a process that works better # for them. -edx-enterprise==3.49.7 +edx-enterprise==3.49.9 # oauthlib>3.0.1 causes test failures ( also remove the django-oauth-toolkit constraint when this is fixed ) oauthlib==3.0.1 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 3da22da3dd..9e58ca715b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -467,7 +467,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.49.7 +edx-enterprise==3.49.9 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.in diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index e80885ff99..d327a05840 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -580,7 +580,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.49.7 +edx-enterprise==3.49.9 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 60477eb70a..191652642a 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -563,7 +563,7 @@ edx-drf-extensions==8.0.1 # edx-rbac # edx-when # edxval -edx-enterprise==3.49.7 +edx-enterprise==3.49.9 # via # -c requirements/edx/../constraints.txt # -r requirements/edx/base.txt