From 620516cb48c62d0c21d660fbae0be867040b3f06 Mon Sep 17 00:00:00 2001
From: magajh <maria.jaimes@edunext.co>
Date: Fri, 29 Mar 2024 09:36:33 -0400
Subject: [PATCH 01/11] chore: upgrade Django to 4.2.11

---
 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 cfaecd0ca35a..7b1e102ea4ee 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -181,7 +181,7 @@ defusedxml==0.7.1
     #   social-auth-core
 deprecated==1.2.14
     # via jwcrypto
-django==4.2.10
+django==4.2.11
     # via
     #   -r requirements/edx/kernel.in
     #   django-appconf
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 87c17c1e74ae..4a118511706b 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -343,7 +343,7 @@ distlib==0.3.7
     # via
     #   -r requirements/edx/testing.txt
     #   virtualenv
-django==4.2.10
+django==4.2.11
     # via
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 9ec73dc14a36..11fe51833e3f 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -230,7 +230,7 @@ deprecated==1.2.14
     # via
     #   -r requirements/edx/base.txt
     #   jwcrypto
-django==4.2.10
+django==4.2.11
     # via
     #   -r requirements/edx/base.txt
     #   django-appconf
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index a4b87c9178e4..8addb5189810 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -263,7 +263,7 @@ dill==0.3.7
     # via pylint
 distlib==0.3.7
     # via virtualenv
-django==4.2.10
+django==4.2.11
     # via
     #   -r requirements/edx/base.txt
     #   django-appconf

From 900fad09a24466e70d3bda9d9858e50b738aae5f Mon Sep 17 00:00:00 2001
From: magajh <maria.jaimes@edunext.co>
Date: Sun, 31 Mar 2024 22:31:38 -0400
Subject: [PATCH 02/11] chore: compile requirements

---
 requirements/common_constraints.txt | 11 ++++++++++-
 requirements/edx/base.txt           |  5 ++++-
 requirements/edx/development.txt    |  2 ++
 requirements/edx/doc.txt            |  2 ++
 requirements/edx/testing.txt        |  2 ++
 requirements/pip-tools.txt          |  4 +++-
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/requirements/common_constraints.txt b/requirements/common_constraints.txt
index 7313473a1675..4abc9ae22cb3 100644
--- a/requirements/common_constraints.txt
+++ b/requirements/common_constraints.txt
@@ -17,10 +17,19 @@
 
 
 # using LTS django version
-
+Django<5.0
 
 # elasticsearch>=7.14.0 includes breaking changes in it which caused issues in discovery upgrade process.
 # elastic search changelog: https://www.elastic.co/guide/en/enterprise-search/master/release-notes-7.14.0.html
 elasticsearch<7.14.0
 
 # django-simple-history>3.0.0 adds indexing and causes a lot of migrations to be affected
+
+# opentelemetry requires version 6.x at the moment:
+# https://github.com/open-telemetry/opentelemetry-python/issues/3570
+# Normally this could be added as a constraint in edx-django-utils, where we're
+# adding the opentelemetry dependency. However, when we compile pip-tools.txt,
+# that uses version 7.x, and then there's no undoing that when compiling base.txt.
+# So we need to pin it globally, for now.
+# Ticket for unpinning: https://github.com/openedx/edx-lint/issues/407
+importlib-metadata<7
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 7b1e102ea4ee..393d016a73e7 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -183,6 +183,7 @@ deprecated==1.2.14
     # via jwcrypto
 django==4.2.11
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/kernel.in
     #   django-appconf
     #   django-celery-results
@@ -610,7 +611,9 @@ idna==3.4
     #   snowflake-connector-python
     #   yarl
 importlib-metadata==6.8.0
-    # via markdown
+    # via
+    #   -c requirements/edx/../common_constraints.txt
+    #   markdown
 importlib-resources==6.1.0
     # via
     #   jsonschema
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 4a118511706b..7383f5747be7 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -345,6 +345,7 @@ distlib==0.3.7
     #   virtualenv
 django==4.2.11
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
     #   django-appconf
