From 1beacdaf2c66e16281297bb0c181223a1b2ff957 Mon Sep 17 00:00:00 2001 From: Agrendalath Date: Mon, 19 Aug 2024 17:05:58 +0200 Subject: [PATCH] fix: handle missing name in readonly enterprise account fields The `settings.ENTERPRISE_READONLY_ACCOUNT_FIELDS` list can be overridden. Removing the `name` from it should not raise the `ValueError` exception. --- openedx/features/enterprise_support/tests/test_utils.py | 6 ++++-- openedx/features/enterprise_support/utils.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/openedx/features/enterprise_support/tests/test_utils.py b/openedx/features/enterprise_support/tests/test_utils.py index fbf2cccf9dbc..d693f6be72b6 100644 --- a/openedx/features/enterprise_support/tests/test_utils.py +++ b/openedx/features/enterprise_support/tests/test_utils.py @@ -269,10 +269,11 @@ def test_update_account_settings_context_for_enterprise(self, mock_get_fields): mock_get_fields.assert_called_once_with(user) assert expected_context == context + @ddt.data(settings.ENTERPRISE_READONLY_ACCOUNT_FIELDS, ['username', 'email', 'country']) @mock.patch('openedx.features.enterprise_support.utils.get_current_request') @mock.patch('openedx.features.enterprise_support.api.enterprise_customer_for_request') def test_get_enterprise_readonly_account_fields_no_sync_learner_profile_data( - self, mock_customer_for_request, mock_get_current_request, + self, readonly_fields, mock_customer_for_request, mock_get_current_request, ): mock_get_current_request.return_value = mock.Mock( GET={'enterprise_customer': 'some-uuid'}, @@ -284,7 +285,8 @@ def test_get_enterprise_readonly_account_fields_no_sync_learner_profile_data( } user = mock.Mock() - actual_fields = get_enterprise_readonly_account_fields(user) + with override_settings(ENTERPRISE_READONLY_ACCOUNT_FIELDS=readonly_fields): + actual_fields = get_enterprise_readonly_account_fields(user) assert set() == actual_fields mock_customer_for_request.assert_called_once_with(mock_get_current_request.return_value) mock_get_current_request.assert_called_once_with() diff --git a/openedx/features/enterprise_support/utils.py b/openedx/features/enterprise_support/utils.py index 4604b5c4fb00..6b007ebed57b 100644 --- a/openedx/features/enterprise_support/utils.py +++ b/openedx/features/enterprise_support/utils.py @@ -277,7 +277,7 @@ def get_enterprise_readonly_account_fields(user): # if user has no `UserSocialAuth` record then allow to edit `fullname` # whether the `sync_learner_profile_data` is enabled or disabled user_social_auth_record = _user_has_social_auth_record(user, enterprise_customer) - if not user_social_auth_record: + if not user_social_auth_record and 'name' in enterprise_readonly_account_fields: enterprise_readonly_account_fields.remove('name') sync_learner_profile_data = _get_sync_learner_profile_data(enterprise_customer)