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

Merge pull request #25734 from edx/ammar/ent-3670-get-learners-enterprise-info-from-db

Browse Source 
try to get learner's enterprise information from DB if there is no enterprise customer associated with sso provider id
This commit is contained in:
Muhammad Ammar
2020-12-02 21:02:38 +05:00
committed by GitHub
parent 2a9d4b796c f19b074927
commit 60f30a9aa5
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openedx/features/enterprise_support/api.py
View File

@@ -486,7 +486,7 @@ def enterprise_customer_uuid_for_request(request):
else:
enterprise_customer_uuid = _customer_uuid_from_query_param_cookies_or_session(request)
if enterprise_customer_uuid is _CACHE_MISS:
if enterprise_customer_uuid is _CACHE_MISS or enterprise_customer_uuid is None:
if not request.user.is_authenticated:
return None

15
openedx/features/enterprise_support/tests/test_api.py
View File

@@ -866,19 +866,28 @@ class TestEnterpriseApi(EnterpriseServiceMockMixin, CacheIsolationTestCase):
mock_partial_pipeline.assert_called_once_with(mock_request)
self.assertNotIn(ENTERPRISE_CUSTOMER_KEY_NAME, mock_request.session)
@mock.patch('openedx.features.enterprise_support.api.get_enterprise_learner_data_from_db')
@mock.patch('openedx.features.enterprise_support.api.get_partial_pipeline', return_value=None)
def test_customer_uuid_for_request_sso_provider_id_customer_non_existent(self, mock_partial_pipeline):
def test_customer_uuid_for_request_sso_provider_id_customer_non_existent_but_exist_in_db(
self,
mock_partial_pipeline,
mock_data_from_db,
):
enterprise_customer_uuid = 'adab9a14-f263-42e6-a234-db707026c4a6'
mock_request = mock.Mock(
GET={'tpa_hint': 'my-third-party-auth'},
COOKIES={},
session={},
)
mock_data_from_db.return_value = [
{'enterprise_customer': {'uuid': enterprise_customer_uuid}},
]
actual_uuid = enterprise_customer_uuid_for_request(mock_request)
self.assertIsNone(actual_uuid)
self.assertEqual(actual_uuid, enterprise_customer_uuid)
mock_partial_pipeline.assert_called_once_with(mock_request)
self.assertNotIn(ENTERPRISE_CUSTOMER_KEY_NAME, mock_request.session)
self.assertIn(ENTERPRISE_CUSTOMER_KEY_NAME, mock_request.session)
@mock.patch('openedx.features.enterprise_support.api.get_partial_pipeline', return_value=None)
def test_enterprise_uuid_for_request_from_query_params(self, mock_partial_pipeline):