@@ -1011,6 +1012,7 @@ import-linter==1.12.0
     # via -r requirements/edx/testing.txt
 importlib-metadata==6.8.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/../pip-tools.txt
     #   -r requirements/edx/doc.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index 11fe51833e3f..026ffa4a9f7a 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -232,6 +232,7 @@ deprecated==1.2.14
     #   jwcrypto
 django==4.2.11
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   django-appconf
     #   django-celery-results
@@ -711,6 +712,7 @@ imagesize==1.4.1
     # via sphinx
 importlib-metadata==6.8.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   markdown
     #   sphinx
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 8addb5189810..202e33a40ee7 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -265,6 +265,7 @@ distlib==0.3.7
     # via virtualenv
 django==4.2.11
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   django-appconf
     #   django-celery-results
@@ -767,6 +768,7 @@ import-linter==1.12.0
     # via -r requirements/edx/testing.in
 importlib-metadata==6.8.0
     # via
+    #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt
     #   markdown
     #   pytest-randomly
diff --git a/requirements/pip-tools.txt b/requirements/pip-tools.txt
index ea283f4ad3ad..d2e5211cc4bd 100644
--- a/requirements/pip-tools.txt
+++ b/requirements/pip-tools.txt
@@ -11,7 +11,9 @@ click==8.1.6
     #   -c requirements/constraints.txt
     #   pip-tools
 importlib-metadata==6.8.0
-    # via build
+    # via
+    #   -c requirements/common_constraints.txt
+    #   build
 packaging==23.2
     # via build
 pip-tools==7.3.0

From 0906265588cd7e227878c59146204cf78e94f811 Mon Sep 17 00:00:00 2001
From: Navin Karkera <navin@opencraft.com>
Date: Thu, 16 Nov 2023 16:09:08 +0530
Subject: [PATCH 03/11] fix: session_language url renamed to update_language

The url was renamed from session_language to update_language but it was still referred to in some html templates
---
 cms/templates/widgets/header.html        | 2 +-
 lms/templates/header/header.html         | 2 +-
 lms/templates/navigation/navigation.html | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cms/templates/widgets/header.html b/cms/templates/widgets/header.html
index 6dd94ec78c55..34ea5584c428 100644
--- a/cms/templates/widgets/header.html
+++ b/cms/templates/widgets/header.html
@@ -324,7 +324,7 @@ <h3 class="title"><span class="label">${_("Tools")}</span> <span class="icon fa
               % if user.is_authenticated:
               <input title="preference api" type="hidden" id="preference-api-url" class="url-endpoint" value="${reverse('preferences_api', kwargs={'username': user.username})}" data-user-is-authenticated="true">
               % else:
-              <input title="session update url" type="hidden" id="update-session-url" class="url-endpoint" value="${reverse('session_language')}" data-user-is-authenticated="false">
+              <input title="session update url" type="hidden" id="update-session-url" class="url-endpoint" value="${reverse('update_language')}" data-user-is-authenticated="false">
               % endif
               <label><span class="sr">${_("Choose Language")}</span>
               <select class="input select language-selector" id="settings-language-value" name="language">
diff --git a/lms/templates/header/header.html b/lms/templates/header/header.html
index ed2efac17c10..3fafde87e07f 100644
--- a/lms/templates/header/header.html
+++ b/lms/templates/header/header.html
@@ -90,7 +90,7 @@
             % if user.is_authenticated:
                 <input title="preference api" type="hidden" class="url-endpoint" value="${reverse('preferences_api', kwargs={'username': user.username})}" data-user-is-authenticated="true">
             % else:
-                <input title="session update url" type="hidden" class="url-endpoint" value="${reverse('session_language')}" data-user-is-authenticated="false">
+                <input title="session update url" type="hidden" class="url-endpoint" value="${reverse('update_language')}" data-user-is-authenticated="false">
             % endif
             <label><span class="sr">${_("Choose Language")}</span>
             <select class="input select language-selector" id="settings-language-value" name="language">
