From ff581d003f93eb9aebca863f94805f53275c76d5 Mon Sep 17 00:00:00 2001 From: Jesse Shapiro Date: Wed, 22 Feb 2017 16:29:39 -0500 Subject: [PATCH] Remove unnecessary pipeline element; use new name for existing element --- common/djangoapps/third_party_auth/tests/test_settings.py | 3 +-- common/djangoapps/util/enterprise_helpers.py | 3 +-- requirements/edx/base.txt | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common/djangoapps/third_party_auth/tests/test_settings.py b/common/djangoapps/third_party_auth/tests/test_settings.py index 080ffc2c21..ae83e69622 100644 --- a/common/djangoapps/third_party_auth/tests/test_settings.py +++ b/common/djangoapps/third_party_auth/tests/test_settings.py @@ -60,5 +60,4 @@ class SettingsUnitTest(testutil.TestCase): @unittest.skipUnless(enterprise_enabled(), 'enterprise not enabled') def test_enterprise_elements_inserted(self): settings.apply_settings(self.settings) - self.assertIn('enterprise.tpa_pipeline.set_data_sharing_consent_record', self.settings.SOCIAL_AUTH_PIPELINE) - self.assertIn('enterprise.tpa_pipeline.verify_data_sharing_consent', self.settings.SOCIAL_AUTH_PIPELINE) + self.assertIn('enterprise.tpa_pipeline.handle_enterprise_logistration', self.settings.SOCIAL_AUTH_PIPELINE) diff --git a/common/djangoapps/util/enterprise_helpers.py b/common/djangoapps/util/enterprise_helpers.py index 14dade33ce..7edcb7ff2a 100644 --- a/common/djangoapps/util/enterprise_helpers.py +++ b/common/djangoapps/util/enterprise_helpers.py @@ -111,8 +111,7 @@ def insert_enterprise_pipeline_elements(pipeline): return additional_elements = ( - 'enterprise.tpa_pipeline.set_data_sharing_consent_record', - 'enterprise.tpa_pipeline.verify_data_sharing_consent', + 'enterprise.tpa_pipeline.handle_enterprise_logistration', ) # Find the item we need to insert the data sharing consent elements before insert_point = pipeline.index('social.pipeline.social_auth.load_extra_data') diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index b89272c493..60ad5aad33 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -51,7 +51,7 @@ edx-lint==0.4.3 astroid==1.3.8 edx-django-oauth2-provider==1.1.4 edx-django-sites-extensions==2.1.1 -edx-enterprise==0.23.0 +edx-enterprise==0.24.0 edx-oauth2-provider==1.2.0 edx-opaque-keys==0.4.0 edx-organizations==0.4.3