From 92e47ca8dfb7b7f84a53a3b9f1aa829630e21293 Mon Sep 17 00:00:00 2001
From: Fabe Z <zengjiayifabe@outlook.com>
Date: Mon, 13 Nov 2023 13:45:54 -0500
Subject: [PATCH 01/18] feat!: edit course component

edit course component
---
 lms/static/sass/views/_homepage.scss | 71 +++++++++++++++++++++-------
 lms/templates/course.html            | 31 +++++++-----
 lms/templates/main.html              |  1 +
 uwsgi.ini                            |  0
 4 files changed, 75 insertions(+), 28 deletions(-)
 create mode 100755 uwsgi.ini

diff --git a/lms/static/sass/views/_homepage.scss b/lms/static/sass/views/_homepage.scss
index bb7963fba6c3..efa7483db2d7 100644
--- a/lms/static/sass/views/_homepage.scss
+++ b/lms/static/sass/views/_homepage.scss
@@ -28,7 +28,7 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
       @include transition(all $tmg-f3 linear 0s);
 
       position: relative;
-      border-bottom: 3px solid $action-primary-bg;
+      // border-bottom: 3px solid $action-primary-bg;
       box-shadow: 0 1px 10px 0 $black-t0, inset 0 0 0 1px $white-t3;
       background: $body-bg;
       width: 100%;
@@ -81,7 +81,7 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
       }
 
       .course-info {
-        height: $course-info-height;
+        height: ($baseline*5.5);
         font-family: $font-family-sans-serif;
 
         h2 {
@@ -89,30 +89,29 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
         }
 
         .course-organization,
-        .course-code,
-        .course-date {
+        .course-code {
           @extend %t-icon6;
 
-          color: $gray-d2;
-        }
-
-        .course-organization,
-        .course-code,
-        .course-title {
-          display: block;
+          color: #e85351;
+          display: inline;
           text-transform: none;
         }
 
         .course-organization {
           @include line-height(11);
 
-          padding: ($baseline/2) ($baseline*0.75) ($baseline/10) ($baseline*0.75);
+          padding: 0 ($baseline*0.4) 0 ($baseline*0.4);
+          background-color: #FEEBEE;
+          margin: ($baseline*0.75);
+          font-size: ($baseline*0.55);
         }
 
         .course-code {
           @include line-height(16);
 
-          padding: 0 ($baseline*0.75);
+          padding: ($baseline*0.1) ($baseline*0.75);
+          float: right;
+          font-size: ($baseline*0.5);
         }
 
         .course-title {
@@ -120,16 +119,54 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
 
           @extend %t-icon4;
 
-          margin: ($baseline*0.25) 0 ($baseline*1.75) 0;
+          margin: ($baseline*0.75) 0 ($baseline*0.75) 0;
+          text-align: left;
           padding: 0 ($baseline*0.75);
-          height: $course-title-height;
-          color: $link-color;
+          height: ($baseline*1.3);
+          color: black;
+          display: block;
+          text-transform: none;
+          font-size: 75%;
+        }
+
+        .date_instructor_container {
+          border: 1px solid #E9EAF0;
+          position: absolute;
+          bottom: 0;
+          width: 100%;
+          padding: ($baseline*0.3) 0;
         }
 
         .course-date {
           @include line-height(14);
 
-          padding: ($baseline/10) ($baseline*0.75);
+          // padding: (3*$baseline/10) 0;
+          display: inline;
+          font-size: ($baseline*0.5);
+          color: #777986;
+        }
+
+        .course-instructor {
+          @include line-height(14);
+
+          padding: (3*$baseline/10) ($baseline*0.65) (3*$baseline/10) 0;
+          // display: inline-block;
+          font-size: ($baseline*0.5);
+          color: #777986;
+        }
+
+        .instructor-wrapper {
+          float: right;
+          display: inline;
+        }
+
+        .date-clock {
+          color: #EB999A;
+          padding-left: ($baseline*0.65);
+        }
+
+        .instructor-icon {
+          color: #EB999A;
         }
       }
 
diff --git a/lms/templates/course.html b/lms/templates/course.html
index db765a62abc2..7f5637bd8b8d 100644
--- a/lms/templates/course.html
+++ b/lms/templates/course.html
@@ -20,17 +20,26 @@ <h2 class="course-name">
         <span class="course-code">${course.display_number_with_default}</span>
         <span class="course-title">${course.display_name_with_default}</span>
       </h2>
-      <%
-      if course.start is not None:
-          course_date_string = course.start.strftime('%Y-%m-%dT%H:%M:%S%z')
-      else:
-          course_date_string = ''
-      %>
-      % if course.advertised_start is not None:
-          <div class="course-date" aria-hidden="true">${_("Starts")}: ${course.advertised_start}</div>
-      % else:
-          <div class="course-date localized_datetime" aria-hidden="true" data-format="shortDate" data-datetime="${course_date_string}" data-language="${LANGUAGE_CODE}" data-string="${_("Starts: {date}")}"></div>
-      % endif
+      <div class="date_instructor_container">
+        <span class="mdi mdi-clock-outline date-clock"></span>
+        <%
+        if course.start is not None:
+            course_date_string = course.start.strftime('%Y-%m-%dT%H:%M:%S%z')
+        else:
+            course_date_string = 'end_date_unknown'
+        %>
+        % if course.advertised_start is not None:
+            <div class="course-date" aria-hidden="true">${_("Starts")}: ${course.advertised_start}</div>
+        % else:
+            <div class="course-date localized_datetime" aria-hidden="true" data-format="shortDate" data-datetime="${course_date_string}" data-language="${LANGUAGE_CODE}" data-string="${_("Started - {date}")}"></div>
+        % endif
+        <div class="instructor-wrapper">
+          <span class="mdi mdi-account-outline instructor-icon"></span>
+          <span class="course-instructor">instructor</span>
+        </div>
+        
+      </div>
+      
     </div>
     <div class="sr">
       <ul>
diff --git a/lms/templates/main.html b/lms/templates/main.html
index ac43e6eba25f..2944d82280de 100644
--- a/lms/templates/main.html
+++ b/lms/templates/main.html
@@ -34,6 +34,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@7.3.67/css/materialdesignicons.min.css">
 
 ## Define a couple of helper functions to make life easier when
 ## embedding theme conditionals into templates. All inheriting
diff --git a/uwsgi.ini b/uwsgi.ini
new file mode 100755
index 000000000000..e69de29bb2d1

From 86d33b8d62c8267b58675181421f244d5a6b0830 Mon Sep 17 00:00:00 2001
From: Fabe Z <zengjiayifabe@outlook.com>
Date: Mon, 13 Nov 2023 17:41:03 -0500
Subject: [PATCH 02/18] feat!: adjust icon in course.html

adjust icon in course.html
---
 lms/static/sass/views/_homepage.scss | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lms/static/sass/views/_homepage.scss b/lms/static/sass/views/_homepage.scss
index efa7483db2d7..5cb93c0e355b 100644
--- a/lms/static/sass/views/_homepage.scss
+++ b/lms/static/sass/views/_homepage.scss
@@ -139,8 +139,7 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
 
         .course-date {
           @include line-height(14);
-
-          // padding: (3*$baseline/10) 0;
+          padding-left: ($baseline*1.5);
           display: inline;
           font-size: ($baseline*0.5);
           color: #777986;
@@ -150,7 +149,6 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
           @include line-height(14);
 
           padding: (3*$baseline/10) ($baseline*0.65) (3*$baseline/10) 0;
-          // display: inline-block;
           font-size: ($baseline*0.5);
           color: #777986;
         }
@@ -163,10 +161,16 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
         .date-clock {
           color: #EB999A;
           padding-left: ($baseline*0.65);
+          position: absolute;
+          bottom: ($baseline*0.45);
         }
 
         .instructor-icon {
           color: #EB999A;
+          position: absolute;
+          bottom: ($baseline*0.45);
+          margin-right: ($baseline*2);
+          right: ($baseline*0.9);
         }
       }
 

From 4a7b22a6c8be702ff1c8a7a470c7ed5476b8fd44 Mon Sep 17 00:00:00 2001
From: Fabe Z <zengjiayifabe@outlook.com>
Date: Wed, 22 Nov 2023 18:47:36 -0500
Subject: [PATCH 03/18] feat!: edit course css

edit course css
---
 lms/static/sass/views/_homepage.scss | 36 ++++++++++++++++------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/lms/static/sass/views/_homepage.scss b/lms/static/sass/views/_homepage.scss
index 5cb93c0e355b..b8f19cc326cf 100644
--- a/lms/static/sass/views/_homepage.scss
+++ b/lms/static/sass/views/_homepage.scss
@@ -3,6 +3,13 @@
 // TO-DO: combine this with _home.scss as a cleanup story
 
 $learn-more-horizontal-position: calc(50% - 100px); // calculate the left position for "LEARN MORE" content