diff --git a/lms/templates/navigation/navigation.html b/lms/templates/navigation/navigation.html
index b4d0b5b83e95..118ab1e46fbe 100644
--- a/lms/templates/navigation/navigation.html
+++ b/lms/templates/navigation/navigation.html
@@ -58,7 +58,7 @@
                 % if user.is_authenticated:
                   <input title="preference api" type="hidden" class="url-endpoint" value="${reverse('preferences_api', kwargs={'username': user.username})}" data-user-is-authenticated="true">
                 % else:
-                  <input title="session update url" type="hidden" class="url-endpoint" value="${reverse('session_language')}" data-user-is-authenticated="false">
+                  <input title="session update url" type="hidden" class="url-endpoint" value="${reverse('update_language')}" data-user-is-authenticated="false">
                 % endif
                 <label><span class="sr">${_("Choose Language")}</span>
                   <select class="input select language-selector" id="settings-language-value" name="language">
@@ -92,4 +92,4 @@
 
 % if settings.FEATURES.get('ENABLE_COOKIE_CONSENT', False):
   <%include file="../widgets/cookie-consent.html" />
-% endif
\ No newline at end of file
+% endif

From 49cdbff397dc178a02b40b3335c5c636e46cc2f4 Mon Sep 17 00:00:00 2001
From: Ihor Romaniuk <ihor.romaniuk@raccoongang.com>
Date: Thu, 4 Apr 2024 17:08:41 +0200
Subject: [PATCH 04/11] fix: decoration of see all children link in wiki pages
 (#33669)

---
 lms/static/sass/course/wiki/_wiki.scss | 2 +-
 lms/templates/wiki/article.html        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index b3023af1d7bb..c896ff391868 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -262,9 +262,9 @@
       a {
         display: block;
         padding: 2px 4px 2px 10px;
-        border-radius: 3px;
         font-size: 0.9em;
         line-height: 25px;
+        border-left: 1px solid $m-blue;
 
         &:hover,
         &:focus {
diff --git a/lms/templates/wiki/article.html b/lms/templates/wiki/article.html
index 542512c762d0..1a38d01aeb6d 100644
--- a/lms/templates/wiki/article.html
+++ b/lms/templates/wiki/article.html
@@ -33,7 +33,7 @@ <h3 class="entry-title">{{ article.current_revision.title }}</h3>
 
       {% if urlpath %}
       <div class="see-children">
-        <a href="{% url 'wiki:dir' path=urlpath.path %}">{% trans "See all children" as tmsg %} | {{ tmsg | force_escape}}</a>
+        <a href="{% url 'wiki:dir' path=urlpath.path %}">{% trans "See all children" as tmsg %} {{ tmsg | force_escape}}</a>
       </div>
       {% endif %}
     </div>

From eb112610370f222d1ede2099bfab977c1afa5877 Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Fri, 5 Apr 2024 08:53:27 +0200
Subject: [PATCH 05/11] fix: validation error for empty Batch Enrollment/Beta
 Tester (#34404)

Co-authored-by: Dima Alipov <dimaalipov@MacBook-Pro-Dima.local>
---
 .../js/instructor_dashboard/membership.js     | 45 ++++++++++++++-----
 1 file changed, 34 insertions(+), 11 deletions(-)

diff --git a/lms/static/js/instructor_dashboard/membership.js b/lms/static/js/instructor_dashboard/membership.js
index 5fdf4a42ef63..0cdb6d28330a 100644
--- a/lms/static/js/instructor_dashboard/membership.js
+++ b/lms/static/js/instructor_dashboard/membership.js
@@ -503,14 +503,20 @@ such that the value can be defined later than this assignment (file load order).
                 }));
                 $idsList = $('<ul/>');
                 $taskResSection.append($idsList);
-                for (j = 0, len1 = ids.length; j < len1; j++) {
-                    identifier = ids[j];
-                    $idsList.append($('<li/>', {
-                        text: identifier
-                    }));
-                }
+                if (ids && ids.length > 0) {
+                    for (j = 0, len1 = ids.length; j < len1; j++) {
+                        identifier = ids[j];
+                        $idsList.append($('<li/>', {
+                            text: identifier
+                        }));
+                    }
+                } 
                 return displayResponse.$task_response.append($taskResSection);
             };
