From 67a56c270fa51cce4fec7ca9f3b1f9d5059686b4 Mon Sep 17 00:00:00 2001
From: Marcos <mrigoli@2u.com>
Date: Wed, 15 Jan 2025 15:04:38 -0300
Subject: [PATCH] chore: Moved jwt file to openedx.core.lib

---
 lms/djangoapps/courseware/views/views.py                     | 2 +-
 {lms/djangoapps/courseware => openedx/core/lib}/jwt.py       | 0
 .../courseware => openedx/core/lib}/tests/test_jwt.py        | 2 +-
 requirements/edx/base.txt                                    | 5 +----
 requirements/edx/development.txt                             | 2 +-
 requirements/edx/doc.txt                                     | 2 +-
 requirements/edx/testing.txt                                 | 2 +-
 7 files changed, 6 insertions(+), 9 deletions(-)
 rename {lms/djangoapps/courseware => openedx/core/lib}/jwt.py (100%)
 rename {lms/djangoapps/courseware => openedx/core/lib}/tests/test_jwt.py (97%)

diff --git a/lms/djangoapps/courseware/views/views.py b/lms/djangoapps/courseware/views/views.py
index 65c4172798..19eabe6929 100644
--- a/lms/djangoapps/courseware/views/views.py
+++ b/lms/djangoapps/courseware/views/views.py
@@ -91,7 +91,6 @@ from lms.djangoapps.courseware.courses import (
 )
 from lms.djangoapps.courseware.date_summary import verified_upgrade_deadline_link
 from lms.djangoapps.courseware.exceptions import CourseAccessRedirect, Redirect
-from lms.djangoapps.courseware.jwt import unpack_jwt
 from lms.djangoapps.courseware.masquerade import is_masquerading_as_specific_student, setup_masquerade
 from lms.djangoapps.courseware.model_data import FieldDataCache
 from lms.djangoapps.courseware.models import BaseStudentModuleHistory, StudentModule
@@ -138,6 +137,7 @@ from openedx.core.djangoapps.video_config.toggles import PUBLIC_VIDEO_SHARE
 from openedx.core.djangoapps.zendesk_proxy.utils import create_zendesk_ticket
 from openedx.core.djangolib.markup import HTML, Text
 from openedx.core.lib.courses import get_course_by_id
+from openedx.core.lib.jwt import unpack_jwt
 from openedx.core.lib.mobile_utils import is_request_from_mobile_app
 from openedx.features.course_duration_limits.access import generate_course_expired_fragment
 from openedx.features.course_experience import course_home_url
diff --git a/lms/djangoapps/courseware/jwt.py b/openedx/core/lib/jwt.py
similarity index 100%
rename from lms/djangoapps/courseware/jwt.py
rename to openedx/core/lib/jwt.py
diff --git a/lms/djangoapps/courseware/tests/test_jwt.py b/openedx/core/lib/tests/test_jwt.py
similarity index 97%
rename from lms/djangoapps/courseware/tests/test_jwt.py
rename to openedx/core/lib/tests/test_jwt.py
index a513b1fec6..79caf0207f 100644
--- a/lms/djangoapps/courseware/tests/test_jwt.py
+++ b/openedx/core/lib/tests/test_jwt.py
@@ -7,7 +7,7 @@ from django.conf import settings
 from jwkest import BadSignature, Expired, Invalid, MissingKey, jwk
 from jwkest.jws import JWS
 
-from lms.djangoapps.courseware.jwt import _encode_and_sign, create_jwt, unpack_jwt
+from openedx.core.lib.jwt import _encode_and_sign, create_jwt, unpack_jwt
 
 
 test_user_id = 121
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index b9179d11ff..c8f2af138c 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -80,9 +80,6 @@ boto3==1.36.3
     #   ora2
 botocore==1.36.3
     # via
-    #   -r requirements/edx/kernel.in
-    #   boto3
-    #   s3transfer
 bridgekeeper==0.9
     # via -r requirements/edx/kernel.in
 cachecontrol==0.14.2
@@ -1213,7 +1210,7 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.20
+urllib3==2.2.3
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   botocore
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 8ec4d878f0..61305f1cbc 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -2170,7 +2170,7 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.20
+urllib3==2.2.3
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 1619e39725..c08b5b6fb3 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -1527,7 +1527,7 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.20
+urllib3==2.2.3
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 8f007851e6..ae5aed4234 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1613,7 +1613,7 @@ uritemplate==4.1.1
     #   drf-spectacular
     #   drf-yasg
     #   google-api-python-client
-urllib3==1.26.20
+urllib3==2.2.3
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt