From 0654ff97f2c34c863a8bbf48c9e67257be15ec4b Mon Sep 17 00:00:00 2001 From: robrap Date: Mon, 27 Nov 2023 16:24:22 +0000 Subject: [PATCH 1/2] feat: Upgrade Python dependency edx-drf-extensions Upgrade edx-drf-extensions 9.0.0 Commit generated by workflow `openedx/edx-platform/.github/workflows/upgrade-one-python-dependency.yml@refs/heads/master` --- requirements/edx/base.txt | 2 +- requirements/edx/development.txt | 2 +- requirements/edx/doc.txt | 2 +- requirements/edx/testing.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 92e7a060c868..062b8e636e8b 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -475,7 +475,7 @@ edx-django-utils==5.8.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.13.1 +edx-drf-extensions==9.0.0 # via # -r requirements/edx/kernel.in # edx-completion diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt index 4246f381bc4f..a511bb32858d 100644 --- a/requirements/edx/development.txt +++ b/requirements/edx/development.txt @@ -756,7 +756,7 @@ edx-django-utils==5.8.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.13.1 +edx-drf-extensions==9.0.0 # via # -r requirements/edx/doc.txt # -r requirements/edx/testing.txt diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt index 347029374242..a3fe1d3054f0 100644 --- a/requirements/edx/doc.txt +++ b/requirements/edx/doc.txt @@ -560,7 +560,7 @@ edx-django-utils==5.8.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.13.1 +edx-drf-extensions==9.0.0 # via # -r requirements/edx/base.txt # edx-completion diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt index 251cfe28024d..3286fe97af9d 100644 --- a/requirements/edx/testing.txt +++ b/requirements/edx/testing.txt @@ -583,7 +583,7 @@ edx-django-utils==5.8.0 # openedx-blockstore # ora2 # super-csv -edx-drf-extensions==8.13.1 +edx-drf-extensions==9.0.0 # via # -r requirements/edx/base.txt # edx-completion From 18cb734bd2138909329a927c3633f799a30af026 Mon Sep 17 00:00:00 2001 From: Robert Raposa Date: Mon, 27 Nov 2023 12:59:56 -0500 Subject: [PATCH 2/2] fix: compatibility change for edx-drf-extensions 9.0.0 edx-drf-extensions 9.0.0 requires VERIFY_LMS_USER_ID_PROPERTY_NAME to be properly set in LMS to get the appropriate verification when forgiving JWTs is enabled (which will soon be by default). See openedx/edx-drf-extensions#408 for details. This is part of: edx/edx-arch-experiments#429 --- lms/envs/common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lms/envs/common.py b/lms/envs/common.py index 3bc762636b98..820e4ecd9f65 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -4411,6 +4411,8 @@ def _make_locale_paths(settings): # pylint: disable=missing-function-docstring # Set this value to an empty dict in order to prevent automatically updating # user data from values in (possibly stale) JWTs. 'JWT_PAYLOAD_USER_ATTRIBUTE_MAPPING': {}, + # Allows JWT authentication to find the LMS user id for verification + 'VERIFY_LMS_USER_ID_PROPERTY_NAME': 'id', } ################################ Settings for rss_proxy ################################