+            if (errors.length === 0 && successes.length === 0 && noUsers.length === 0) {
+                // Translators: For cases when the input field is empty;
+                renderList(gettext('This field must not be blank'), []);
+            }
             if (successes.length && dataFromServer.action === 'add') {
                 var j, len1, inActiveUsers, activeUsers; // eslint-disable-line vars-on-top
                 activeUsers = [];
@@ -585,6 +591,9 @@ such that the value can be defined later than this assignment (file load order).
                         sr = noUsers[j];
                         results.push(sr.identifier);
                     }
+                    results.unshift(
+                        gettext('Users must create and activate their account before they can be promoted to beta tester.')
+                    );
                     return results;
                 }()));
             }
@@ -699,14 +708,28 @@ such that the value can be defined later than this assignment (file load order).
                 }));
                 $idsList = $('<ul/>');
                 $taskResSection.append($idsList);
-                for (h = 0, len3 = ids.length; h < len3; h++) {
-                    identifier = ids[h];
-                    $idsList.append($('<li/>', {
-                        text: identifier
-                    }));
+                if (ids && ids.length > 0) {
+                    for (h = 0, len3 = ids.length; h < len3; h++) {
+                        identifier = ids[h];
+                        $idsList.append($('<li/>', {
+                            text: identifier
+                        }));
+                    }
                 }
                 return displayResponse.$task_response.append($taskResSection);
             };
