From ddc34bd023839e57f5fea465860c53dd55531efe Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Tue, 12 Nov 2019 15:10:28 -0500 Subject: [PATCH] upgrade edx-drf-extensions to 2.4.5 (#22269) - Upgrade edx-drf-extensions to 2.4.5 - Removed constraint to 2.4.0, because 2.4.2 introduces a workaround for ARCH-1210 by putting the problematic code behind a django setting. - Remove unused JWT_AUTH_REFRESH_COOKIE setting. ARCH-418, ARCH-1269, ARCH-1044 fix broken toggle --- lms/envs/common.py | 1 - openedx/core/djangoapps/oauth_dispatch/toggles.py | 7 +++---- requirements/constraints.txt | 6 ------ requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/testing.txt | 2 +- 6 files changed, 6 insertions(+), 14 deletions(-) diff --git a/lms/envs/common.py b/lms/envs/common.py index 6c806b9199..9c5ebdc781 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3440,7 +3440,6 @@ JWT_AUTH = { ], 'JWT_AUTH_COOKIE_HEADER_PAYLOAD': 'edx-jwt-cookie-header-payload', 'JWT_AUTH_COOKIE_SIGNATURE': 'edx-jwt-cookie-signature', - 'JWT_AUTH_REFRESH_COOKIE': 'edx-jwt-refresh-cookie', } EDX_DRF_EXTENSIONS = { diff --git a/openedx/core/djangoapps/oauth_dispatch/toggles.py b/openedx/core/djangoapps/oauth_dispatch/toggles.py index a97d5708fe..94814ac493 100644 --- a/openedx/core/djangoapps/oauth_dispatch/toggles.py +++ b/openedx/core/djangoapps/oauth_dispatch/toggles.py @@ -4,10 +4,9 @@ Feature toggle code for oauth_dispatch. from __future__ import absolute_import -from edx_rest_framework_extensions.config import SWITCH_ENFORCE_JWT_SCOPES +from edx_rest_framework_extensions.config import OAUTH_TOGGLE_NAMESPACE, SWITCH_ENFORCE_JWT_SCOPES from openedx.core.djangoapps.waffle_utils import WaffleSwitch, WaffleSwitchNamespace -WAFFLE_NAMESPACE = 'oauth2' -OAUTH2_SWITCHES = WaffleSwitchNamespace(name=WAFFLE_NAMESPACE) -ENFORCE_JWT_SCOPES = WaffleSwitch(OAUTH2_SWITCHES, SWITCH_ENFORCE_JWT_SCOPES) + +ENFORCE_JWT_SCOPES = WaffleSwitch(WaffleSwitchNamespace(name=OAUTH_TOGGLE_NAMESPACE), SWITCH_ENFORCE_JWT_SCOPES) diff --git a/requirements/constraints.txt b/requirements/constraints.txt index dcba47360f..96e1dab3f1 100644 --- a/requirements/constraints.txt +++ b/requirements/constraints.txt @@ -77,12 +77,6 @@ numpy<1.17.0 # jsondiff==1.2.0 (from -r requirements/edx/base.txt (line 146)) jsondiff==1.1.1 - -# Constraining this because when we rolled it to edx.org production -# we had a lot of memory issues and gunicorn workers started running -# out of memory. ARCH-1210 -edx-drf-extensions==2.4.0 - # Constraining this since the newer versions require Python 3 more-itertools==5.0.0 diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index d2c6c5c427..5d1eaa056c 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -104,7 +104,7 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.2 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.2 -edx-drf-extensions==2.4.0 +edx-drf-extensions==2.4.5 edx-enterprise==2.0.17 edx-i18n-tools==0.4.8 edx-milestones==0.2.5 diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index ec4375acbe..bbd4bd9c3e 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -126,7 +126,7 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.2 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.2 -edx-drf-extensions==2.4.0 +edx-drf-extensions==2.4.5 edx-enterprise==2.0.17 edx-i18n-tools==0.4.8 edx-lint==1.3.0 diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 723384d300..c1ac374d63 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -123,7 +123,7 @@ edx-django-oauth2-provider==1.3.5 edx-django-release-util==0.3.2 edx-django-sites-extensions==2.3.1 edx-django-utils==2.0.2 -edx-drf-extensions==2.4.0 +edx-drf-extensions==2.4.5 edx-enterprise==2.0.17 edx-i18n-tools==0.4.8 edx-lint==1.3.0