From bfabc1ff410494ff0da6b3408ca3bc3cc7ff4cd8 Mon Sep 17 00:00:00 2001 From: "M. Zulqarnain" Date: Thu, 21 Jan 2021 12:54:26 +0500 Subject: [PATCH] BOM-2233 : Upgrade social-auth-core to > 4.0 (#26055) * Upgrade social-auth-core * Fixing a test. Co-authored-by: Usama Sadiq Co-authored-by: Awais Qureshi --- .../djangoapps/third_party_auth/tests/specs/test_testshib.py | 4 +++- requirements/constraints.txt | 4 ++-- requirements/edx-sandbox/py35.txt | 2 +- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/common/djangoapps/third_party_auth/tests/specs/test_testshib.py b/common/djangoapps/third_party_auth/tests/specs/test_testshib.py index 0e54714b22..a3c228effb 100644 --- a/common/djangoapps/third_party_auth/tests/specs/test_testshib.py +++ b/common/djangoapps/third_party_auth/tests/specs/test_testshib.py @@ -157,7 +157,8 @@ class TestShibIntegrationTest(SamlIntegrationTestUtilities, IntegrationTestMixin 'id': 'id_value', 'firstName': 'firstName_value', 'idp_name': 'testshib', - 'attributes': {u'urn:oid:0.9.2342.19200300.100.1.1': [u'myself']} + 'attributes': {u'urn:oid:0.9.2342.19200300.100.1.1': [u'myself'], 'name_id': '1'}, + 'session_index': '1', } @patch('openedx.features.enterprise_support.api.enterprise_customer_for_request') @@ -204,6 +205,7 @@ class TestShibIntegrationTest(SamlIntegrationTestUtilities, IntegrationTestMixin # Instrument the pipeline to get to the dashboard with the full expected state. self.client.get( pipeline.get_login_url(self.provider.provider_id, pipeline.AUTH_ENTRY_LOGIN)) + actions.do_complete(request.backend, social_views._do_login, # pylint: disable=protected-access request=request) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index 7b487c3d94..31fbe26903 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -136,8 +136,8 @@ Sphinx==3.3.0 # latest edx-bulk-grades==0.8.5 is giving migration error. edx-bulk-grades<0.8.5 -# social-auth-core==3.4.0 is giving error in saml auth tests -social-auth-core==3.3.3 +# social-auth-core==4.3.0 requires PyJWT > 2.0.0 +social-auth-core<4.0.3 # python3-saml==1.10.0 version started breaking a11y tests python3-saml<1.10.0 diff --git a/requirements/edx-sandbox/py35.txt b/requirements/edx-sandbox/py35.txt index f4cb5c1aa3..3c793990f3 100644 --- a/requirements/edx-sandbox/py35.txt +++ b/requirements/edx-sandbox/py35.txt @@ -20,7 +20,7 @@ matplotlib==2.2.4 # via -c requirements/edx-sandbox/../constraints.txt, mpmath==1.1.0 # via sympy networkx==2.2 # via -r requirements/edx-sandbox/py35.in nltk==3.5 # via -r requirements/edx-sandbox/shared.txt, chem -numpy==1.16.5 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc, scipy +numpy==1.16.5 # via -c requirements/edx-sandbox/../constraints.txt, -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc openedx-calc==1.0.9 # via -r requirements/edx-sandbox/py35.in pycparser==2.20 # via -r requirements/edx-sandbox/shared.txt, cffi pyparsing==2.2.0 # via -r requirements/edx-sandbox/py35.in, chem, matplotlib, openedx-calc diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index e90db2a2f6..c3da24f9aa 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -214,7 +214,7 @@ simplejson==3.17.2 # via -r requirements/edx/base.in, sailthru-client, su six==1.15.0 # via -r requirements/edx/../edx-sandbox/shared.txt, -r requirements/edx/base.in, -r requirements/edx/paver.txt, analytics-python, bleach, chem, codejail, crowdsourcehinter-xblock, cryptography, django-countries, django-simple-history, edx-ace, edx-bulk-grades, edx-ccx-keys, edx-django-release-util, edx-drf-extensions, edx-enterprise, edx-i18n-tools, edx-milestones, edx-opaque-keys, edx-rbac, event-tracking, fs, fs-s3fs, html5lib, isodate, libsass, mock, openedx-calc, paver, pycontracts, pyjwkest, python-dateutil, python-memcached, python-swiftclient, social-auth-app-django, social-auth-core, stevedore, xblock slumber==0.7.1 # via edx-bulk-grades, edx-enterprise, edx-rest-api-client social-auth-app-django==4.0.0 # via -r requirements/edx/base.in -social-auth-core==3.3.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, social-auth-app-django +social-auth-core==4.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.in, social-auth-app-django sorl-thumbnail==12.7.0 # via -r requirements/edx/base.in, django-wiki sortedcontainers==2.3.0 # via -r requirements/edx/base.in soupsieve==2.1 # via beautifulsoup4 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 0fd7526674..0bdec80177 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -271,7 +271,7 @@ slumber==0.7.1 # via -r requirements/edx/testing.txt, edx-bulk-grades smmap==3.0.4 # via -r requirements/edx/testing.txt, gitdb snowballstemmer==2.0.0 # via sphinx social-auth-app-django==4.0.0 # via -r requirements/edx/testing.txt -social-auth-core==3.3.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, social-auth-app-django +social-auth-core==4.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/testing.txt, social-auth-app-django sorl-thumbnail==12.7.0 # via -r requirements/edx/testing.txt, django-wiki sortedcontainers==2.3.0 # via -r requirements/edx/testing.txt soupsieve==2.1 # via -r requirements/edx/testing.txt, beautifulsoup4 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 4e725a80d3..6097dec369 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -259,7 +259,7 @@ six==1.15.0 # via -r requirements/edx/base.txt, analytics-python, slumber==0.7.1 # via -r requirements/edx/base.txt, edx-bulk-grades, edx-enterprise, edx-rest-api-client smmap==3.0.4 # via gitdb social-auth-app-django==4.0.0 # via -r requirements/edx/base.txt -social-auth-core==3.3.3 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, social-auth-app-django +social-auth-core==4.0.2 # via -c requirements/edx/../constraints.txt, -r requirements/edx/base.txt, social-auth-app-django sorl-thumbnail==12.7.0 # via -r requirements/edx/base.txt, django-wiki sortedcontainers==2.3.0 # via -r requirements/edx/base.txt soupsieve==2.1 # via -r requirements/edx/base.txt, beautifulsoup4