+            if (
+                invalidIdentifier.length === 0
+                && errors.length === 0
+                && enrolled.length === 0
+                && allowed.length === 0
+                && autoenrolled.length === 0
+                && notenrolled.length === 0
+                && notunenrolled.length === 0
+            ) {
+                // Translators: For cases when the input field is empty;
+                renderList(gettext('This field must not be blank'), []);
+            }
             if (invalidIdentifier.length) {
                 renderList(gettext('The following email addresses and/or usernames are invalid:'), (function() {
                     var m, len4, results;

From 2eb82ad0fc13671226ab8e3120ed3e0425e39dad Mon Sep 17 00:00:00 2001
From: Rafay Ghafoor <rafayghafoor@pm.me>
Date: Thu, 21 Sep 2023 16:24:42 +0500
Subject: [PATCH 06/11] feat: Adds disable_progress_graph attribute to the
 returned course_metadata response

Currently, https://github.com/openedx/frontend-app-course-authoring/issues/517 faces an issue when the
progress graph toggle is enabled/disabled but the settings are not respected, the disable_progress_graph
attribute will allow the frontend-app-learning repo to use this attribute to respect the settings authored
from frontend-app-course-authoring and ultimately fix https://github.com/openedx/frontend-app-course-authoring/issues/517.
---
 lms/djangoapps/course_home_api/progress/serializers.py | 1 +
 lms/djangoapps/course_home_api/progress/views.py       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lms/djangoapps/course_home_api/progress/serializers.py b/lms/djangoapps/course_home_api/progress/serializers.py
index 190cd76bf9b5..6bdc204434af 100644
--- a/lms/djangoapps/course_home_api/progress/serializers.py
+++ b/lms/djangoapps/course_home_api/progress/serializers.py
@@ -145,3 +145,4 @@ class ProgressTabSerializer(VerifiedModeSerializer):
     username = serializers.CharField()
     user_has_passing_grade = serializers.BooleanField()
     verification_data = VerificationDataSerializer()
+    disable_progress_graph = serializers.BooleanField()
diff --git a/lms/djangoapps/course_home_api/progress/views.py b/lms/djangoapps/course_home_api/progress/views.py
index 8c21335dcacf..3783c19061dc 100644
--- a/lms/djangoapps/course_home_api/progress/views.py
+++ b/lms/djangoapps/course_home_api/progress/views.py
@@ -230,6 +230,7 @@ def get(self, request, *args, **kwargs):
 
         block = modulestore().get_course(course_key)
         grading_policy = block.grading_policy
+        disable_progress_graph = block.disable_progress_graph
         verification_status = IDVerificationService.user_status(student)
         verification_link = None
         if verification_status['status'] is None or verification_status['status'] == 'expired':
@@ -259,6 +260,7 @@ def get(self, request, *args, **kwargs):
             'username': username,
             'user_has_passing_grade': user_has_passing_grade,
             'verification_data': verification_data,
+            'disable_progress_graph': disable_progress_graph,
         }
         context = self.get_serializer_context()
         context['staff_access'] = is_staff

From 25eb2238c5cf3a2ca103078032ffb2978d95b94d Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Wed, 10 Apr 2024 21:58:34 +0200
Subject: [PATCH 07/11] feat: add ability to notify credentials about honor
 certificates (#34485)

Co-authored-by: Dima Alipov <dimaalipov@MacBook-Pro-Dima.local>
---
 .../djangoapps/credentials/tasks/v1/tasks.py     | 16 +++++++++++++---
 openedx/core/djangoapps/programs/tasks.py        | 10 ++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/openedx/core/djangoapps/credentials/tasks/v1/tasks.py b/openedx/core/djangoapps/credentials/tasks/v1/tasks.py
index dad4d3618a97..ae0a3da8ae92 100644
--- a/openedx/core/djangoapps/credentials/tasks/v1/tasks.py
+++ b/openedx/core/djangoapps/credentials/tasks/v1/tasks.py
@@ -373,7 +373,11 @@ def send_grade_if_interesting(
     # Don't worry about whether it's available as well as awarded. Just awarded is good enough to record a verified
     # attempt at a course. We want even the grades that didn't pass the class because Credentials wants to know about
     # those too.
-    if mode not in INTERESTING_MODES or status not in INTERESTING_STATUSES:
+    if (
+        mode not in INTERESTING_MODES
+        and not CourseMode.is_eligible_for_certificate(mode)
+        or status not in INTERESTING_STATUSES
+    ):
         if verbose:
             logger.info(f"Skipping send grade: mode/status uninteresting for mode [{mode}] & status [{status}]")
         return
@@ -452,7 +456,10 @@ def backfill_date_for_all_course_runs():
         course_key = str(course_run.id)
         course_modes = CourseMode.objects.filter(course_id=course_key)
         # There should only ever be one certificate relevant mode per course run
-        modes = [mode.slug for mode in course_modes if mode.slug in CourseMode.CERTIFICATE_RELEVANT_MODES]
+        modes = [
+            mode.slug for mode in course_modes
+            if mode.slug in CourseMode.CERTIFICATE_RELEVANT_MODES or CourseMode.is_eligible_for_certificate(mode.slug)
+        ]
         if len(modes) != 1:
             logger.exception(
                 f'Either course {course_key} has no certificate mode or multiple modes. Task failed.'
@@ -503,7 +510,10 @@ def clean_certificate_available_date():
         course_key = str(course_run.id)
         course_modes = CourseMode.objects.filter(course_id=course_key)
         # There should only ever be one certificate relevant mode per course run
-        modes = [mode.slug for mode in course_modes if mode.slug in CourseMode.CERTIFICATE_RELEVANT_MODES]
+        modes = [
+            mode.slug for mode in course_modes
+            if mode.slug in CourseMode.CERTIFICATE_RELEVANT_MODES or CourseMode.is_eligible_for_certificate(mode.slug)
+        ]
         if len(modes) != 1:
             logger.exception(f'Either course {course_key} has no certificate mode or multiple modes. Task failed.')
         # if there is only one relevant mode, post to credentials
diff --git a/openedx/core/djangoapps/programs/tasks.py b/openedx/core/djangoapps/programs/tasks.py
index a22bff876de4..0a23be073b50 100644
--- a/openedx/core/djangoapps/programs/tasks.py
+++ b/openedx/core/djangoapps/programs/tasks.py
@@ -384,7 +384,10 @@ def update_credentials_course_certificate_configuration_available_date(
     course_key = str(course_key)
     course_modes = CourseMode.objects.filter(course_id=course_key)
     # There should only ever be one certificate relevant mode per course run
-    modes = [mode.slug for mode in course_modes if mode.slug in CourseMode.CERTIFICATE_RELEVANT_MODES]
+    modes = [
+        mode.slug for mode in course_modes
+        if mode.slug in CourseMode.CERTIFICATE_RELEVANT_MODES or CourseMode.is_eligible_for_certificate(mode.slug)
+    ]
     if len(modes) != 1:
         LOGGER.exception(
             f'Either course {course_key} has no certificate mode or multiple modes. Task failed.'
@@ -471,7 +474,10 @@ def _retry_with_custom_exception(username, course_run_key, reason, countdown):
                 f"for {course_key} to user {username}"
             )
             return
-        if certificate.mode in CourseMode.CERTIFICATE_RELEVANT_MODES:
+        if (
+            certificate.mode in CourseMode.CERTIFICATE_RELEVANT_MODES
+            or CourseMode.is_eligible_for_certificate(certificate.mode)
+        ):
             try:
                 course_overview = CourseOverview.get_from_id(course_key)
             except (CourseOverview.DoesNotExist, OSError):

From a6bd0e2fccd75b9b675d0b7f1f0f2c41ebf76cb3 Mon Sep 17 00:00:00 2001
From: Taras Lytvynenko <69678257+Inferato@users.noreply.github.com>
Date: Thu, 11 Apr 2024 00:39:27 +0300
Subject: [PATCH 08/11] fix: Social link parsing approach changed (#33610)

* fix: Social link parsing approach changed

* fix: fix tests

* fix: better approach
---
 .../core/djangoapps/user_api/accounts/tests/test_utils.py   | 2 +-
 openedx/core/djangoapps/user_api/accounts/utils.py          | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/openedx/core/djangoapps/user_api/accounts/tests/test_utils.py b/openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
index 5755143e4a94..3b9293487361 100644
--- a/openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
+++ b/openedx/core/djangoapps/user_api/accounts/tests/test_utils.py
@@ -43,7 +43,7 @@ def validate_social_link(self, social_platform, link):
         ('twitter', 'https://www.twiter.com/edX/', None, False),
         ('twitter', 'https://www.twitter.com/edX/123s', None, False),
         ('twitter', 'twitter.com/edX', 'https://www.twitter.com/edX', True),
-        ('twitter', 'twitter.com/edX?foo=bar', 'https://www.twitter.com/edX', True),
+        ('twitter', 'twitter.com/edX?foo=bar', 'https://www.twitter.com/edX?foo=bar', True),
         ('twitter', 'twitter.com/test.user', 'https://www.twitter.com/test.user', True),
         ('linkedin', 'www.linkedin.com/harryrein', None, False),
         ('linkedin', 'www.linkedin.com/in/harryrein-1234', 'https://www.linkedin.com/in/harryrein-1234', True),
diff --git a/openedx/core/djangoapps/user_api/accounts/utils.py b/openedx/core/djangoapps/user_api/accounts/utils.py
index 1326c36a2eb5..13f8459cedd7 100644
--- a/openedx/core/djangoapps/user_api/accounts/utils.py
+++ b/openedx/core/djangoapps/user_api/accounts/utils.py
@@ -6,7 +6,6 @@
 import random
 import re
 import string
-from urllib.parse import urlparse  # pylint: disable=import-error
 
 import waffle  # lint-amnesty, pylint: disable=invalid-django-waffle-import
 from completion.models import BlockCompletion
@@ -85,11 +84,8 @@ def _get_username_from_social_link(platform_name, new_social_link):
     if not new_social_link:
         return new_social_link
 
-    # Parse the social link as if it were a URL.
-    parse_result = urlparse(new_social_link)
-    url_domain_and_path = parse_result[1] + parse_result[2]
     url_stub = re.escape(settings.SOCIAL_PLATFORMS[platform_name]['url_stub'])
-    username_match = re.search(r'(www\.)?' + url_stub + r'(?P<username>.*?)[/]?$', url_domain_and_path, re.IGNORECASE)
+    username_match = re.search(r'(www\.)?' + url_stub + r'(?P<username>.+?)(?:/)?$', new_social_link, re.IGNORECASE)
     if username_match:
         username = username_match.group('username')
     else:

From b036cd002bfa89111d451ce382af264e5556edad Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Tue, 23 Apr 2024 15:24:18 +0200
Subject: [PATCH 09/11] fix: "Course org display str" option doesnt influence
 certificate (#34466)

"Course organization display string" option in Advanced settings
doesn't influence certificate.

Co-authored-by: Dima Alipov <dimaalipov@MacBook-Pro-Dima.local>
---
 lms/djangoapps/certificates/views/webview.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/certificates/views/webview.py b/lms/djangoapps/certificates/views/webview.py
index 4d99b7d7722d..eddddbb88717 100644
--- a/lms/djangoapps/certificates/views/webview.py
+++ b/lms/djangoapps/certificates/views/webview.py
@@ -458,14 +458,15 @@ def _update_organization_context(context, course):
     Updates context with organization related info.
     """
     partner_long_name, organization_logo = None, None
-    partner_short_name = course.display_organization if course.display_organization else course.org
+    course_org_display = course.display_organization
     organizations = organizations_api.get_course_organizations(course_key=course.id)
     if organizations:
         # TODO Need to add support for multiple organizations, Currently we are interested in the first one.
         organization = organizations[0]
         partner_long_name = organization.get('name', partner_long_name)
-        partner_short_name = organization.get('short_name', partner_short_name)
+        course_org_display = course_org_display or organization.get('short_name')
         organization_logo = organization.get('logo', None)
+    partner_short_name = course_org_display or course.org
 
     context['organization_long_name'] = partner_long_name
     context['organization_short_name'] = partner_short_name

From d91cadfeb39694e1725f7e70318ee1e1aac04d70 Mon Sep 17 00:00:00 2001
From: Muhammad Qasim Gulzar <19186089+qasimgulzar@users.noreply.github.com>
Date: Sat, 11 May 2024 03:40:09 +0500
Subject: [PATCH 10/11] fix: Course blocks API with param return_type=list
 error when the new discussion is enabled (#34426)

Co-authored-by: Jason Wesson <jsnwesson@gmail.com>
---
 lms/djangoapps/course_api/blocks/utils.py | 37 +++++++++++++++++------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/lms/djangoapps/course_api/blocks/utils.py b/lms/djangoapps/course_api/blocks/utils.py
index 3a9fea117c23..0af24b951ade 100644
--- a/lms/djangoapps/course_api/blocks/utils.py
+++ b/lms/djangoapps/course_api/blocks/utils.py
@@ -1,6 +1,8 @@
 """
    Utils for Blocks
 """
+from rest_framework.utils.serializer_helpers import ReturnList
+
 from openedx.core.djangoapps.discussions.models import (
     DiscussionsConfiguration,
     Provider,
@@ -15,16 +17,28 @@ def filter_discussion_xblocks_from_response(response, course_key):
     provider = configuration.provider_type
     if provider == Provider.OPEN_EDX:
         # Finding ids of discussion xblocks
-        discussion_xblocks = [
-            key for key, value in response.data.get('blocks', {}).items()
-            if value.get('type') == 'discussion'
-        ]
+        if isinstance(response.data, ReturnList):
+            discussion_xblocks = [
+                value.get('id') for value in response.data if value.get('type') == 'discussion'
+            ]
+        else:
+            discussion_xblocks = [
+                key for key, value in response.data.get('blocks', {}).items()
+                if value.get('type') == 'discussion'
+            ]
         # Filtering discussion xblocks keys from blocks
-        filtered_blocks = {
-            key: value
-            for key, value in response.data.get('blocks', {}).items()
-            if value.get('type') != 'discussion'
-        }
+        if isinstance(response.data, ReturnList):
+            filtered_blocks = {
+                value.get('id'): value
+                for value in response.data
+                if value.get('type') != 'discussion'
+            }
+        else:
+            filtered_blocks = {
+                key: value
+                for key, value in response.data.get('blocks', {}).items()
+                if value.get('type') != 'discussion'
+            }
         # Removing reference of discussion xblocks from unit
         # These references needs to be removed because they no longer exist
         for _, block_data in filtered_blocks.items():
@@ -36,5 +50,8 @@ def filter_discussion_xblocks_from_response(response, course_key):
                         if descendant not in discussion_xblocks
                     ]
                     block_data[key] = descendants
-        response.data['blocks'] = filtered_blocks
+        if isinstance(response.data, ReturnList):
+            response.data = filtered_blocks
+        else:
+            response.data['blocks'] = filtered_blocks
     return response

From 3ff69fd5813256f935f19c237ea0c42d4c16edbf Mon Sep 17 00:00:00 2001
From: David Ormsbee <dave@axim.org>
Date: Mon, 13 May 2024 12:06:54 -0400
Subject: [PATCH 11/11] fix: prevent setting user attributes from JWT in Studio

Open edX implements its a JwtAuthentication class in edx-drf-extensions
(in edx_rest_framework_extensions.auth.jwt.authentication). This class
updates the local User database entry to match certain values in the
token. It's used as a way to automatically provision and update users
with their LMS user information on other Open edX services like
ecommerce.

Since LMS and Studio keep the record of truth in its database tables,
they should *not* update their database user information based on the
JWT. Doing so would allow stale JWTs to incorrectly reset user values
after they had been changed in the LMS. This is done by having the
EDX_DRF_EXTENSIONS['JWT_PAYLOAD_USER_ATTRIBUTE_MAPPING'] setting be an
empty dictionary, and was set correctly for the LMS in its common.py env
settings module. Unfortunately, this was *not* being set for Studio.

This commit adds the same setting to Studio's common settings module.
Prior to this commit, it was possible for a stale JWT to reset user
attributes if the user hit a Studio API endpoint that used JWT for  auth
(e.g. endpoints used by the Course Authoring MFE). This opened up a
potential security issue where a global staff user (is_staff=True) that
had their global staff status removed (is_staff=False) could have up to
a one hour window in which they could use their stale-but-still-valid
global-staff JWT token to regain global staff status by calling a Studio
endpoint with their browser.
---
 cms/envs/common.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index d5e561aa9cf9..eb7b61f8c9f7 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -2273,7 +2273,6 @@
 
 ############################ OAUTH2 Provider ###################################
 
-
 # 5 minute expiration time for JWT id tokens issued for external API requests.
 OAUTH_ID_TOKEN_EXPIRATION = 5 * 60
 
@@ -2289,6 +2288,12 @@
 API_DOCUMENTATION_URL = 'https://course-catalog-api-guide.readthedocs.io/en/latest/'
 AUTH_DOCUMENTATION_URL = 'https://course-catalog-api-guide.readthedocs.io/en/latest/authentication/index.html'
 
+EDX_DRF_EXTENSIONS = {
+    # 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': {},
+}
+
 ############## Settings for Studio Context Sensitive Help ##############
 
 HELP_TOKENS_INI_FILE = REPO_ROOT / "cms" / "envs" / "help_tokens.ini"