+$height-course-info: ($baseline*5.5);
+$padding-course-org: ($baseline*0.4);
+$font-course-org: ($baseline*0.55);
+$margin-course-title: ($baseline*0.75);
+$bottom-course: ($baseline*0.45);
+$horizontal-padding-course: ($baseline*0.65);
+$font-course-date: ($baseline*0.5);
 
 .courses-container {
   @include outer-container;
@@ -28,7 +35,6 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
       @include transition(all $tmg-f3 linear 0s);
 
       position: relative;
-      // border-bottom: 3px solid $action-primary-bg;
       box-shadow: 0 1px 10px 0 $black-t0, inset 0 0 0 1px $white-t3;
       background: $body-bg;
       width: 100%;
@@ -81,7 +87,7 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
       }
 
       .course-info {
-        height: ($baseline*5.5);
+        height: $height-course-info;
         font-family: $font-family-sans-serif;
 
         h2 {
@@ -100,16 +106,16 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
         .course-organization {
           @include line-height(11);
 
-          padding: 0 ($baseline*0.4) 0 ($baseline*0.4);
+          padding: 0 $padding-course-org 0 $padding-course-org;
           background-color: #FEEBEE;
-          margin: ($baseline*0.75);
-          font-size: ($baseline*0.55);
+          margin: $margin-course-title;
+          font-size: $font-course-org;
         }
 
         .course-code {
           @include line-height(16);
 
-          padding: ($baseline*0.1) ($baseline*0.75);
+          padding: ($baseline*0.1) $margin-course-title;
           float: right;
           font-size: ($baseline*0.5);
         }
@@ -119,9 +125,9 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
 
           @extend %t-icon4;
 
-          margin: ($baseline*0.75) 0 ($baseline*0.75) 0;
+          margin: $margin-course-title 0 $margin-course-title 0;
           text-align: left;
-          padding: 0 ($baseline*0.75);
+          padding: 0 $margin-course-title;
           height: ($baseline*1.3);
           color: black;
           display: block;
@@ -141,15 +147,15 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
           @include line-height(14);
           padding-left: ($baseline*1.5);
           display: inline;
-          font-size: ($baseline*0.5);
+          font-size: $font-course-date;
           color: #777986;
         }
 
         .course-instructor {
           @include line-height(14);
 
-          padding: (3*$baseline/10) ($baseline*0.65) (3*$baseline/10) 0;
-          font-size: ($baseline*0.5);
+          padding: (3*$baseline/10) $horizontal-padding-course (3*$baseline/10) 0;
+          font-size: $font-course-date;
           color: #777986;
         }
 
@@ -160,17 +166,17 @@ $learn-more-horizontal-position: calc(50% - 100px); // calculate the left positi
 
         .date-clock {
           color: #EB999A;
-          padding-left: ($baseline*0.65);
+          padding-left: $horizontal-padding-course;
           position: absolute;
-          bottom: ($baseline*0.45);
+          bottom: $bottom-course;
         }
 
         .instructor-icon {
           color: #EB999A;
           position: absolute;
-          bottom: ($baseline*0.45);
+          bottom: $bottom-course;
           margin-right: ($baseline*2);
-          right: ($baseline*0.9);
+          right: ($baseline*1.1);
         }
       }
 

From f6ad297a4ade6924db8ea3ad3fb70f6b75884a28 Mon Sep 17 00:00:00 2001
From: chuan-edutrigger <136008719+chuan-edutrigger@users.noreply.github.com>
Date: Fri, 24 Nov 2023 13:09:24 -0500
Subject: [PATCH 04/18] Update flag (#8)

---
 xmodule/course_block.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xmodule/course_block.py b/xmodule/course_block.py
index 27b5cabd4464..e2196990d6f7 100644
--- a/xmodule/course_block.py
+++ b/xmodule/course_block.py
@@ -729,7 +729,7 @@ class CourseFields:  # lint-amnesty, pylint: disable=missing-class-docstring
     invitation_only = Boolean(
         display_name=_("Invitation Only"),
         help=_("Whether to restrict enrollment to invitation by the course staff."),
-        default=False,
+        default=True,
         scope=Scope.settings
     )
 

From 4716bbbd38a231b0368918af0a46d91c138d4719 Mon Sep 17 00:00:00 2001
From: Mubbshar Anwar <78487564+mubbsharanwar@users.noreply.github.com>
Date: Tue, 22 Aug 2023 11:43:38 +0500
Subject: [PATCH 05/18] autofilling user details from sso pipeline (#33051)

* refactor: mfe_context response to serialize object keys to camelcase (#31930)

* test: add tests for MFE Context API serializser (#32179)

* fix: empty pipelineUserDetail object

pipelineUserDetail object should be empty when pipeline is not running

---------

Co-authored-by: Shahbaz Shabbir <32649010+shahbaz-arbisoft@users.noreply.github.com>
---
 .../user_authn/api/tests/test_data.py         | 141 ++++++++++++++++++
 .../user_authn/api/tests/test_serializers.py  |  44 ++++++
 .../user_authn/api/tests/test_views.py        |  72 +++++++--
 .../core/djangoapps/user_authn/api/views.py   |   6 +-
 .../core/djangoapps/user_authn/serializers.py |  82 ++++++++++
 5 files changed, 329 insertions(+), 16 deletions(-)
 create mode 100644 openedx/core/djangoapps/user_authn/api/tests/test_data.py
 create mode 100644 openedx/core/djangoapps/user_authn/api/tests/test_serializers.py
 create mode 100644 openedx/core/djangoapps/user_authn/serializers.py

diff --git a/openedx/core/djangoapps/user_authn/api/tests/test_data.py b/openedx/core/djangoapps/user_authn/api/tests/test_data.py
new file mode 100644
index 000000000000..05d0f7cf6b8e
--- /dev/null
+++ b/openedx/core/djangoapps/user_authn/api/tests/test_data.py
@@ -0,0 +1,141 @@
+""" Mocked data for testing """
+
+mfe_context_data_keys = {
+    'contextData',
+    'registrationFields',
+    'optionalFields'
+}
+
+mock_mfe_context_data = {
+    'context_data': {
+        'currentProvider': 'edX',
+        'platformName': 'edX',
+        'providers': [
+            {
+                'id': 'oa2-facebook',
+                'name': 'Facebook',
+                'iconClass': 'fa-facebook',
+                'iconImage': None,
+                'skipHintedLogin': False,
+                'skipRegistrationForm': False,
+                'loginUrl': 'https://facebook.com/login',
+                'registerUrl': 'https://facebook.com/register'
+            },
+            {
+                'id': 'oa2-google-oauth2',
+                'name': 'Google',
+                'iconClass': 'fa-google-plus',
+                'iconImage': None,
+                'skipHintedLogin': False,
+                'skipRegistrationForm': False,
+                'loginUrl': 'https://google.com/login',
+                'registerUrl': 'https://google.com/register'
+            }
+        ],
+        'secondaryProviders': [],
+        'finishAuthUrl': 'https://edx.com/auth/finish',
+        'errorMessage': None,
+        'registerFormSubmitButtonText': 'Create Account',
+        'autoSubmitRegForm': False,
+        'syncLearnerProfileData': False,
+        'countryCode': '',
+        'pipeline_user_details': {
+            'username': 'test123',
+            'email': 'test123@edx.com',
+            'fullname': 'Test Test',
+            'first_name': 'Test',
+            'last_name': 'Test'
+        }
+    },
+    'registration_fields': {},
+    'optional_fields': {
+        'extended_profile': []
+    }
+}
+
+mock_default_mfe_context_data = {
+    'context_data': {
+        'currentProvider': None,
+        'platformName': 'édX',
+        'providers': [],
+        'secondaryProviders': [],
+        'finishAuthUrl': None,
+        'errorMessage': None,
+        'registerFormSubmitButtonText': 'Create Account',
+        'autoSubmitRegForm': False,
+        'syncLearnerProfileData': False,
+        'countryCode': '',
+        'pipeline_user_details': {}
+    },
+    'registration_fields': {},
+    'optional_fields': {
+        'extended_profile': []
+    }
+}
+
+expected_mfe_context_data = {
+    'contextData': {
+        'currentProvider': 'edX',
+        'platformName': 'edX',
+        'providers': [
+            {
+                'id': 'oa2-facebook',
+                'name': 'Facebook',
+                'iconClass': 'fa-facebook',
+                'iconImage': None,
+                'skipHintedLogin': False,
+                'skipRegistrationForm': False,
+                'loginUrl': 'https://facebook.com/login',
+                'registerUrl': 'https://facebook.com/register'
+            },
+            {
+                'id': 'oa2-google-oauth2',
+                'name': 'Google',
+                'iconClass': 'fa-google-plus',
+                'iconImage': None,
+                'skipHintedLogin': False,
+                'skipRegistrationForm': False,
+                'loginUrl': 'https://google.com/login',
+                'registerUrl': 'https://google.com/register'
+            }
+        ],
+        'secondaryProviders': [],
+        'finishAuthUrl': 'https://edx.com/auth/finish',
+        'errorMessage': None,
+        'registerFormSubmitButtonText': 'Create Account',
+        'autoSubmitRegForm': False,
+        'syncLearnerProfileData': False,
+        'countryCode': '',
+        'pipelineUserDetails': {
+            'username': 'test123',
+            'email': 'test123@edx.com',
+            'name': 'Test Test',
+            'firstName': 'Test',
+            'lastName': 'Test'
+        }
+    },
+    'registrationFields': {},
+    'optionalFields': {
+        'extended_profile': []
+    }
+}
+
+default_expected_mfe_context_data = {
+    'contextData': {
+        'currentProvider': None,
+        'platformName': 'édX',
+        'providers': [],
+        'secondaryProviders': [],
+        'finishAuthUrl': None,
+        'errorMessage': None,
+        'registerFormSubmitButtonText': 'Create Account',
+        'autoSubmitRegForm': False,
+        'syncLearnerProfileData': False,
+        'countryCode': '',
+        'pipelineUserDetails': {}
+    },
+    'registrationFields': {},
+    'optionalFields': {
+        'extended_profile': []
+    }
+}
diff --git a/openedx/core/djangoapps/user_authn/api/tests/test_serializers.py b/openedx/core/djangoapps/user_authn/api/tests/test_serializers.py
new file mode 100644
index 000000000000..348292b172f0
--- /dev/null
+++ b/openedx/core/djangoapps/user_authn/api/tests/test_serializers.py
@@ -0,0 +1,44 @@
+"""Tests for serializers for the MFE Context"""
+
+from django.test import TestCase
+
+from openedx.core.djangoapps.user_authn.api.tests.test_data import (
+    mock_mfe_context_data,
+    expected_mfe_context_data,
+    mock_default_mfe_context_data,
+    default_expected_mfe_context_data,
+)
+from openedx.core.djangoapps.user_authn.serializers import MFEContextSerializer
+
+
+class TestMFEContextSerializer(TestCase):
+    """
+    High-level unit tests for MFEContextSerializer
+    """
+
+    def test_mfe_context_serializer(self):
+        """
+        Test MFEContextSerializer with mock data that serializes data correctly
+        """
+
+        output_data = MFEContextSerializer(
+            mock_mfe_context_data
+        ).data
+
+        self.assertDictEqual(
+            output_data,
+            expected_mfe_context_data
+        )
+
+    def test_mfe_context_serializer_default_response(self):
+        """
+        Test MFEContextSerializer with default data
+        """
+        serialized_data = MFEContextSerializer(
+            mock_default_mfe_context_data
+        ).data
+
+        self.assertDictEqual(
+            serialized_data,
+            default_expected_mfe_context_data
+        )
diff --git a/openedx/core/djangoapps/user_authn/api/tests/test_views.py b/openedx/core/djangoapps/user_authn/api/tests/test_views.py
index af079f6d7ca2..d8ab2c37c1a1 100644
--- a/openedx/core/djangoapps/user_authn/api/tests/test_views.py
+++ b/openedx/core/djangoapps/user_authn/api/tests/test_views.py
@@ -16,9 +16,10 @@
 from common.djangoapps.student.tests.factories import UserFactory
 from common.djangoapps.third_party_auth import pipeline
 from common.djangoapps.third_party_auth.tests.testutil import ThirdPartyAuthTestMixin, simulate_running_pipeline
-from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration
 from openedx.core.djangoapps.geoinfo.api import country_code_from_ip
+from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration
 from openedx.core.djangoapps.user_api.tests.test_views import UserAPITestCase
+from openedx.core.djangoapps.user_authn.api.tests.test_data import mfe_context_data_keys
 from openedx.core.djangolib.testing.utils import skip_unless_lms
 
 
@@ -42,6 +43,7 @@ def setUp(self):  # pylint: disable=arguments-differ
         hostname = socket.gethostname()
         ip_address = socket.gethostbyname(hostname)
         self.country_code = country_code_from_ip(ip_address)
+        self.pipeline_user_details = {}
 
         # Several third party auth providers are created for these tests:
         self.configure_google_provider(enabled=True, visible=True)
@@ -93,8 +95,20 @@ def get_context(self, params=None, current_provider=None, backend_name=None, add
         """
         Returns the MFE context
         """
+
+        if add_user_details:
+            self.pipeline_user_details.update(
+                {
+                    'username': None,
+                    'email': 'test@test.com',
+                    'name': None,
+                    'firstName': None,
+                    'lastName': None
+                }
+            )
+
         return {
-            'context_data': {
+            'contextData': {
                 'currentProvider': current_provider,
                 'platformName': settings.PLATFORM_NAME,
                 'providers': self.get_provider_data(params) if params else [],
@@ -102,12 +116,13 @@ def get_context(self, params=None, current_provider=None, backend_name=None, add
                 'finishAuthUrl': pipeline.get_complete_url(backend_name) if backend_name else None,
                 'errorMessage': None,
                 'registerFormSubmitButtonText': 'Create Account',
+                'autoSubmitRegForm': False,
                 'syncLearnerProfileData': False,
-                'pipeline_user_details': {'email': 'test@test.com'} if add_user_details else {},
-                'countryCode': self.country_code
+                'countryCode': self.country_code,
+                'pipelineUserDetails': self.pipeline_user_details,
             },
-            'registration_fields': {},
-            'optional_fields': {
+            'registrationFields': {},
+            'optionalFields': {
                 'extended_profile': [],
             },
         }
@@ -182,7 +197,7 @@ def test_tpa_hint(self):
         })
 
         response = self.client.get(self.url, self.query_params)
-        assert response.data['context_data']['providers'] == provider_data
+        assert response.data['contextData']['providers'] == provider_data
 
     def test_user_country_code(self):
         """
@@ -191,7 +206,7 @@ def test_user_country_code(self):
         response = self.client.get(self.url, self.query_params)
 
         assert response.status_code == 200
-        assert response.data['context_data']['countryCode'] == self.country_code
+        assert response.data['contextData']['countryCode'] == self.country_code
 
     @override_settings(
         ENABLE_DYNAMIC_REGISTRATION_FIELDS=True,
@@ -205,7 +220,7 @@ def test_required_fields_not_configured(self):
         self.query_params.update({'is_register_page': True})
         response = self.client.get(self.url, self.query_params)
         assert response.status_code == status.HTTP_200_OK
-        assert response.data['registration_fields']['fields'] == {}
+        assert response.data['registrationFields']['fields'] == {}
 
     @with_site_configuration(
         configuration={
@@ -223,8 +238,9 @@ def test_required_field_order(self):
         """
         self.query_params.update({'is_register_page': True})
         response = self.client.get(self.url, self.query_params)
+
         assert response.status_code == status.HTTP_200_OK
-        assert list(response.data['registration_fields']['fields'].keys()) == ['first_name', 'last_name', 'state']
+        assert list(response.data['registrationFields']['fields'].keys()) == ['first_name', 'last_name', 'state']
 
     @override_settings(
         ENABLE_DYNAMIC_REGISTRATION_FIELDS=True,
@@ -248,7 +264,7 @@ def test_optional_field_has_no_description(self):
         self.query_params.update({'is_register_page': True})
         response = self.client.get(self.url, self.query_params)
         assert response.status_code == status.HTTP_200_OK
-        assert response.data['optional_fields']['fields'] == expected_response
+        assert response.data['optionalFields']['fields'] == expected_response
 
     @with_site_configuration(
         configuration={
@@ -282,8 +298,9 @@ def test_configurable_select_option_fields(self):
         }
         self.query_params.update({'is_register_page': True})
         response = self.client.get(self.url, self.query_params)
+
         assert response.status_code == status.HTTP_200_OK
-        assert response.data['optional_fields']['fields'] == expected_response
+        assert response.data['optionalFields']['fields'] == expected_response
 
     @with_site_configuration(
         configuration={
@@ -302,7 +319,7 @@ def test_optional_field_order(self):
         self.query_params.update({'is_register_page': True})
         response = self.client.get(self.url, self.query_params)
         assert response.status_code == status.HTTP_200_OK
-        assert list(response.data['optional_fields']['fields'].keys()) == ['specialty', 'goals']
+        assert list(response.data['optionalFields']['fields'].keys()) == ['specialty', 'goals']
 
     @with_site_configuration(
         configuration={
@@ -322,7 +339,7 @@ def test_field_not_available_in_extended_profile_config(self):
         self.query_params.update({'is_register_page': True})
         response = self.client.get(self.url, self.query_params)
         assert response.status_code == status.HTTP_200_OK
-        assert list(response.data['registration_fields']['fields'].keys()) == ['specialty']
+        assert list(response.data['registrationFields']['fields'].keys()) == ['specialty']
 
     @override_settings(
         ENABLE_DYNAMIC_REGISTRATION_FIELDS=True,
@@ -333,9 +350,34 @@ def test_response_structure(self):
         Test that API return valid response dictionary with both required and optional fields
         """
         response = self.client.get(self.url, self.query_params)
-
         assert response.data == self.get_context()
 
+    def test_mfe_context_api_serialized_response(self):
+        """
+        Test MFE Context API serialized response
+        """
+        response = self.client.get(self.url, self.query_params)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        params = {
+            'next': self.query_params['next']
+        }
+
+        self.assertEqual(
+            response.data,
+            self.get_context(params)
+        )
+
+    def test_mfe_context_api_response_keys(self):
+        """
+        Test MFE Context API response keys
+        """
+        response = self.client.get(self.url, self.query_params)
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        response_keys = set(response.data.keys())
+        self.assertSetEqual(response_keys, mfe_context_data_keys)
+
 
 @skip_unless_lms
 class SendAccountActivationEmail(UserAPITestCase):
diff --git a/openedx/core/djangoapps/user_authn/api/views.py b/openedx/core/djangoapps/user_authn/api/views.py
index 7e84a6747301..2fbc014f52fb 100644
--- a/openedx/core/djangoapps/user_authn/api/views.py
+++ b/openedx/core/djangoapps/user_authn/api/views.py
@@ -15,6 +15,7 @@
 from common.djangoapps.student.views import compose_and_send_activation_email
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_authn.api.helper import RegistrationFieldsContext
+from openedx.core.djangoapps.user_authn.serializers import MFEContextSerializer
 from openedx.core.djangoapps.user_authn.views.utils import get_mfe_context
 
 
@@ -65,6 +66,7 @@ def get(self, request, **kwargs):  # lint-amnesty, pylint: disable=unused-argume
             context['registration_fields'].update({
                 'fields': registration_fields,
             })
+
             optional_fields = RegistrationFieldsContext('optional').get_fields()
             if optional_fields:
                 context['optional_fields'].update({
@@ -74,7 +76,9 @@ def get(self, request, **kwargs):  # lint-amnesty, pylint: disable=unused-argume
 
         return Response(
             status=status.HTTP_200_OK,
-            data=context
+            data=MFEContextSerializer(
+                context
+            ).data
         )
 
 
diff --git a/openedx/core/djangoapps/user_authn/serializers.py b/openedx/core/djangoapps/user_authn/serializers.py
new file mode 100644
index 000000000000..9bbed367e6e2
--- /dev/null
+++ b/openedx/core/djangoapps/user_authn/serializers.py
@@ -0,0 +1,82 @@
+"""
+MFE Context API Serializers
+"""
+
+from rest_framework import serializers
+
+
+class ProvidersSerializer(serializers.Serializer):
+    """
+    Providers Serializers
+    """
+
+    id = serializers.CharField(allow_null=True)
+    name = serializers.CharField(allow_null=True)
+    iconClass = serializers.CharField(allow_null=True)
+    iconImage = serializers.CharField(allow_null=True)
+    skipHintedLogin = serializers.BooleanField(default=False)
+    skipRegistrationForm = serializers.BooleanField(default=False)
+    loginUrl = serializers.CharField(allow_null=True)
+    registerUrl = serializers.CharField(allow_null=True)
+
+
+class PipelineUserDetailsSerializer(serializers.Serializer):
+    """
+    Pipeline User Details Serializers
+    """
+
+    username = serializers.CharField(allow_null=True)
+    email = serializers.CharField(allow_null=True)
+    name = serializers.CharField(source='fullname', allow_null=True)
+    firstName = serializers.CharField(source='first_name', allow_null=True)
+    lastName = serializers.CharField(source='last_name', allow_null=True)
+
+
+class ContextDataSerializer(serializers.Serializer):
+    """
+    Context Data Serializers
+    """
+
+    currentProvider = serializers.CharField(allow_null=True)
+    platformName = serializers.CharField(allow_null=True)
+    providers = serializers.ListField(
+        child=ProvidersSerializer(),
+        allow_null=True
+    )
+    secondaryProviders = serializers.ListField(
+        child=ProvidersSerializer(),
+        allow_null=True
+    )
+    finishAuthUrl = serializers.CharField(allow_null=True)
+    errorMessage = serializers.CharField(allow_null=True)
+    registerFormSubmitButtonText = serializers.CharField(allow_null=True)
+    autoSubmitRegForm = serializers.BooleanField(default=False)
+    syncLearnerProfileData = serializers.BooleanField(default=False)
+    countryCode = serializers.CharField(allow_null=True)
+    pipelineUserDetails = serializers.SerializerMethodField()
+
+    def get_pipelineUserDetails(self, obj):
+        if obj.get('pipeline_user_details'):
+            return PipelineUserDetailsSerializer(obj.get('pipeline_user_details')).data
+        return {}
+
+
+class MFEContextSerializer(serializers.Serializer):
+    """
+    Serializer class to convert the keys of MFE Context Response dict object to camelCase format.
+    """
+
+    contextData = ContextDataSerializer(
+        source='context_data',
+        default={}
+    )
+    registrationFields = serializers.DictField(
+        source='registration_fields',
+        default={}
+    )
+    optionalFields = serializers.DictField(
+        source='optional_fields',
+        default={
+            'extended_profile': []
+        }
+    )

From f144dcdc8b30b915c7b1e00618f3e409de3548f8 Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Thu, 24 Aug 2023 15:10:12 +0300
Subject: [PATCH 06/18] fix: TypeError during student.send_activation_email
 task (#32743)

---
 openedx/core/djangoapps/user_authn/tasks.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openedx/core/djangoapps/user_authn/tasks.py b/openedx/core/djangoapps/user_authn/tasks.py
index 27ddfe466e3b..9c2c4ef1098c 100644
--- a/openedx/core/djangoapps/user_authn/tasks.py
+++ b/openedx/core/djangoapps/user_authn/tasks.py
@@ -45,7 +45,7 @@ def check_pwned_password_and_send_track_event(user_id, password, internal_user=F
 
 @shared_task(bind=True, default_retry_delay=30, max_retries=2)
 @set_code_owner_attribute
-def send_activation_email(self, msg_string, from_address=None):
+def send_activation_email(self, msg_string, from_address=None, site_id=None):
     """
     Sending an activation email to the user.
     """
@@ -62,7 +62,7 @@ def send_activation_email(self, msg_string, from_address=None):
 
     dest_addr = msg.recipient.email_address
 
-    site = Site.objects.get_current()
+    site = Site.objects.get(id=site_id) if site_id else Site.objects.get_current()
     user = User.objects.get(id=msg.recipient.lms_user_id)
 
     try:

From 636424021aab05ec29b9d27ecbd8a4c026db0ad4 Mon Sep 17 00:00:00 2001
From: Eugene Dyudyunov <evgen.dyudyunov@raccoongang.com>
Date: Tue, 5 Sep 2023 16:11:11 +0300
Subject: [PATCH 07/18] feat: add the default enrollment start date on course
 creation (#33150)

This is a backport from the master branch:
https://github.com/openedx/edx-platform/pull/30954

The course is visible on the main page right after creation.

So anonymous users can see them and access the course about page
for the courses without valid data (e.g. they will see the default
course overview)

When courses list filtering is processed it checks the `see_exists`
permission for the anonymous user.
Actually, `see_exists` means `can_load` OR `can_enroll`.

`can_load` is False in our case because the course start in the future.

But `can_enroll` returns True because the course's enrollment_start
and enrollment_end dates are blank:
```
enrollment_start = courselike.enrollment_start or datetime.min.replace(tzinfo=UTC)
enrollment_end = courselike.enrollment_end or datetime.max.replace(tzinfo=UTC)
if enrollment_start < now < enrollment_end:
    debug("Allow: in enrollment period")
    return ACCESS_GRANTED
```

Set the enrollment_start the same as a course start by default
if the CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE
feature toggle is enabled (default is False).
---
 .../models/tests/test_course_details.py       | 53 +++++++++++--------
 xmodule/course_block.py                       | 23 +++++++-
 xmodule/modulestore/tests/factories.py        |  5 ++
 xmodule/tests/test_course_block.py            | 20 +++++--
 4 files changed, 76 insertions(+), 25 deletions(-)

diff --git a/openedx/core/djangoapps/models/tests/test_course_details.py b/openedx/core/djangoapps/models/tests/test_course_details.py
index 98e3c4b15df0..86301740c7f1 100644
--- a/openedx/core/djangoapps/models/tests/test_course_details.py
+++ b/openedx/core/djangoapps/models/tests/test_course_details.py
@@ -4,6 +4,7 @@
 
 
 import datetime
+from django.test import override_settings
 import pytest
 import ddt
 from pytz import UTC
@@ -29,27 +30,37 @@ class CourseDetailsTestCase(ModuleStoreTestCase):
 
     def setUp(self):
         super().setUp()
-        self.course = CourseFactory.create()
-
-    def test_virgin_fetch(self):
-        details = CourseDetails.fetch(self.course.id)
-        assert details.org == self.course.location.org, 'Org not copied into'
-        assert details.course_id == self.course.location.course, 'Course_id not copied into'
-        assert details.run == self.course.location.run, 'Course run not copied into'
-        assert details.course_image_name == self.course.course_image
-        assert details.start_date.tzinfo is not None
-        assert details.end_date is None, ('end date somehow initialized ' + str(details.end_date))
-        assert details.enrollment_start is None,\
-            ('enrollment_start date somehow initialized ' + str(details.enrollment_start))
-        assert details.enrollment_end is None,\
-            ('enrollment_end date somehow initialized ' + str(details.enrollment_end))
-        assert details.certificate_available_date is None,\
-            ('certificate_available_date date somehow initialized ' + str(details.certificate_available_date))
-        assert details.syllabus is None, ('syllabus somehow initialized' + str(details.syllabus))
-        assert details.intro_video is None, ('intro_video somehow initialized' + str(details.intro_video))
-        assert details.effort is None, ('effort somehow initialized' + str(details.effort))
-        assert details.language is None, ('language somehow initialized' + str(details.language))
-        assert not details.self_paced
+        self.course = CourseFactory.create(default_enrollment_start=True)
+
+    @ddt.data(True, False)
+    def test_virgin_fetch(self, should_have_default_enroll_start):
+        features = settings.FEATURES.copy()
+        features['CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE'] = should_have_default_enroll_start
+
+        with override_settings(FEATURES=features):
+            course = CourseFactory.create(default_enrollment_start=should_have_default_enroll_start)
+            details = CourseDetails.fetch(course.id)
+            wrong_enrollment_start_msg = (
+                'enrollment_start not copied into'
+                if should_have_default_enroll_start
+                else f'enrollment_start date somehow initialized {str(details.enrollment_start)}'
+            )
+            assert details.org == course.location.org, 'Org not copied into'
+            assert details.course_id == course.location.course, 'Course_id not copied into'
+            assert details.run == course.location.run, 'Course run not copied into'
+            assert details.course_image_name == course.course_image
+            assert details.start_date.tzinfo is not None
+            assert details.end_date is None, ('end date somehow initialized ' + str(details.end_date))
+            assert details.enrollment_start == course.enrollment_start, wrong_enrollment_start_msg
+            assert details.enrollment_end is None,\
+                ('enrollment_end date somehow initialized ' + str(details.enrollment_end))
+            assert details.certificate_available_date is None,\
+                ('certificate_available_date date somehow initialized ' + str(details.certificate_available_date))
+            assert details.syllabus is None, ('syllabus somehow initialized' + str(details.syllabus))
+            assert details.intro_video is None, ('intro_video somehow initialized' + str(details.intro_video))
+            assert details.effort is None, ('effort somehow initialized' + str(details.effort))
+            assert details.language is None, ('language somehow initialized' + str(details.language))
+            assert not details.self_paced
 
     def test_update_and_fetch(self):
         jsondetails = CourseDetails.fetch(self.course.id)
diff --git a/xmodule/course_block.py b/xmodule/course_block.py
index e2196990d6f7..d97f4cbc48aa 100644
--- a/xmodule/course_block.py
+++ b/xmodule/course_block.py
@@ -11,6 +11,7 @@
 import requests
 from django.conf import settings
 from django.core.validators import validate_email
+from edx_toggles.toggles import SettingDictToggle
 from lazy import lazy
 from lxml import etree
 from path import Path as path
@@ -54,6 +55,22 @@
 COURSE_VISIBILITY_PUBLIC_OUTLINE = 'public_outline'
 COURSE_VISIBILITY_PUBLIC = 'public'
 
+# .. toggle_name: FEATURES['CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE']
+# .. toggle_implementation: SettingDictToggle
+# .. toggle_default: False
+# .. toggle_description: The default behavior, when this is disabled, is that a newly created course has no
+#   enrollment_start date set. When the feature is enabled - the newly created courses will have the
+#   enrollment_start_date set to DEFAULT_START_DATE. This is intended to be a permanent option.
+#     This toggle affects the course listing pages (platform's index page, /courses page) when course search is
+#   performed using the `lms.djangoapp.branding.get_visible_courses` method and the
+#   COURSE_CATALOG_VISIBILITY_PERMISSION setting is set to 'see_exists'. Switching the toggle to True will prevent
+#   the newly created (empty) course from appearing in the course listing.
+# .. toggle_use_cases: open_edx
+# .. toggle_creation_date: 2023-06-22
+CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE = SettingDictToggle(
+    "FEATURES", "CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE", default=False, module_name=__name__
+)
+
 
 class StringOrDate(Date):  # lint-amnesty, pylint: disable=missing-class-docstring
     def from_json(self, value):  # lint-amnesty, pylint: disable=arguments-differ
@@ -311,7 +328,11 @@ class CourseFields:  # lint-amnesty, pylint: disable=missing-class-docstring
     )
 
     wiki_slug = String(help=_("Slug that points to the wiki for this course"), scope=Scope.content)
-    enrollment_start = Date(help=_("Date that enrollment for this class is opened"), scope=Scope.settings)
+    enrollment_start = Date(
+        help=_("Date that enrollment for this class is opened"),
+        default=DEFAULT_START_DATE if CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE.is_enabled() else None,
+        scope=Scope.settings
+    )
     enrollment_end = Date(help=_("Date that enrollment for this class is closed"), scope=Scope.settings)
     start = Date(
         help=_("Start time when this block is visible"),
diff --git a/xmodule/modulestore/tests/factories.py b/xmodule/modulestore/tests/factories.py
index b740b10e053f..9e0a2aa5cfd1 100644
--- a/xmodule/modulestore/tests/factories.py
+++ b/xmodule/modulestore/tests/factories.py
@@ -123,6 +123,11 @@ def _create(cls, target_class, **kwargs):  # lint-amnesty, pylint: disable=argum
         run = kwargs.pop('run', name)
         user_id = kwargs.pop('user_id', ModuleStoreEnum.UserID.test)
         emit_signals = kwargs.pop('emit_signals', False)
+        # By default course has enrollment_start in the future which means course is closed for enrollment.
+        # We're setting the 'enrollment_start' field to None to reduce number of arguments needed to setup course.
+        # Use the 'default_enrollment_start=True' kwarg to skip this and use the default enrollment_start date.
+        if not kwargs.get('enrollment_start', kwargs.pop('default_enrollment_start', False)):
+            kwargs['enrollment_start'] = None
 
         # Pass the metadata just as field=value pairs
         kwargs.update(kwargs.pop('metadata', {}))
diff --git a/xmodule/tests/test_course_block.py b/xmodule/tests/test_course_block.py
index 183a4f9c069e..86a98e5ffd57 100644
--- a/xmodule/tests/test_course_block.py
+++ b/xmodule/tests/test_course_block.py
@@ -4,20 +4,22 @@
 import itertools
 import unittest
 from datetime import datetime, timedelta
+import sys
 from unittest.mock import Mock, patch
 
-import pytest
 import ddt
 from dateutil import parser
 from django.conf import settings
 from django.test import override_settings
 from fs.memoryfs import MemoryFS
 from opaque_keys.edx.keys import CourseKey
+import pytest
 from pytz import utc
 from xblock.runtime import DictKeyValueStore, KvsFieldData
 
 from openedx.core.lib.teams_config import TeamsConfig, DEFAULT_COURSE_RUN_MAX_TEAM_SIZE
 import xmodule.course_block
+from xmodule.course_metadata_utils import DEFAULT_START_DATE
 from xmodule.data import CertificatesDisplayBehaviors
 from xmodule.modulestore.xml import ImportSystem, XMLModuleStore
 from xmodule.modulestore.exceptions import InvalidProctoringProvider
@@ -32,10 +34,22 @@
 _NEXT_WEEK = _TODAY + timedelta(days=7)
 
 
-class CourseFieldsTestCase(unittest.TestCase):
+@ddt.ddt()
+class CourseFieldsTestCase(unittest.TestCase):  # lint-amnesty, pylint: disable=missing-class-docstring
 
     def test_default_start_date(self):
-        assert xmodule.course_block.CourseFields.start.default == datetime(2030, 1, 1, tzinfo=utc)
+        assert xmodule.course_block.CourseFields.start.default == DEFAULT_START_DATE
+
+    @ddt.data(True, False)
+    def test_default_enrollment_start_date(self, should_have_default_enroll_start):
+        features = settings.FEATURES.copy()
+        features['CREATE_COURSE_WITH_DEFAULT_ENROLLMENT_START_DATE'] = should_have_default_enroll_start
+        with override_settings(FEATURES=features):
+            # reimport, so settings override could take effect
+            del sys.modules['xmodule.course_block']
+            import xmodule.course_block  # lint-amnesty, pylint: disable=redefined-outer-name, reimported
+            expected = DEFAULT_START_DATE if should_have_default_enroll_start else None
+            assert xmodule.course_block.CourseFields.enrollment_start.default == expected
 
 
 class DummySystem(ImportSystem):  # lint-amnesty, pylint: disable=abstract-method, missing-class-docstring

From b334970138bda10ed1a2fae0925a49ef90118895 Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:29:15 +0300
Subject: [PATCH 08/18] fix: for the wiki page translation (#33050)

---
 lms/templates/wiki/includes/editor_widget.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/templates/wiki/includes/editor_widget.html b/lms/templates/wiki/includes/editor_widget.html
index 8c43592f4104..3611efc7bf38 100644
--- a/lms/templates/wiki/includes/editor_widget.html
+++ b/lms/templates/wiki/includes/editor_widget.html
@@ -1,9 +1,9 @@
 {% load i18n %}
+{% load django_markup %}
 <p id="hint_id_content" class="help-block">
-    {% filter force_escape %}
-    {% blocktrans with start_link="<a id='cheatsheetLink' href='#cheatsheetModal' rel='leanModal'>" end_link="</a>" trimmed %}
-        Markdown syntax is allowed. See the {{ start_link }}cheatsheet{{ end_link }} for help.
+    {% blocktrans trimmed asvar tmsg %}
+        Markdown syntax is allowed. See the {start_link}cheatsheet{end_link} for help.
     {% endblocktrans %}
-    {% endfilter %}
+    {% interpolate_html tmsg start_link='<a id="cheatsheetLink" href="#cheatsheetModal" rel="leanModal">'|safe end_link='</a>'|safe %}
 </p>
 <textarea {{ attrs }}>{{ content }}</textarea>

From f7cd722275b44bb373e5b980383fcac253ba5c9e Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:33:39 +0300
Subject: [PATCH 09/18] fix: float "&nbsp;" symbol in the preview_body (#32489)

Co-authored-by: Edward Zarecor <ezarecor@tcril.org>
---
 lms/djangoapps/discussion/rest_api/serializers.py |  5 ++---
 .../discussion/rest_api/tests/test_serializers.py | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lms/djangoapps/discussion/rest_api/serializers.py b/lms/djangoapps/discussion/rest_api/serializers.py
index f90a137d769e..6e17f201d0f9 100644
--- a/lms/djangoapps/discussion/rest_api/serializers.py
+++ b/lms/djangoapps/discussion/rest_api/serializers.py
@@ -402,10 +402,9 @@ def get_unread_comment_count(self, obj):
 
     def get_preview_body(self, obj):
         """
-        Returns a cleaned and truncated version of the thread's body to display in a
-        preview capacity.
+        Returns a cleaned version of the thread's body to display in a preview capacity.
         """
-        return strip_tags(self.get_rendered_body(obj)).replace('\n', ' ')
+        return strip_tags(self.get_rendered_body(obj)).replace('\n', ' ').replace('&nbsp;', ' ')
 
     def get_close_reason(self, obj):
         """
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_serializers.py b/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
index 6e7f02b55316..bd9cb0f1eace 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_serializers.py
@@ -242,6 +242,21 @@ def test_response_count_missing(self):
         serialized = self.serialize(thread_data)
         assert 'response_count' not in serialized
 
+    def test_get_preview_body(self):
+        """
+        Test for the 'get_preview_body' method.
+
+        This test verifies that the 'get_preview_body' method returns a cleaned
+        version of the thread's body that is suitable for display as a preview.
+        The test specifically focuses on handling the presence of multiple
+        spaces within the body.
+        """
+        thread_data = self.make_cs_content(
+            {"body": "<p>This  is  a test thread body  with some text.</p>"}
+        )
+        serialized = self.serialize(thread_data)
+        assert serialized['preview_body'] == "This  is  a test thread body  with some text."
+
 
 @ddt.ddt
 class CommentSerializerTest(SerializerTestMixin, SharedModuleStoreTestCase):

From ec5ee88056cef9305d6dbee11d687d843b7f289c Mon Sep 17 00:00:00 2001
From: Mariagabriela Jaimes <maria.jaimes@edunext.co>
Date: Mon, 11 Sep 2023 10:36:03 -0400
Subject: [PATCH 10/18] chore: upgrade Django to 3.2.21 (#33210)

---
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 0a2b02dd3ad1..c70db0b4c421 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -177,7 +177,7 @@ defusedxml==0.7.1
     #   social-auth-core
 deprecated==1.2.13
     # via jwcrypto
-django==3.2.20
+django==3.2.21
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index b419cdf16d8a..0df211d84b20 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -273,7 +273,7 @@ distlib==0.3.6
     # via
     #   -r requirements/edx/testing.txt
     #   virtualenv
-django==3.2.20
+django==3.2.21
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 39b22737bb2f..94713ae416e6 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -256,7 +256,7 @@ dill==0.3.6
     # via pylint
 distlib==0.3.6
     # via virtualenv
-django==3.2.20
+django==3.2.21
     # via
     #   -c requirements/edx/../common_constraints.txt
     #   -r requirements/edx/base.txt

From c7e9455461540055d6e9ee2ce4b526e0f89d8ec6 Mon Sep 17 00:00:00 2001
From: Dmytro <98233552+DmytroAlipov@users.noreply.github.com>
Date: Thu, 21 Sep 2023 11:06:22 +0300
Subject: [PATCH 11/18] fix: get registration fields from site configuration
 for palm (#33162)

---
 openedx/core/djangoapps/user_authn/views/register.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/openedx/core/djangoapps/user_authn/views/register.py b/openedx/core/djangoapps/user_authn/views/register.py
index c494f8e015c2..939f2cca7ece 100644
--- a/openedx/core/djangoapps/user_authn/views/register.py
+++ b/openedx/core/djangoapps/user_authn/views/register.py
@@ -200,10 +200,9 @@ def create_account_with_params(request, params):  # pylint: disable=too-many-sta
         set_custom_attribute('register_user_tpa', pipeline.running(request))
     extended_profile_fields = configuration_helpers.get_value('extended_profile_fields', [])
     # Can't have terms of service for certain SHIB users, like at Stanford
-    registration_fields = getattr(settings, 'REGISTRATION_EXTRA_FIELDS', {})
     tos_required = (
-        registration_fields.get('terms_of_service') != 'hidden' or
-        registration_fields.get('honor_code') != 'hidden'
+        extra_fields.get('terms_of_service') != 'hidden' or
+        extra_fields.get('honor_code') != 'hidden'
     )
 
     form = AccountCreationForm(

From 46da449c0dd4ca178c0179186da66aad4007c2c6 Mon Sep 17 00:00:00 2001
From: Max Sokolski <cmltawt0@gmail.com>
Date: Wed, 11 Oct 2023 01:05:56 +0300
Subject: [PATCH 12/18] fix: replace py2neo with forked package (#33453)
 (#33459)

Co-authored-by: Usama Sadiq <usama.sadiq@arbisoft.com>
---
 requirements/edx/base.in         | 7 ++++++-
 requirements/edx/base.txt        | 2 +-
 requirements/edx/development.txt | 2 +-
 requirements/edx/testing.txt     | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/requirements/edx/base.in b/requirements/edx/base.in
index 3a2b9aee8a9e..6efe7984212b 100644
--- a/requirements/edx/base.in
+++ b/requirements/edx/base.in
@@ -140,7 +140,12 @@ openedx-blockstore
 path
 piexif                              # Exif image metadata manipulation, used in the profile_images app
 Pillow                              # Image manipulation library; used for course assets, profile images, invoice PDFs, etc.
-py2neo                              # Driver for converting Python modulestore structures to Neo4j's schema (for Coursegraph).
+
+# Driver for converting Python modulestore structures to Neo4j's schema (for Coursegraph).
+# Using the fork because official package has been removed from PyPI/GitHub
+# Follow up issue to remove this fork: https://github.com/openedx/edx-platform/issues/33456
+https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
+
 pycountry
 pycryptodomex
 pygments                            # Used to support colors in paver command output
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index c70db0b4c421..27737d29504a 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -827,7 +827,7 @@ psutil==5.9.5
     # via
     #   -r requirements/edx/paver.txt
     #   edx-django-utils
-py2neo==2021.2.3
+py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.in
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 0df211d84b20..53d53ed50a76 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -1127,7 +1127,7 @@ py==1.11.0
     # via
     #   -r requirements/edx/testing.txt
     #   tox
-py2neo==2021.2.3
+py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/testing.txt
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 94713ae416e6..662efff18eea 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -1065,7 +1065,7 @@ psutil==5.9.5
     #   pytest-xdist
 py==1.11.0
     # via tox
-py2neo==2021.2.3
+py2neo @ https://github.com/overhangio/py2neo/releases/download/2021.2.3/py2neo-2021.2.3.tar.gz
     # via
     #   -c requirements/edx/../constraints.txt
     #   -r requirements/edx/base.txt

From bebbc274a1c5b7cc463f7d163a92e6b14552a6ce Mon Sep 17 00:00:00 2001
From: alipov-dm <dmytro.alipov@raccoongang.com>
Date: Mon, 15 May 2023 13:05:57 +0300
Subject: [PATCH 13/18] fix: share certificate in FB

Fixed the Course Card Image is absent on FB post
after sharing by user. Commit for Palm release.
---
 .../certificates/tests/test_webview_views.py  | 63 +++++++++++++++++++
 .../certificates/_accomplishment-banner.html  |  2 +-
 .../certificates/accomplishment-base.html     | 10 ++-
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/lms/djangoapps/certificates/tests/test_webview_views.py b/lms/djangoapps/certificates/tests/test_webview_views.py
index 96832e3cb694..5489f28e0f7e 100644
--- a/lms/djangoapps/certificates/tests/test_webview_views.py
+++ b/lms/djangoapps/certificates/tests/test_webview_views.py
@@ -49,6 +49,7 @@
 )
 from openedx.core.djangolib.js_utils import js_escaped_string
 from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
+from openedx.core.lib.courses import course_image_url
 from openedx.core.lib.tests.assertions.events import assert_event_matches
 from openedx.features.name_affirmation_api.utils import get_name_affirmation_service
 from xmodule.data import CertificatesDisplayBehaviors  # lint-amnesty, pylint: disable=wrong-import-order
@@ -351,6 +352,68 @@ def test_linkedin_share_url_site(self):
             js_escaped_string(self.linkedin_url.format(params=urlencode(params))),
         )
 
+    @patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {
+        "CERTIFICATE_FACEBOOK": True,
+        "CERTIFICATE_FACEBOOK_TEXT": "test FB text"
+    })
+    @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
+    def test_render_certificate_html_view_with_facebook_meta_tags(self):
+        """
+        Test view html certificate if share to FB is enabled.
+        If 'facebook_share_enabled=True', <meta> tags with property="og:..."
+        must be enabled to pass parameters to FB.
+        """
+        self._add_course_certificates(count=1, signatory_count=1, is_active=True)
+        self.course.cert_html_view_enabled = True
+        self.course.save()
+        self.update_course(self.course, self.user.id)
+        test_url = get_certificate_url(
+            user_id=self.user.id,
+            course_id=str(self.course.id),
+            uuid=self.cert.verify_uuid
+        )
+        platform_name = settings.PLATFORM_NAME
+        share_url = f'http://testserver{test_url}'
+        full_course_image_url = f'http://testserver{course_image_url(self.course)}'
+        document_title = f'{self.course.org} {self.course.number} Certificate | {platform_name}'
+        response = self.client.get(test_url)
+
+        assert response.status_code == 200
+        self.assertContains(response, f'<meta property="og:url" content="{share_url}" />')
+        self.assertContains(response, f'<meta property="og:title" content="{document_title}" />')
+        self.assertContains(response, '<meta property="og:type" content="image/png" />')
+        self.assertContains(response, f'<meta property="og:image" content="{full_course_image_url}" />')
+        self.assertContains(response, '<meta property="og:description" content="test FB text" />')
+
+    @patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {
+        "CERTIFICATE_FACEBOOK": False,
+    })
+    @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
+    def test_render_certificate_html_view_without_facebook_meta_tags(self):
+        """
+        Test view html certificate if share to FB is disabled.
+        If 'facebook_share_enabled=False', html certificate view
+        should not contain <meta> tags with parameters property="og:..."
+        """
+        self._add_course_certificates(count=1, signatory_count=1, is_active=True)
+        self.course.cert_html_view_enabled = True
+        self.course.save()
+        self.update_course(self.course, self.user.id)
+
+        test_url = get_certificate_url(
+            user_id=self.user.id,
+            course_id=str(self.course.id),
+            uuid=self.cert.verify_uuid
+        )
+        response = self.client.get(test_url)
+
+        assert response.status_code == 200
+        self.assertNotContains(response, '<meta property="og:url" ')
+        self.assertNotContains(response, '<meta property="og:title" ')
+        self.assertNotContains(response, '<meta property="og:type" content="image/png" />')
+        self.assertNotContains(response, '<meta property="og:image" ')
+        self.assertNotContains(response, '<meta property="og:description" ')
+
     @override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
     @patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {"CERTIFICATE_FACEBOOK": True})
     @with_site_configuration(
diff --git a/lms/templates/certificates/_accomplishment-banner.html b/lms/templates/certificates/_accomplishment-banner.html
index 9e9b1c2cd3e6..b25932503a67 100644
--- a/lms/templates/certificates/_accomplishment-banner.html
+++ b/lms/templates/certificates/_accomplishment-banner.html
@@ -51,7 +51,7 @@ <h3 class="sr-only">${_("Print or share your certificate:")}</h3>
                     % if facebook_share_enabled:
                       <button class="action action-share-facebook btn-inverse btn-small icon-only" id="action-share-facebook"
                         ## xss-lint: disable=mako-invalid-html-filter
-                        onclick="FaceBook.share({share_text: '${facebook_share_text | n, js_escaped_string}', share_link: '${share_url | n, js_escaped_string}', picture_link: '${full_course_image_url | n, js_escaped_string}', description: '${_('Click the link to see my certificate.') | n, js_escaped_string}'});">
+                        onclick="FaceBook.share({share_link: '${share_url | n, js_escaped_string}'});"></button>
                           <span class="icon fa fa-facebook-official" aria-hidden="true"></span>
                           <span class="action-label">${_("Post on Facebook")}</span>
                       </button>
diff --git a/lms/templates/certificates/accomplishment-base.html b/lms/templates/certificates/accomplishment-base.html
index 158c7698e80a..92c58dc138ff 100644
--- a/lms/templates/certificates/accomplishment-base.html
+++ b/lms/templates/certificates/accomplishment-base.html
@@ -15,7 +15,15 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-
+    % if facebook_share_enabled:
+        ## OG (Open Graph) url, title, type, image and description added below to give social media info to display
+        ## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
+        <meta property="og:url" content="${share_url}" />
+        <meta property="og:title" content="${document_title}" />
+        <meta property="og:type" content="image/png" />
+        <meta property="og:image" content="${full_course_image_url}" />
+        <meta property="og:description" content="${facebook_share_text}" />
+    %endif
     <title>${document_title}</title>
 
     <%static:css group='style-certificates'/>

From 0c0a8c868f5199535c56f2b16d358d19618e8c51 Mon Sep 17 00:00:00 2001
From: alipov_d <dmytro.alipov@raccoongang.com>
Date: Wed, 16 Aug 2023 15:24:13 +0100
Subject: [PATCH 14/18] fix: User retirement 404 for state RETIRING_FORUMS

---
 lms/djangoapps/discussion/rest_api/urls.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lms/djangoapps/discussion/rest_api/urls.py b/lms/djangoapps/discussion/rest_api/urls.py
index b861bd7848d6..f54637dc3724 100644
--- a/lms/djangoapps/discussion/rest_api/urls.py
+++ b/lms/djangoapps/discussion/rest_api/urls.py
@@ -64,7 +64,11 @@
         CourseView.as_view(),
         name="discussion_course"
     ),
-    path('v1/accounts/retire_forum', RetireUserView.as_view(), name="retire_discussion_user"),
+    re_path(
+        r"^v1/accounts/retire_forum/?$",
+        RetireUserView.as_view(),
+        name="retire_discussion_user"
+    ),
     path('v1/accounts/replace_username', ReplaceUsernamesView.as_view(), name="replace_discussion_username"),
     re_path(
         fr"^v1/course_topics/{settings.COURSE_ID_PATTERN}",

From ca0b9f03da77a68713f1e4596476dbb031aac3bf Mon Sep 17 00:00:00 2001
From: Awais Qureshi <awais.qureshi@arbisoft.com>
Date: Wed, 11 Oct 2023 19:54:01 +0500
Subject: [PATCH 15/18] feat!: Adding fall back method for `sha1` in case
 default algo is `sha256` (#33345)

---------

Co-authored-by: Muhammad Soban Javed <iamsobanjaved@gmai.com>
Co-authored-by: Robert Raposa <rraposa@edx.org>
Co-authored-by: Muhammad Soban Javed <58461728+iamsobanjaved@users.noreply.github.com>
---
 cms/envs/common.py                            |   2 +-
 lms/envs/common.py                            |   2 +-
 .../djangoapps/cache_toolbox/middleware.py    |  34 +++++-
 .../cache_toolbox/tests/test_middleware.py    | 107 ++++++++++++++++--
 .../safe_sessions/tests/test_middleware.py    |  10 ++
 5 files changed, 135 insertions(+), 20 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index a9ea495b0841..a8d0b522b629 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1082,8 +1082,8 @@
 }
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+# This will be overridden through CMS config
 DEFAULT_HASHING_ALGORITHM = 'sha1'
-
 #################### Python sandbox ############################################
 
 CODE_JAIL = {
diff --git a/lms/envs/common.py b/lms/envs/common.py
index c0182d47355a..197d82c0c197 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1671,8 +1671,8 @@ def _make_mako_template_dirs(settings):
 
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
+# This will be overridden through LMS config
 DEFAULT_HASHING_ALGORITHM = 'sha1'
-
 #################### Python sandbox ############################################
 
 CODE_JAIL = {
diff --git a/openedx/core/djangoapps/cache_toolbox/middleware.py b/openedx/core/djangoapps/cache_toolbox/middleware.py
index 4ba2162fe35f..9d1ea2bf0690 100644
--- a/openedx/core/djangoapps/cache_toolbox/middleware.py
+++ b/openedx/core/djangoapps/cache_toolbox/middleware.py
@@ -95,6 +95,7 @@
 from django.contrib.auth.models import AnonymousUser, User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.utils.crypto import constant_time_compare
 from django.utils.deprecation import MiddlewareMixin
+from edx_django_utils.monitoring import set_custom_attribute
 
 from openedx.core.djangoapps.safe_sessions.middleware import SafeSessionMiddleware, _mark_cookie_for_deletion
 
@@ -112,6 +113,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
     def process_request(self, request):
+        set_custom_attribute('DEFAULT_HASHING_ALGORITHM', settings.DEFAULT_HASHING_ALGORITHM)
         try:
             # Try and construct a User instance from data stored in the cache
             session_user_id = SafeSessionMiddleware.get_user_id_from_session(request)
@@ -141,9 +143,29 @@ def _verify_session_auth(self, request):
         auto_auth_enabled = settings.FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING', False)
         if not auto_auth_enabled and hasattr(request.user, 'get_session_auth_hash'):
             session_hash = request.session.get(HASH_SESSION_KEY)
-            if not (session_hash and constant_time_compare(session_hash, request.user.get_session_auth_hash())):
-                # The session hash has changed due to a password
-                # change. Log the user out.
-                request.session.flush()
-                request.user = AnonymousUser()
-                _mark_cookie_for_deletion(request)
+            session_hash_verified = session_hash and constant_time_compare(
+                session_hash, request.user.get_session_auth_hash())
+
+            # session hash is verified from the default algo, so skip legacy check
+            if session_hash_verified:
+                set_custom_attribute('session_hash_verified', "default")
+                return
+
+            if (
+                session_hash and
+                hasattr(request.user, '_legacy_get_session_auth_hash') and
+                constant_time_compare(
+                    session_hash,
+                    request.user._legacy_get_session_auth_hash()  # pylint: disable=protected-access
+                )
+            ):
+                # session hash is verified from legacy hashing algorithm.
+                set_custom_attribute('session_hash_verified', "fallback")
+                return
+
+            # The session hash has changed due to a password
+            # change. Log the user out.
+            request.session.flush()
+            request.user = AnonymousUser()
+            _mark_cookie_for_deletion(request)
+            set_custom_attribute('failed_session_verification', True)
diff --git a/openedx/core/djangoapps/cache_toolbox/tests/test_middleware.py b/openedx/core/djangoapps/cache_toolbox/tests/test_middleware.py
index 21547b69ca1c..a55090b1207b 100644
--- a/openedx/core/djangoapps/cache_toolbox/tests/test_middleware.py
+++ b/openedx/core/djangoapps/cache_toolbox/tests/test_middleware.py
@@ -1,17 +1,18 @@
 """Tests for cached authentication middleware."""
-from unittest.mock import patch
+from unittest.mock import call, patch
 
+import django
 from django.conf import settings
-from django.contrib.auth.models import User, AnonymousUser  # lint-amnesty, pylint: disable=imported-auth-user
-from django.urls import reverse
-from django.test import TestCase
 from django.contrib.auth import SESSION_KEY
+from django.contrib.auth.models import AnonymousUser, User  # lint-amnesty, pylint: disable=imported-auth-user
 from django.http import HttpResponse, SimpleCookie
+from django.test import TestCase
+from django.urls import reverse
 
+from common.djangoapps.student.tests.factories import UserFactory
 from openedx.core.djangoapps.cache_toolbox.middleware import CacheBackedAuthenticationMiddleware
 from openedx.core.djangoapps.safe_sessions.middleware import SafeCookieData, SafeSessionMiddleware
-from openedx.core.djangolib.testing.utils import skip_unless_cms, skip_unless_lms, get_mock_request
-from common.djangoapps.student.tests.factories import UserFactory
+from openedx.core.djangolib.testing.utils import get_mock_request, skip_unless_cms, skip_unless_lms
 
 
 class CachedAuthMiddlewareTestCase(TestCase):
@@ -36,9 +37,68 @@ def _test_change_session_hash(self, test_url, redirect_url, target_status_code=2
         """
         response = self.client.get(test_url)
         assert response.status_code == 200
-        with patch.object(User, 'get_session_auth_hash', return_value='abc123'):
-            response = self.client.get(test_url)
-            self.assertRedirects(response, redirect_url, target_status_code=target_status_code)
+
+        with patch(
+            "openedx.core.djangoapps.cache_toolbox.middleware.set_custom_attribute"
+        ) as mock_set_custom_attribute:
+            with patch.object(User, 'get_session_auth_hash', return_value='abc123', autospec=True):
+                # Django 3.2 has _legacy_get_session_auth_hash, and Django 4 does not
+                # Remove once we reach Django 4
+                if hasattr(User, '_legacy_get_session_auth_hash'):
+                    with patch.object(User, '_legacy_get_session_auth_hash', return_value='abc123'):
+                        response = self.client.get(test_url)
+                else:
+                    response = self.client.get(test_url)
+
+        self.assertRedirects(response, redirect_url, target_status_code=target_status_code)
+        mock_set_custom_attribute.assert_any_call('failed_session_verification', True)
+
+    def _test_custom_attribute_after_changing_hash(self, test_url, mock_set_custom_attribute):
+        """verify that set_custom_attribute is called with expected values"""
+        password = 'test-password'
+
+        # Test DEFAULT_HASHING_ALGORITHM of 'sha1' for both login and client get
+        with self.settings(DEFAULT_HASHING_ALGORITHM='sha1'):
+            self.client.login(username=self.user.username, password=password)
+            self.client.get(test_url)
+        # For Django 3.2, the setting 'sha1' applies and is the "default".
+        # For Django 4, the setting no longer applies, and 'sha256' will be used for both as the "default".
+        mock_set_custom_attribute.assert_has_calls([
+            call('DEFAULT_HASHING_ALGORITHM', 'sha1'),
+            call('session_hash_verified', "default"),
+        ])
+        mock_set_custom_attribute.reset_mock()
+
+        # Test DEFAULT_HASHING_ALGORITHM of 'sha1' for login and switch to 'sha256' for client get.
+        with self.settings(DEFAULT_HASHING_ALGORITHM='sha1'):
+            self.client.login(username=self.user.username, password=password)
+            with self.settings(DEFAULT_HASHING_ALGORITHM='sha256'):
+                self.client.get(test_url)
+        if django.VERSION < (4, 0):
+            # For Django 3.2, the setting 'sha1' applies to login, and uses 'she256' for client get,
+            # and should "fallback" to 'sha1".
+            mock_set_custom_attribute.assert_has_calls([
+                call('DEFAULT_HASHING_ALGORITHM', 'sha256'),
+                call('session_hash_verified', "fallback"),
+            ])
+        else:
+            # For Django 4, the setting no longer applies, and again 'sha256' will be used for both as the "default".
+            mock_set_custom_attribute.assert_has_calls([
+                call('DEFAULT_HASHING_ALGORITHM', 'sha256'),
+                call('session_hash_verified', "default"),
+            ])
+        mock_set_custom_attribute.reset_mock()
+
+        # Test DEFAULT_HASHING_ALGORITHM of 'sha256' for both login and client get
+        with self.settings(DEFAULT_HASHING_ALGORITHM='sha256'):
+            self.client.login(username=self.user.username, password=password)
+            self.client.get(test_url)
+        # For Django 3.2, the setting 'sha256' applies and is the "default".
+        # For Django 4, the setting no longer applies, and 'sha256' will be used for both as the "default".
+        mock_set_custom_attribute.assert_has_calls([
+            call('DEFAULT_HASHING_ALGORITHM', 'sha256'),
+            call('session_hash_verified', "default"),
+        ])
 
     @skip_unless_lms
     def test_session_change_lms(self):
@@ -53,6 +113,20 @@ def test_session_change_cms(self):
         # Studio login redirects to LMS login
         self._test_change_session_hash(home_url, settings.LOGIN_URL + '?next=' + home_url, target_status_code=302)
 
+    @skip_unless_lms
+    @patch("openedx.core.djangoapps.cache_toolbox.middleware.set_custom_attribute")
+    def test_custom_attribute_after_changing_hash_lms(self, mock_set_custom_attribute):
+        """Test set_custom_attribute is called with expected values in LMS"""
+        test_url = reverse('dashboard')
+        self._test_custom_attribute_after_changing_hash(test_url, mock_set_custom_attribute)
+
+    @skip_unless_cms
+    @patch("openedx.core.djangoapps.cache_toolbox.middleware.set_custom_attribute")
+    def test_custom_attribute_after_changing_hash_cms(self, mock_set_custom_attribute):
+        """Test set_custom_attribute is called with expected values in CMS"""
+        test_url = reverse('home')
+        self._test_custom_attribute_after_changing_hash(test_url, mock_set_custom_attribute)
+
     def test_user_logout_on_session_hash_change(self):
         """
         Verify that if a user's session auth hash and the request's hash
@@ -75,9 +149,18 @@ def test_user_logout_on_session_hash_change(self):
         assert self.client.response.cookies.get(settings.SESSION_COOKIE_NAME).value == session_id
         assert self.client.response.cookies.get('edx-jwt-cookie-header-payload').value == 'test-jwt-payload'
 
-        with patch.object(User, 'get_session_auth_hash', return_value='abc123'):
-            CacheBackedAuthenticationMiddleware().process_request(self.request)
-            SafeSessionMiddleware().process_response(self.request, self.client.response)
+        with patch.object(User, 'get_session_auth_hash', return_value='abc123', autospec=True):
+            # Django 3.2 has _legacy_get_session_auth_hash, and Django 4 does not
+            # Remove once we reach Django 4
+            if hasattr(User, '_legacy_get_session_auth_hash'):
+                with patch.object(User, '_legacy_get_session_auth_hash', return_value='abc123'):
+                    CacheBackedAuthenticationMiddleware(get_response=lambda request: None).process_request(self.request)
+
+            else:
+                CacheBackedAuthenticationMiddleware(get_response=lambda request: None).process_request(self.request)
+            SafeSessionMiddleware(get_response=lambda request: None).process_response(
+                self.request, self.client.response
+            )
 
         # asserts that user, session, and JWT cookies do not exist
         assert self.request.session.get(SESSION_KEY) is None
diff --git a/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py b/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
index f23773b842a7..babc3160f81e 100644
--- a/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
+++ b/openedx/core/djangoapps/safe_sessions/tests/test_middleware.py
@@ -223,6 +223,16 @@ def test_update_cookie_data_at_step_3(self):
         assert safe_cookie_data.session_id == 'some_session_id'
         assert safe_cookie_data.verify(self.user.id)
 
+    def test_update_cookie_data_at_step_3_with_sha256(self):
+        """ first encode cookie with default algo sha1 and then check with sha256"""
+        self.assert_response(set_request_user=True, set_session_cookie=True)
+        serialized_cookie_data = self.client.response.cookies[settings.SESSION_COOKIE_NAME].value
+        safe_cookie_data = SafeCookieData.parse(serialized_cookie_data)
+        assert safe_cookie_data.version == SafeCookieData.CURRENT_VERSION
+        assert safe_cookie_data.session_id == 'some_session_id'
+        with self.settings(DEFAULT_HASHING_ALGORITHM='sha256'):
+            assert safe_cookie_data.verify(self.user.id)
+
     def test_cant_update_cookie_at_step_3_error(self):
         self.client.response.cookies[settings.SESSION_COOKIE_NAME] = None
         with self.assert_invalid_session_id():

From 05073c1219204c13dabc8b363a4730b5e2c6b31a Mon Sep 17 00:00:00 2001
From: Muhammad Soban Javed <iamsobanjaved@gmai.com>
Date: Fri, 13 Oct 2023 17:31:45 +0500
Subject: [PATCH 16/18] feat!: update DEFAULT_HASHING_ALGORITHM to sha256

---
 cms/envs/common.py | 4 ++--
 lms/envs/common.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cms/envs/common.py b/cms/envs/common.py
index a8d0b522b629..b1b8c2cab05e 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -1082,8 +1082,8 @@
 }
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-# This will be overridden through CMS config
-DEFAULT_HASHING_ALGORITHM = 'sha1'
+DEFAULT_HASHING_ALGORITHM = 'sha256'
+
 #################### Python sandbox ############################################
 
 CODE_JAIL = {
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 197d82c0c197..c5cbe633f387 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1671,8 +1671,8 @@ def _make_mako_template_dirs(settings):
 
 
 DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-# This will be overridden through LMS config
-DEFAULT_HASHING_ALGORITHM = 'sha1'
+DEFAULT_HASHING_ALGORITHM = 'sha256'
+
 #################### Python sandbox ############################################
 
 CODE_JAIL = {

From 30b95bcca53b57658cae72fa4f7235f4887d476b Mon Sep 17 00:00:00 2001
From: Muhammad Soban Javed <iamsobanjaved@gmai.com>
Date: Fri, 13 Oct 2023 19:26:35 +0500
Subject: [PATCH 17/18] test: update hash value with hash from sha256

---
 .../djangoapps/safe_sessions/tests/test_safe_cookie_data.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openedx/core/djangoapps/safe_sessions/tests/test_safe_cookie_data.py b/openedx/core/djangoapps/safe_sessions/tests/test_safe_cookie_data.py
index b8a23c567d24..bbad0e85851d 100644
--- a/openedx/core/djangoapps/safe_sessions/tests/test_safe_cookie_data.py
+++ b/openedx/core/djangoapps/safe_sessions/tests/test_safe_cookie_data.py
@@ -234,5 +234,5 @@ def test_pinned_values(self):
             "|HvGnjXf1b3jU"
             "|ImExZWZiNzVlZGFmM2FkZWZmYjM4YjI0ZmZkOWU4MzExODU0MTk4NmVlNGRiYzBlODdhYWUzOGM5MzVlNzk4NjUi"
             ":1m6Hve"
-            ":OMhY2FL2pudJjSSXChtI-zR8QVA"
+            ":Pra4iochviPvKUoIV33gdVZFDgG-cMDlIYfl8iFIMaY"
         )

From 3e1dbf2f829e4ac00d52ab0061ff9e7ad5a30866 Mon Sep 17 00:00:00 2001
From: Fabe Z <zengjiayifabe@outlook.com>
Date: Wed, 20 Dec 2023 19:00:35 -0500
Subject: [PATCH 18/18] docs!: delete uwsgi.ini

delete unused uwsgi.ini
---
 uwsgi.ini | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100755 uwsgi.ini

diff --git a/uwsgi.ini b/uwsgi.ini
deleted file mode 100755
index e69de29bb2d1..000000000000