- % if use_v2_cert_display_settings:
-
- % else:
-
- % endif
+
${_("Certificates are awarded at the end of a course run")}
- % if use_v2_cert_display_settings:
-
-
-
-
-
- ${_("Read more about this setting")}
-
+
+
+
+
+
+ ${_("Read more about this setting")}
+
+
+
+
${_("In all configurations of this setting, certificates are generated for learners as soon as they achieve the passing threshold in the course (which can occur before a final assignment based on course design)")}
+
+
${_("Immediately upon passing")}
+
${_("Learners can access their certificate as soon as they achieve a passing grade above the course grade threshold. Note: learners can achieve a passing grade before encountering all assignments in some course configurations.")}
-
-
${_("In all configurations of this setting, certificates are generated for learners as soon as they achieve the passing threshold in the course (which can occur before a final assignment based on course design)")}
-
-
${_("Immediately upon passing")}
-
${_("Learners can access their certificate as soon as they achieve a passing grade above the course grade threshold. Note: learners can achieve a passing grade before encountering all assignments in some course configurations.")}
-
-
-
${_("On course end date")}
-
${_("Learners with passing grades can access their certificate once the end date of the course has elapsed.")}
-
-
-
${_("A date after the course end date")}
-
${_("Learners with passing grades can access their certificate after the date that you set has elapsed.")}
-
+
+
${_("On course end date")}
+
${_("Learners with passing grades can access their certificate once the end date of the course has elapsed.")}
+
+
+
${_("A date after the course end date")}
+
${_("Learners with passing grades can access their certificate after the date that you set has elapsed.")}
- % endif
+
- % if use_v2_cert_display_settings:
-
- % else:
-
- % endif
+
diff --git a/common/djangoapps/student/helpers.py b/common/djangoapps/student/helpers.py
index fb0a7236c0b5..b5d46949b506 100644
--- a/common/djangoapps/student/helpers.py
+++ b/common/djangoapps/student/helpers.py
@@ -646,21 +646,14 @@ def _is_certificate_earned_but_not_available(course_overview, status):
(bool): True if the user earned the certificate but it's hidden due to display behavior, else False
"""
- if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
- return (
- not certificates_viewable_for_course(course_overview)
- and CertificateStatuses.is_passing_status(status)
- and course_overview.certificates_display_behavior in (
- CertificatesDisplayBehaviors.END_WITH_DATE,
- CertificatesDisplayBehaviors.END
- )
- )
- else:
- return (
- not certificates_viewable_for_course(course_overview) and
- CertificateStatuses.is_passing_status(status) and
- course_overview.certificate_available_date
+ return (
+ not certificates_viewable_for_course(course_overview)
+ and CertificateStatuses.is_passing_status(status)
+ and course_overview.certificates_display_behavior in (
+ CertificatesDisplayBehaviors.END_WITH_DATE,
+ CertificatesDisplayBehaviors.END
)
+ )
def process_survey_link(survey_link, user):
diff --git a/common/djangoapps/third_party_auth/README.rst b/common/djangoapps/third_party_auth/README.rst
new file mode 100644
index 000000000000..d2e1089eca5d
--- /dev/null
+++ b/common/djangoapps/third_party_auth/README.rst
@@ -0,0 +1,11 @@
+Third Party Auth
+----------------
+
+This djangoapp provides the views and workflows for authenticating into edx-platform with third-party applications, including both OAuth and SAML workflows.
+
+We make use of the `social-auth-app-django`_ as our backend library for this djangoapp.
+
+To enable this feature, check out the `third party authentication documentation`.
+
+.. _social-auth-app-django: https://github.com/python-social-auth/social-app-django
+.. _third party authentication documentation: https://edx.readthedocs.io/projects/edx-installing-configuring-and-running/en/latest/configuration/tpa/index.html
diff --git a/common/djangoapps/third_party_auth/admin.py b/common/djangoapps/third_party_auth/admin.py
index 284c50fcf884..d44da6248ee2 100644
--- a/common/djangoapps/third_party_auth/admin.py
+++ b/common/djangoapps/third_party_auth/admin.py
@@ -53,13 +53,15 @@ class SAMLProviderConfigForm(forms.ModelForm):
class SAMLProviderConfigAdmin(KeyedConfigurationModelAdmin):
""" Django Admin class for SAMLProviderConfig """
form = SAMLProviderConfigForm
+ search_fields = ['display_name']
def get_queryset(self, request):
"""
- Filter the queryset to exclude the archived records.
+ Filter the queryset to exclude the archived records unless it's the /change/ view.
"""
- queryset = super().get_queryset(request).exclude(archived=True)
- return queryset
+ if request.path.endswith('/change/'):
+ return self.model.objects.all()
+ return super().get_queryset(request).exclude(archived=True)
def archive_provider_configuration(self, request, queryset):
"""
@@ -99,7 +101,15 @@ def name_with_update_link(self, instance):
Record name with link for the change view.
"""
if not instance.is_active:
- return instance.name
+ update_url = reverse(
+ f'admin:{self.model._meta.app_label}_{self.model._meta.model_name}_change',
+ args=[instance.pk]
+ )
+ return format_html(
+ '{}',
+ update_url,
+ f'{instance.name}'
+ )
update_url = reverse(f'admin:{self.model._meta.app_label}_{self.model._meta.model_name}_add')
update_url += f'?source={instance.pk}'
@@ -167,11 +177,11 @@ def upload_csv(self, request, slug):
# Always redirect back to the SAMLProviderConfig listing page
return HttpResponseRedirect(reverse('admin:third_party_auth_samlproviderconfig_changelist'))
- def change_view(self, request, object_slug, form_url='', extra_context=None):
+ def change_view(self, request, object_id, form_url='', extra_context=None):
""" Extend the change view to include CSV upload. """
extra_context = extra_context or {}
extra_context['show_csv_upload'] = True
- return super().change_view(request, object_slug, form_url, extra_context)
+ return super().change_view(request, object_id, form_url, extra_context)
def csv_uuid_update_button(self, obj):
""" Add CSV upload button to the form. """
diff --git a/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py b/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
index 4bfc710fe901..c19b0b8d96aa 100644
--- a/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
+++ b/common/djangoapps/third_party_auth/tests/test_pipeline_integration.py
@@ -583,7 +583,7 @@ def test_verification_signal(self):
"""
Verification signal is sent upon approval.
"""
- with mock.patch('openedx_events.learning.signals.IDV_ATTEMPT_APPROVED.send_event') as mock_signal:
+ with mock.patch('openedx.core.djangoapps.signals.signals.LEARNER_SSO_VERIFIED.send_robust') as mock_signal:
# Begin the pipeline.
pipeline.set_id_verification_status(
auth_entry=pipeline.AUTH_ENTRY_LOGIN,
diff --git a/common/static/data/geoip/GeoLite2-Country.mmdb b/common/static/data/geoip/GeoLite2-Country.mmdb
index 2e9d48109648..479048791da5 100644
Binary files a/common/static/data/geoip/GeoLite2-Country.mmdb and b/common/static/data/geoip/GeoLite2-Country.mmdb differ
diff --git a/cms/templates/content_libraries/xblock_iframe.html b/common/templates/xblock_v2/xblock_iframe.html
similarity index 99%
rename from cms/templates/content_libraries/xblock_iframe.html
rename to common/templates/xblock_v2/xblock_iframe.html
index b6e455f78515..8b733373bd82 100644
--- a/cms/templates/content_libraries/xblock_iframe.html
+++ b/common/templates/xblock_v2/xblock_iframe.html
@@ -156,7 +156,7 @@
-
+
{{ fragment.body_html | safe }}
diff --git a/lms/djangoapps/bulk_email/message_types.py b/lms/djangoapps/bulk_email/message_types.py
index 033f5423e1f7..53c7e92029a5 100644
--- a/lms/djangoapps/bulk_email/message_types.py
+++ b/lms/djangoapps/bulk_email/message_types.py
@@ -12,3 +12,4 @@ class BulkEmail(BaseMessageType):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self.options['from_address'] = kwargs['context']['from_address']
+ self.options['transactional'] = True
diff --git a/lms/djangoapps/certificates/api.py b/lms/djangoapps/certificates/api.py
index 4439eeb5f220..bd7db8662e70 100644
--- a/lms/djangoapps/certificates/api.py
+++ b/lms/djangoapps/certificates/api.py
@@ -10,7 +10,6 @@
import logging
from datetime import datetime
-from django.conf import settings
from django.contrib.auth import get_user_model
from django.core.exceptions import ObjectDoesNotExist
from django.db.models import Q
@@ -286,12 +285,9 @@ def certificate_downloadable_status(student, course_key):
course_overview = get_course_overview_or_none(course_key)
- if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
- display_behavior_is_valid = (
- course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
- )
- else:
- display_behavior_is_valid = True
+ display_behavior_is_valid = (
+ course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
+ )
if (
not certificates_viewable_for_course(course_overview)
@@ -837,10 +833,7 @@ def can_show_certificate_message(course, student, course_grade, certificates_ena
def _course_uses_available_date(course):
"""Returns if the course has an certificate_available_date set and that it should be used"""
- if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
- display_behavior_is_valid = course.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
- else:
- display_behavior_is_valid = True
+ display_behavior_is_valid = course.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
return (
can_show_certificate_available_date_field(course)
diff --git a/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl b/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl
index d7ca8fd9a400..e5b66bf3b2ab 100644
--- a/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl
+++ b/lms/djangoapps/certificates/docs/diagrams/certificate_generation.dsl
@@ -32,6 +32,8 @@ workspace {
grades_app -> signal_handlers "Emits COURSE_GRADE_NOW_PASSED signal"
verify_student_app -> signal_handlers "Emits IDV_ATTEMPT_APPROVED signal"
+ verify_student_app -> signal_handlers "Emits LEARNER_SSO_VERIFIED signal"
+ verify_student_app -> signal_handlers "Emits PHOTO_VERIFICATION_APPROVED signal"
student_app -> signal_handlers "Emits ENROLLMENT_TRACK_UPDATED signal"
allowlist -> signal_handlers "Emits APPEND_CERTIFICATE_ALLOWLIST signal"
signal_handlers -> generation_handler "Invokes generate_allowlist_certificate()"
diff --git a/lms/djangoapps/certificates/signals.py b/lms/djangoapps/certificates/signals.py
index 53055bf9c86e..39042ff34164 100644
--- a/lms/djangoapps/certificates/signals.py
+++ b/lms/djangoapps/certificates/signals.py
@@ -32,6 +32,8 @@
from openedx.core.djangoapps.signals.signals import (
COURSE_GRADE_NOW_FAILED,
COURSE_GRADE_NOW_PASSED,
+ LEARNER_SSO_VERIFIED,
+ PHOTO_VERIFICATION_APPROVED,
)
from openedx_events.learning.signals import EXAM_ATTEMPT_REJECTED, IDV_ATTEMPT_APPROVED
@@ -117,17 +119,13 @@ def _listen_for_failing_grade(sender, user, course_id, grade, **kwargs): # pyli
log.info(f'Certificate marked not passing for {user.id} : {course_id} via failing grade')
-@receiver(IDV_ATTEMPT_APPROVED, dispatch_uid="learner_track_changed")
-def _listen_for_id_verification_status_changed(sender, signal, **kwargs): # pylint: disable=unused-argument
+def _handle_id_verification_approved(user):
"""
- Listen for a signal indicating that the user's id verification status has changed.
+ Generate a certificate for the user if they are now verified
"""
if not auto_certificate_generation_enabled():
return
- event_data = kwargs.get('idv_attempt')
- user = User.objects.get(id=event_data.user.id)
-
user_enrollments = CourseEnrollment.enrollments_for_user(user=user)
expected_verification_status = IDVerificationService.user_status(user)
expected_verification_status = expected_verification_status['status']
@@ -145,6 +143,25 @@ def _listen_for_id_verification_status_changed(sender, signal, **kwargs): # pyl
)
+@receiver(LEARNER_SSO_VERIFIED, dispatch_uid="sso_learner_verified")
+@receiver(PHOTO_VERIFICATION_APPROVED, dispatch_uid="photo_verification_approved")
+def _listen_for_sso_verification_approved(sender, user, **kwargs): # pylint: disable=unused-argument
+ """
+ Listen for a signal on SSOVerification indicating that the user has been verified.
+ """
+ _handle_id_verification_approved(user)
+
+
+@receiver(IDV_ATTEMPT_APPROVED, dispatch_uid="openedx_idv_attempt_approved")
+def _listen_for_id_verification_approved_event(sender, signal, **kwargs): # pylint: disable=unused-argument
+ """
+ Listen for an openedx event indicating that the user's id verification status has changed.
+ """
+ event_data = kwargs.get('idv_attempt')
+ user = User.objects.get(id=event_data.user.id)
+ _handle_id_verification_approved(user)
+
+
@receiver(ENROLLMENT_TRACK_UPDATED)
def _listen_for_enrollment_mode_change(sender, user, course_key, mode, **kwargs): # pylint: disable=unused-argument
"""
diff --git a/lms/djangoapps/certificates/tests/test_api.py b/lms/djangoapps/certificates/tests/test_api.py
index 21d04a7e3da6..cb11b9e00bd1 100644
--- a/lms/djangoapps/certificates/tests/test_api.py
+++ b/lms/djangoapps/certificates/tests/test_api.py
@@ -209,29 +209,6 @@ def test_with_downloadable_web_cert(self):
"uuid": cert_status["uuid"],
}
- @ddt.data(
- (False, timedelta(days=2), False, True),
- (False, -timedelta(days=2), True, None),
- (True, timedelta(days=2), True, None),
- )
- @ddt.unpack
- @patch.dict(settings.FEATURES, {"CERTIFICATES_HTML_VIEW": True})
- @patch.dict(settings.FEATURES, {"ENABLE_V2_CERT_DISPLAY_SETTINGS": False})
- def test_cert_api_return_v1(self, self_paced, cert_avail_delta, cert_downloadable_status, earned_but_not_available):
- """
- Test 'downloadable status'
- """
- cert_avail_date = datetime.now(pytz.UTC) + cert_avail_delta
- self.course.self_paced = self_paced
- self.course.certificate_available_date = cert_avail_date
- self.course.save()
-
- self._setup_course_certificate()
-
- downloadable_status = certificate_downloadable_status(self.student, self.course.id)
- assert downloadable_status["is_downloadable"] == cert_downloadable_status
- assert downloadable_status.get("earned_but_not_available") == earned_but_not_available
-
@ddt.data(
(True, timedelta(days=2), CertificatesDisplayBehaviors.END_WITH_DATE, True, None),
(False, -timedelta(days=2), CertificatesDisplayBehaviors.EARLY_NO_INFO, True, None),
@@ -243,8 +220,7 @@ def test_cert_api_return_v1(self, self_paced, cert_avail_delta, cert_downloadabl
)
@ddt.unpack
@patch.dict(settings.FEATURES, {"CERTIFICATES_HTML_VIEW": True})
- @patch.dict(settings.FEATURES, {"ENABLE_V2_CERT_DISPLAY_SETTINGS": True})
- def test_cert_api_return_v2(
+ def test_cert_api_return(
self,
self_paced,
cert_avail_delta,
diff --git a/lms/djangoapps/certificates/tests/test_filters.py b/lms/djangoapps/certificates/tests/test_filters.py
index 781b77461f41..a131a1d52582 100644
--- a/lms/djangoapps/certificates/tests/test_filters.py
+++ b/lms/djangoapps/certificates/tests/test_filters.py
@@ -23,7 +23,7 @@
from lms.djangoapps.certificates.models import GeneratedCertificate
from lms.djangoapps.certificates.signals import (
_listen_for_enrollment_mode_change,
- _listen_for_id_verification_status_changed,
+ _handle_id_verification_approved,
listen_for_passing_grade
)
from lms.djangoapps.certificates.tests.factories import CertificateAllowlistFactory
@@ -272,7 +272,7 @@ def test_listen_for_passing_grade(self):
mock.Mock(return_value={"status": "approved"})
)
@mock.patch("lms.djangoapps.certificates.api.auto_certificate_generation_enabled", mock.Mock(return_value=True))
- def test_listen_for_id_verification_status_changed(self):
+ def test_handle_id_verification_approved(self):
"""
Test stop certificate generation process after the verification status changed by raising a filters exception.
@@ -280,7 +280,7 @@ def test_listen_for_id_verification_status_changed(self):
- CertificateCreationRequested is triggered and executes TestStopCertificateGenerationStep.
- The certificate is not generated.
"""
- _listen_for_id_verification_status_changed(None, self.user)
+ _handle_id_verification_approved(self.user)
self.assertFalse(
GeneratedCertificate.objects.filter(
diff --git a/lms/djangoapps/certificates/tests/test_utils.py b/lms/djangoapps/certificates/tests/test_utils.py
index 00bb0bbe3ed0..298e624fdd8e 100644
--- a/lms/djangoapps/certificates/tests/test_utils.py
+++ b/lms/djangoapps/certificates/tests/test_utils.py
@@ -5,7 +5,6 @@
from unittest.mock import patch
import ddt
-from django.conf import settings
from django.test import TestCase
from pytz import utc
@@ -80,40 +79,7 @@ def test_has_html_certificates_enabled_from_course_overview_disabled(self):
(CertificatesDisplayBehaviors.END, False, False, _LAST_MONTH, True, True),
)
@ddt.unpack
- @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
- def test_should_certificate_be_visible_v2(
- self,
- certificates_display_behavior,
- certificates_show_before_end,
- has_ended,
- certificate_available_date,
- self_paced,
- expected_value
- ):
- """Test whether the certificate should be visible to user given multiple usecases"""
- assert should_certificate_be_visible(
- certificates_display_behavior,
- certificates_show_before_end,
- has_ended,
- certificate_available_date,
- self_paced
- ) == expected_value
-
- @ddt.data(
- ('early_with_info', True, True, _LAST_MONTH, False, True),
- ('early_no_info', False, False, _LAST_MONTH, False, True),
- ('end', True, False, _LAST_MONTH, False, True),
- ('end', False, True, _LAST_MONTH, False, True),
- ('end', False, False, _NEXT_WEEK, False, False),
- ('end', False, False, _LAST_WEEK, False, True),
- ('end', False, False, None, False, False),
- ('early_with_info', False, False, None, False, True),
- ('end', False, False, _NEXT_WEEK, False, False),
- ('end', False, False, _NEXT_WEEK, True, True),
- )
- @ddt.unpack
- @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=False)
- def test_should_certificate_be_visible_v1(
+ def test_should_certificate_be_visible(
self,
certificates_display_behavior,
certificates_show_before_end,
diff --git a/lms/djangoapps/certificates/utils.py b/lms/djangoapps/certificates/utils.py
index 725c54ac09bc..7ff2a4c97b27 100644
--- a/lms/djangoapps/certificates/utils.py
+++ b/lms/djangoapps/certificates/utils.py
@@ -153,30 +153,19 @@ def should_certificate_be_visible(
certificate_available_date (datetime): the date the certificate is available on for the course.
self_paced (bool): Whether the course is self-paced.
"""
- if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
- show_early = (
- certificates_display_behavior == CertificatesDisplayBehaviors.EARLY_NO_INFO
- or certificates_show_before_end
- )
- past_available_date = (
- certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
- and certificate_available_date
- and certificate_available_date < datetime.now(utc)
- )
- ended_without_available_date = (
- certificates_display_behavior == CertificatesDisplayBehaviors.END
- and has_ended
- )
- else:
- show_early = (
- certificates_display_behavior in ('early_with_info', 'early_no_info')
- or certificates_show_before_end
- )
- past_available_date = (
- certificate_available_date
- and certificate_available_date < datetime.now(utc)
- )
- ended_without_available_date = (certificate_available_date is None) and has_ended
+ show_early = (
+ certificates_display_behavior == CertificatesDisplayBehaviors.EARLY_NO_INFO
+ or certificates_show_before_end
+ )
+ past_available_date = (
+ certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
+ and certificate_available_date
+ and certificate_available_date < datetime.now(utc)
+ )
+ ended_without_available_date = (
+ certificates_display_behavior == CertificatesDisplayBehaviors.END
+ and has_ended
+ )
return any((self_paced, show_early, past_available_date, ended_without_available_date))
diff --git a/lms/djangoapps/certificates/views/webview.py b/lms/djangoapps/certificates/views/webview.py
index 40a1f4499305..06e4e8a55337 100644
--- a/lms/djangoapps/certificates/views/webview.py
+++ b/lms/djangoapps/certificates/views/webview.py
@@ -353,28 +353,22 @@ def _get_user_certificate(request, user, course_key, course_overview, preview_mo
if preview_mode:
# certificate is being previewed from studio
if request.user.has_perm(PREVIEW_CERTIFICATES, course_overview):
- if not settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
- if course_overview.certificate_available_date and not course_overview.self_paced:
- modified_date = course_overview.certificate_available_date
- else:
- modified_date = datetime.now().date()
+ if (
+ course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
+ and course_overview.certificate_available_date
+ and not course_overview.self_paced
+ ):
+ modified_date = course_overview.certificate_available_date
+ elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END:
+ modified_date = course_overview.end
else:
- if (
- course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE
- and course_overview.certificate_available_date
- and not course_overview.self_paced
- ):
- modified_date = course_overview.certificate_available_date
- elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END:
- modified_date = course_overview.end
- else:
- modified_date = datetime.now().date()
- user_certificate = GeneratedCertificate(
- mode=preview_mode,
- verify_uuid=str(uuid4().hex),
- modified_date=modified_date,
- created_date=datetime.now().date(),
- )
+ modified_date = datetime.now().date()
+ user_certificate = GeneratedCertificate(
+ mode=preview_mode,
+ verify_uuid=str(uuid4().hex),
+ modified_date=modified_date,
+ created_date=datetime.now().date(),
+ )
elif certificates_viewable_for_course(course_overview):
# certificate is being viewed by learner or public
try:
diff --git a/lms/djangoapps/commerce/utils.py b/lms/djangoapps/commerce/utils.py
index 82ed8c483024..617852b4f662 100644
--- a/lms/djangoapps/commerce/utils.py
+++ b/lms/djangoapps/commerce/utils.py
@@ -238,6 +238,7 @@ def refund_entitlement(course_entitlement):
return False
+@pluggable_override('OVERRIDE_REFUND_SEAT')
def refund_seat(course_enrollment, change_mode=False):
"""
Attempt to initiate a refund for any orders associated with the seat being unenrolled,
@@ -287,7 +288,7 @@ def refund_seat(course_enrollment, change_mode=False):
user=enrollee,
)
if change_mode:
- _auto_enroll(course_enrollment)
+ auto_enroll(course_enrollment)
else:
log.info('No refund opened for user [%s], course [%s]', enrollee.id, course_key_str)
@@ -354,7 +355,7 @@ def _refund_in_commerce_coordinator(course_enrollment, change_mode):
log.info('Refund successfully sent to Commerce Coordinator for user [%s], course [%s].',
course_enrollment.user_id, course_key_str)
if change_mode:
- _auto_enroll(course_enrollment)
+ auto_enroll(course_enrollment)
return True
else:
# Refund was not meant to be sent to Commerce Coordinator
@@ -363,7 +364,7 @@ def _refund_in_commerce_coordinator(course_enrollment, change_mode):
return False
-def _auto_enroll(course_enrollment):
+def auto_enroll(course_enrollment):
"""
Helper method to update an enrollment to a default course mode.
diff --git a/lms/djangoapps/courseware/toggles.py b/lms/djangoapps/courseware/toggles.py
index 43fb40436a5e..e6070a2e3bd1 100644
--- a/lms/djangoapps/courseware/toggles.py
+++ b/lms/djangoapps/courseware/toggles.py
@@ -148,7 +148,6 @@
# .. toggle_creation_date: 2019-05-16
# .. toggle_expiration_date: None
# .. toggle_tickets: https://github.com/mitodl/edx-platform/issues/123
-# .. toggle_status: unsupported
COURSES_INVITE_ONLY = SettingToggle('COURSES_INVITE_ONLY', default=False)
diff --git a/lms/djangoapps/discussion/rest_api/discussions_notifications.py b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
index 4e372280ce66..498a05fdb987 100644
--- a/lms/djangoapps/discussion/rest_api/discussions_notifications.py
+++ b/lms/djangoapps/discussion/rest_api/discussions_notifications.py
@@ -392,7 +392,8 @@ def clean_thread_html_body(html_body):
"video", "track", # Video Tags
"audio", # Audio Tags
"embed", "object", "iframe", # Embedded Content
- "script"
+ "script",
+ "b", "strong", "i", "em", "u", "s", "strike", "del", "ins", "mark", "sub", "sup", # Text Formatting
]
# Remove the specified tags while keeping their content
@@ -403,9 +404,10 @@ def clean_thread_html_body(html_body):
# Replace tags that are not allowed in email
tags_to_update = [
{"source": "button", "target": "span"},
- {"source": "h1", "target": "h4"},
- {"source": "h2", "target": "h4"},
- {"source": "h3", "target": "h4"},
+ *[
+ {"source": tag, "target": "p"}
+ for tag in ["div", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"]
+ ],
]
for tag_dict in tags_to_update:
for source_tag in html_body.find_all(tag_dict['source']):
@@ -414,4 +416,7 @@ def clean_thread_html_body(html_body):
target_tag.string = source_tag.string
source_tag.replace_with(target_tag)
+ for tag in html_body.find_all(True):
+ tag.attrs = {}
+ tag['style'] = 'margin: 0'
return str(html_body)
diff --git a/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py b/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py
index d92e1000feb5..0a8d7504161f 100644
--- a/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py
+++ b/lms/djangoapps/discussion/rest_api/tests/test_discussions_notifications.py
@@ -104,14 +104,14 @@ def test_html_tags_removal(self):
')
result = clean_thread_html_body(html_body)
@@ -132,19 +132,16 @@ def test_truncate_html_body(self):
"""
Test that the clean_thread_html_body function truncates the HTML body to 500 characters
"""
- html_body = """
-
This is a long text that should be truncated to 500 characters.
- """ * 20 # Repeat to exceed 500 characters
-
- result = clean_thread_html_body(html_body)
- self.assertGreaterEqual(500, len(result))
+ html_body = "This is a long text that should be truncated to 500 characters." * 20
+ result = clean_thread_html_body(f"
{html_body}
")
+ self.assertGreaterEqual(525, len(result)) # 500 characters + 25 characters for the HTML tags
def test_no_tags_to_remove(self):
"""
Test that the clean_thread_html_body function does not remove any tags if there are no unwanted tags
"""
html_body = "
This paragraph has no tags to remove.
"
- expected_output = "
This paragraph has no tags to remove.
"
+ expected_output = '
This paragraph has no tags to remove.
'
result = clean_thread_html_body(html_body)
self.assertEqual(result, expected_output)
@@ -169,28 +166,33 @@ def test_only_script_tag(self):
result = clean_thread_html_body(html_body)
self.assertEqual(result.strip(), expected_output)
+ def test_tag_replace(self):
+ """
+ Tests if the clean_thread_html_body function replaces tags
+ """
+ for tag in ["div", "section", "article", "h1", "h2", "h3", "h4", "h5", "h6"]:
+ html_body = f'<{tag}>Text'
+ result = clean_thread_html_body(html_body)
+ self.assertEqual(result, '
Text
')
+
def test_button_tag_replace(self):
"""
Tests that the clean_thread_html_body function replaces the button tag with span tag
"""
# Tests for button replacement tag with text
html_body = ''
- expected_output = 'Button'
+ expected_output = 'Button'
result = clean_thread_html_body(html_body)
self.assertEqual(result, expected_output)
# Tests button tag replacement without text
html_body = ''
- expected_output = ''
+ expected_output = ''
result = clean_thread_html_body(html_body)
self.assertEqual(result, expected_output)
- def test_heading_tag_replace(self):
- """
- Tests that the clean_thread_html_body function replaces the h1, h2 and h3 tags with h4 tag
- """
- for tag in ['h1', 'h2', 'h3']:
- html_body = f'<{tag}>Heading'
- expected_output = '
Heading
'
- result = clean_thread_html_body(html_body)
- self.assertEqual(result, expected_output)
+ def test_attributes_removal_from_tag(self):
+ # Tests for removal of attributes from tags
+ html_body = '
Paragraph
'
+ result = clean_thread_html_body(html_body)
+ self.assertEqual(result, '
Paragraph
')
diff --git a/lms/djangoapps/instructor/views/api.py b/lms/djangoapps/instructor/views/api.py
index b7c9648fa88c..1761a21f95d9 100644
--- a/lms/djangoapps/instructor/views/api.py
+++ b/lms/djangoapps/instructor/views/api.py
@@ -1419,13 +1419,9 @@ def get_issued_certificates(request, course_id):
return JsonResponse(response_payload)
-@transaction.non_atomic_requests
-@require_POST
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.CAN_RESEARCH)
-@common_exceptions_400
-def get_students_features(request, course_id, csv=False): # pylint: disable=redefined-outer-name
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class GetStudentsFeatures(DeveloperErrorViewMixin, APIView):
"""
Respond with json which contains a summary of all enrolled students profile information.
@@ -1434,86 +1430,108 @@ def get_students_features(request, course_id, csv=False): # pylint: disable=red
TO DO accept requests for different attribute sets.
"""
- course_key = CourseKey.from_string(course_id)
- course = get_course_by_id(course_key)
- report_type = _('enrolled learner profile')
- available_features = instructor_analytics_basic.AVAILABLE_FEATURES
-
- # Allow for sites to be able to define additional columns.
- # Note that adding additional columns has the potential to break
- # the student profile report due to a character limit on the
- # asynchronous job input which in this case is a JSON string
- # containing the list of columns to include in the report.
- # TODO: Refactor the student profile report code to remove the list of columns
- # that should be included in the report from the asynchronous job input.
- # We need to clone the list because we modify it below
- query_features = list(configuration_helpers.get_value('student_profile_download_fields', []))
-
- if not query_features:
- query_features = [
- 'id', 'username', 'name', 'email', 'language', 'location',
- 'year_of_birth', 'gender', 'level_of_education', 'mailing_address',
- 'goals', 'enrollment_mode', 'last_login', 'date_joined', 'external_user_key'
- ]
- keep_field_private(query_features, 'year_of_birth') # protected information
-
- # Provide human-friendly and translatable names for these features. These names
- # will be displayed in the table generated in data_download.js. It is not (yet)
- # used as the header row in the CSV, but could be in the future.
- query_features_names = {
- 'id': _('User ID'),
- 'username': _('Username'),
- 'name': _('Name'),
- 'email': _('Email'),
- 'language': _('Language'),
- 'location': _('Location'),
- # 'year_of_birth': _('Birth Year'), treated as privileged information as of TNL-10683, not to go in reports
- 'gender': _('Gender'),
- 'level_of_education': _('Level of Education'),
- 'mailing_address': _('Mailing Address'),
- 'goals': _('Goals'),
- 'enrollment_mode': _('Enrollment Mode'),
- 'last_login': _('Last Login'),
- 'date_joined': _('Date Joined'),
- 'external_user_key': _('External User Key'),
- }
-
- if is_course_cohorted(course.id):
- # Translators: 'Cohort' refers to a group of students within a course.
- query_features.append('cohort')
- query_features_names['cohort'] = _('Cohort')
+ permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+ permission_name = permissions.CAN_RESEARCH
- if course.teams_enabled:
- query_features.append('team')
- query_features_names['team'] = _('Team')
+ @method_decorator(ensure_csrf_cookie)
+ @method_decorator(transaction.non_atomic_requests)
+ def post(self, request, course_id, csv=False): # pylint: disable=redefined-outer-name
+ """
+ Handle POST requests to retrieve student profile information for a specific course.
- # For compatibility reasons, city and country should always appear last.
- query_features.append('city')
- query_features_names['city'] = _('City')
- query_features.append('country')
- query_features_names['country'] = _('Country')
+ Args:
+ request: The HTTP request object.
+ course_id: The ID of the course for which to retrieve student information.
+ csv: Optional; if 'csv' is present in the URL, it indicates that the response should be in CSV format.
+ Defaults to None.
- if not csv:
- student_data = instructor_analytics_basic.enrolled_students_features(course_key, query_features)
- response_payload = {
- 'course_id': str(course_key),
- 'students': student_data,
- 'students_count': len(student_data),
- 'queried_features': query_features,
- 'feature_names': query_features_names,
- 'available_features': available_features,
+ Returns:
+ Response: A JSON response containing student profile information, or CSV if the `csv` parameter is provided.
+ """
+ course_key = CourseKey.from_string(course_id)
+ course = get_course_by_id(course_key)
+ report_type = _('enrolled learner profile')
+ available_features = instructor_analytics_basic.AVAILABLE_FEATURES
+
+ # Allow for sites to be able to define additional columns.
+ # Note that adding additional columns has the potential to break
+ # the student profile report due to a character limit on the
+ # asynchronous job input which in this case is a JSON string
+ # containing the list of columns to include in the report.
+ # TODO: Refactor the student profile report code to remove the list of columns
+ # that should be included in the report from the asynchronous job input.
+ # We need to clone the list because we modify it below
+ query_features = list(configuration_helpers.get_value('student_profile_download_fields', []))
+
+ if not query_features:
+ query_features = [
+ 'id', 'username', 'name', 'email', 'language', 'location',
+ 'year_of_birth', 'gender', 'level_of_education', 'mailing_address',
+ 'goals', 'enrollment_mode', 'last_login', 'date_joined', 'external_user_key'
+ ]
+ keep_field_private(query_features, 'year_of_birth') # protected information
+
+ # Provide human-friendly and translatable names for these features. These names
+ # will be displayed in the table generated in data_download.js. It is not (yet)
+ # used as the header row in the CSV, but could be in the future.
+ query_features_names = {
+ 'id': _('User ID'),
+ 'username': _('Username'),
+ 'name': _('Name'),
+ 'email': _('Email'),
+ 'language': _('Language'),
+ 'location': _('Location'),
+ # 'year_of_birth': _('Birth Year'), treated as privileged information as of TNL-10683,
+ # not to go in reports
+ 'gender': _('Gender'),
+ 'level_of_education': _('Level of Education'),
+ 'mailing_address': _('Mailing Address'),
+ 'goals': _('Goals'),
+ 'enrollment_mode': _('Enrollment Mode'),
+ 'last_login': _('Last Login'),
+ 'date_joined': _('Date Joined'),
+ 'external_user_key': _('External User Key'),
}
- return JsonResponse(response_payload)
- else:
- task_api.submit_calculate_students_features_csv(
- request,
- course_key,
- query_features
- )
- success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+ if is_course_cohorted(course.id):
+ # Translators: 'Cohort' refers to a group of students within a course.
+ query_features.append('cohort')
+ query_features_names['cohort'] = _('Cohort')
- return JsonResponse({"status": success_status})
+ if course.teams_enabled:
+ query_features.append('team')
+ query_features_names['team'] = _('Team')
+
+ # For compatibility reasons, city and country should always appear last.
+ query_features.append('city')
+ query_features_names['city'] = _('City')
+ query_features.append('country')
+ query_features_names['country'] = _('Country')
+
+ if not csv:
+ student_data = instructor_analytics_basic.enrolled_students_features(course_key, query_features)
+ response_payload = {
+ 'course_id': str(course_key),
+ 'students': student_data,
+ 'students_count': len(student_data),
+ 'queried_features': query_features,
+ 'feature_names': query_features_names,
+ 'available_features': available_features,
+ }
+ return JsonResponse(response_payload)
+
+ else:
+ try:
+ task_api.submit_calculate_students_features_csv(
+ request,
+ course_key,
+ query_features
+ )
+ success_status = SUCCESS_MESSAGE_TEMPLATE.format(report_type=report_type)
+ except Exception as e:
+ raise self.api_error(status.HTTP_400_BAD_REQUEST, str(e), 'Requested task is already running')
+
+ return JsonResponse({"status": success_status})
@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
@@ -1640,6 +1658,7 @@ def post(self, request, course_key_string):
task_api.submit_cohort_students(request, course_key, file_name)
except (FileValidationException, ValueError) as e:
raise self.api_error(status.HTTP_400_BAD_REQUEST, str(e), 'failed-validation')
+
return Response(status=status.HTTP_204_NO_CONTENT)
@@ -3250,26 +3269,31 @@ def post(self, request, course_id):
return JsonResponse(response_payload)
-@transaction.non_atomic_requests
-@ensure_csrf_cookie
-@cache_control(no_cache=True, no_store=True, must_revalidate=True)
-@require_course_permission(permissions.START_CERTIFICATE_GENERATION)
-@require_POST
-@common_exceptions_400
-def start_certificate_generation(request, course_id):
+@method_decorator(cache_control(no_cache=True, no_store=True, must_revalidate=True), name='dispatch')
+@method_decorator(transaction.non_atomic_requests, name='dispatch')
+class StartCertificateGeneration(DeveloperErrorViewMixin, APIView):
"""
Start generating certificates for all students enrolled in given course.
"""
- course_key = CourseKey.from_string(course_id)
- task = task_api.generate_certificates_for_students(request, course_key)
- message = _('Certificate generation task for all students of this course has been started. '
- 'You can view the status of the generation task in the "Pending Tasks" section.')
- response_payload = {
- 'message': message,
- 'task_id': task.task_id
- }
+ permission_classes = (IsAuthenticated, permissions.InstructorPermission)
+ permission_name = permissions.START_CERTIFICATE_GENERATION
- return JsonResponse(response_payload)
+ @method_decorator(ensure_csrf_cookie)
+ @method_decorator(transaction.non_atomic_requests)
+ def post(self, request, course_id):
+ """
+ Generating certificates for all students enrolled in given course.
+ """
+ course_key = CourseKey.from_string(course_id)
+ task = task_api.generate_certificates_for_students(request, course_key)
+ message = _('Certificate generation task for all students of this course has been started. '
+ 'You can view the status of the generation task in the "Pending Tasks" section.')
+ response_payload = {
+ 'message': message,
+ 'task_id': task.task_id
+ }
+
+ return JsonResponse(response_payload)
@transaction.non_atomic_requests
diff --git a/lms/djangoapps/instructor/views/api_urls.py b/lms/djangoapps/instructor/views/api_urls.py
index 61de4fd4a267..c68468bd8345 100644
--- a/lms/djangoapps/instructor/views/api_urls.py
+++ b/lms/djangoapps/instructor/views/api_urls.py
@@ -27,8 +27,8 @@
path('modify_access', api.ModifyAccess.as_view(), name='modify_access'),
path('bulk_beta_modify_access', api.bulk_beta_modify_access, name='bulk_beta_modify_access'),
path('get_problem_responses', api.get_problem_responses, name='get_problem_responses'),
+ re_path(r'^get_students_features(?P/csv)?$', api.GetStudentsFeatures.as_view(), name='get_students_features'),
path('get_grading_config', api.GetGradingConfig.as_view(), name='get_grading_config'),
- re_path(r'^get_students_features(?P/csv)?$', api.get_students_features, name='get_students_features'),
path('get_issued_certificates/', api.get_issued_certificates, name='get_issued_certificates'),
path('get_students_who_may_enroll', api.GetStudentsWhoMayEnroll.as_view(), name='get_students_who_may_enroll'),
path('get_anon_ids', api.GetAnonIds.as_view(), name='get_anon_ids'),
@@ -82,7 +82,7 @@
# Certificates
path('enable_certificate_generation', api.enable_certificate_generation, name='enable_certificate_generation'),
- path('start_certificate_generation', api.start_certificate_generation, name='start_certificate_generation'),
+ path('start_certificate_generation', api.StartCertificateGeneration.as_view(), name='start_certificate_generation'),
path('start_certificate_regeneration', api.start_certificate_regeneration, name='start_certificate_regeneration'),
path('certificate_exception_view/', api.certificate_exception_view, name='certificate_exception_view'),
re_path(r'^generate_certificate_exceptions/(?P[^/]*)', api.generate_certificate_exceptions,
diff --git a/lms/djangoapps/learner_home/serializers.py b/lms/djangoapps/learner_home/serializers.py
index 3d156f3640ca..c464e0c6a443 100644
--- a/lms/djangoapps/learner_home/serializers.py
+++ b/lms/djangoapps/learner_home/serializers.py
@@ -299,23 +299,20 @@ def get_cert_info(self, enrollment):
def get_availableDate(self, enrollment):
"""Available date changes based off of Certificate display behavior"""
course_overview = enrollment.course_overview
- available_date = course_overview.certificate_available_date
-
- if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False):
- if (
- course_overview.certificates_display_behavior
- == CertificatesDisplayBehaviors.END_WITH_DATE
- and course_overview.certificate_available_date
- ):
- available_date = course_overview.certificate_available_date
- elif (
- course_overview.certificates_display_behavior
- == CertificatesDisplayBehaviors.END
- and course_overview.end
- ):
- available_date = course_overview.end
- else:
+ available_date = None
+
+ if (
+ course_overview.certificates_display_behavior
+ == CertificatesDisplayBehaviors.END_WITH_DATE
+ and course_overview.certificate_available_date
+ ):
available_date = course_overview.certificate_available_date
+ elif (
+ course_overview.certificates_display_behavior
+ == CertificatesDisplayBehaviors.END
+ and course_overview.end
+ ):
+ available_date = course_overview.end
return serializers.DateTimeField().to_representation(available_date)
diff --git a/lms/djangoapps/learner_home/test_serializers.py b/lms/djangoapps/learner_home/test_serializers.py
index ac11a8b2990d..e7d22d5e71e2 100644
--- a/lms/djangoapps/learner_home/test_serializers.py
+++ b/lms/djangoapps/learner_home/test_serializers.py
@@ -522,9 +522,12 @@ def test_with_data(self):
# ... with a certificate
input_context = self.create_test_context(input_data.course)
- # ... and some data preemptively gathered
+ # ... and some data preemptively gathered, including a certificate display behavior
available_date = random_date()
input_data.course.certificate_available_date = available_date
+ input_data.course.certificates_display_behavior = (
+ CertificatesDisplayBehaviors.END_WITH_DATE
+ )
cert_url = input_context["cert_statuses"][input_data.course.id][
"cert_web_view_url"
]
@@ -544,23 +547,6 @@ def test_with_data(self):
},
)
- @mock.patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=False)
- def test_available_date_old_format(self):
- # Given new cert display settings are not enabled
- input_data = self.create_test_enrollment(course_mode=CourseMode.VERIFIED)
- input_data.course.certificate_available_date = random_date()
- input_context = self.create_test_context(input_data.course)
-
- # When I get certificate info
- output_data = CertificateSerializer(input_data, context=input_context).data
-
- # Then the available date is defaulted to the certificate available date
- expected_available_date = datetime_to_django_format(
- input_data.course.certificate_available_date
- )
- self.assertEqual(output_data["availableDate"], expected_available_date)
-
- @mock.patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
def test_available_date_course_end(self):
# Given new cert display settings are enabled
input_data = self.create_test_enrollment(course_mode=CourseMode.VERIFIED)
@@ -578,7 +564,6 @@ def test_available_date_course_end(self):
expected_available_date = datetime_to_django_format(input_data.course.end)
self.assertEqual(output_data["availableDate"], expected_available_date)
- @mock.patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
def test_available_date_specific_end(self):
# Given new cert display settings are enabled
input_data = self.create_test_enrollment(course_mode=CourseMode.VERIFIED)
diff --git a/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py b/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py
index 3a08ede0aaf6..4c45f415cf63 100644
--- a/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/approve_id_verifications.py
@@ -10,9 +10,11 @@
from django.core.management.base import BaseCommand, CommandError
+from common.djangoapps.student.models_api import get_name, get_pending_name_change
from lms.djangoapps.verify_student.api import send_approval_email
from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
from lms.djangoapps.verify_student.utils import earliest_allowed_verification_date
+from openedx.features.name_affirmation_api.utils import get_name_affirmation_service
log = logging.getLogger(__name__)
@@ -149,5 +151,37 @@ def _approve_id_verifications(self, user_ids):
for verification in existing_id_verifications:
verification.approve(service='idv_verifications command')
send_approval_email(verification)
+ self._approve_verified_name_for_software_secure_verification(verification)
return list(failed_user_ids)
+
+ def _approve_verified_name_for_software_secure_verification(self, verification):
+ """
+ This method manually creates a verified name given a SoftwareSecurePhotoVerification object.
+ """
+
+ name_affirmation_service = get_name_affirmation_service()
+
+ if name_affirmation_service:
+ from edx_name_affirmation.exceptions import VerifiedNameDoesNotExist # pylint: disable=import-error
+
+ pending_name_change = get_pending_name_change(verification.user)
+ if pending_name_change:
+ full_name = pending_name_change.new_name
+ else:
+ full_name = get_name(verification.user.id)
+
+ try:
+ name_affirmation_service.update_verified_name_status(
+ verification.user,
+ 'approved',
+ verification_attempt_id=verification.id
+ )
+ except VerifiedNameDoesNotExist:
+ name_affirmation_service.create_verified_name(
+ verification.user,
+ verification.name,
+ full_name,
+ verification_attempt_id=verification.id,
+ status='approved',
+ )
diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py b/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py
index e6e580c1d1a6..6eccee194795 100644
--- a/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py
+++ b/lms/djangoapps/verify_student/management/commands/tests/test_approve_id_verifications.py
@@ -6,6 +6,8 @@
import logging
import os
import tempfile
+from unittest import skipUnless
+from unittest.mock import MagicMock, patch
import pytest
from django.core import mail
@@ -15,9 +17,12 @@
from common.djangoapps.student.tests.factories import UserFactory, UserProfileFactory
from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
+from openedx.features.name_affirmation_api.utils import get_name_affirmation_service
LOGGER_NAME = 'lms.djangoapps.verify_student.management.commands.approve_id_verifications'
+name_affirmation_service = get_name_affirmation_service()
+
@ddt.ddt
class TestApproveIDVerificationsCommand(TestCase):
@@ -158,3 +163,57 @@ def test_invalid_file_path(self):
"""
with pytest.raises(CommandError):
call_command('approve_id_verifications', 'invalid/user_id/file/path')
+
+ @skipUnless(name_affirmation_service is not None, 'Requires Name Affirmation')
+ @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_name_affirmation_service')
+ def test_create_verified_names(self, mock_get_service):
+ mock_service = MagicMock()
+ mock_get_service.return_value = mock_service
+
+ verification = SoftwareSecurePhotoVerification.objects.create(
+ user=self.user1_profile.user,
+ name=self.user1_profile.name,
+ status='submitted',
+ )
+
+ call_command('approve_id_verifications', self.tmp_file_path)
+ mock_service.update_verified_name_status.assert_called_with(
+ self.user1_profile.user,
+ 'approved',
+ verification_attempt_id=verification.id,
+ )
+
+ @skipUnless(name_affirmation_service is not None, 'Requires Name Affirmation')
+ @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_name')
+ @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_pending_name_change')
+ @patch('lms.djangoapps.verify_student.management.commands.approve_id_verifications.get_name_affirmation_service')
+ @ddt.data(
+ '',
+ MagicMock(new_name='test')
+ )
+ def test_create_update_verified_names(self, pending_name, mock_get_service, mock_get_pending, mock_get_name):
+ from edx_name_affirmation.exceptions import VerifiedNameDoesNotExist # pylint: disable=import-error
+
+ mock_service = MagicMock()
+ mock_get_service.return_value = mock_service
+ mock_service.update_verified_name_status.side_effect = VerifiedNameDoesNotExist()
+
+ mock_get_pending.return_value = pending_name
+ mock_get_name.return_value = self.user1_profile.name
+
+ verification = SoftwareSecurePhotoVerification.objects.create(
+ user=self.user1_profile.user,
+ name=self.user1_profile.name,
+ status='submitted',
+ )
+
+ expected_name = 'test' if pending_name else self.user1_profile.name
+
+ call_command('approve_id_verifications', self.tmp_file_path)
+ mock_service.create_verified_name.assert_called_with(
+ verification.user,
+ verification.name,
+ expected_name,
+ verification_attempt_id=verification.id,
+ status='approved',
+ )
diff --git a/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py b/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py
index 891ff9fda5d8..d9f356758dd8 100644
--- a/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py
+++ b/lms/djangoapps/verify_student/management/commands/tests/test_backfill_sso_verifications_for_old_account_links.py
@@ -54,7 +54,7 @@ def test_performance(self):
#self.assertNumQueries(100)
def test_signal_called(self):
- with patch('openedx_events.learning.signals.IDV_ATTEMPT_APPROVED.send_event') as mock_signal:
+ with patch('openedx.core.djangoapps.signals.signals.LEARNER_SSO_VERIFIED.send_robust') as mock_signal:
call_command('backfill_sso_verifications_for_old_account_links', '--provider-slug', self.provider.provider_id) # lint-amnesty, pylint: disable=line-too-long
assert mock_signal.call_count == 1
diff --git a/lms/djangoapps/verify_student/models.py b/lms/djangoapps/verify_student/models.py
index 9a0ac369640a..7d055ffc70ab 100644
--- a/lms/djangoapps/verify_student/models.py
+++ b/lms/djangoapps/verify_student/models.py
@@ -44,9 +44,8 @@
rsa_decrypt,
rsa_encrypt
)
+from openedx.core.djangoapps.signals.signals import LEARNER_SSO_VERIFIED, PHOTO_VERIFICATION_APPROVED
from openedx.core.storage import get_storage
-from openedx_events.learning.signals import IDV_ATTEMPT_APPROVED
-from openedx_events.learning.data import UserData, VerificationAttemptData
from .utils import auto_verify_for_testing_enabled, earliest_allowed_verification_date, submit_request_to_ss
@@ -251,23 +250,13 @@ def send_approval_signal(self, approved_by='None'):
user_id=self.user, reviewer=approved_by
))
- # Emit event to find and generate eligible certificates
- verification_data = VerificationAttemptData(
- attempt_id=self.id,
- user=UserData(
- pii=None,
- id=self.user.id,
- is_active=self.user.is_active,
- ),
- status=self.status,
- name=self.name,
- expiration_date=self.expiration_datetime,
- )
- IDV_ATTEMPT_APPROVED.send_event(
- idv_attempt=verification_data,
+ # Emit signal to find and generate eligible certificates
+ LEARNER_SSO_VERIFIED.send_robust(
+ sender=PhotoVerification,
+ user=self.user,
)
- message = 'IDV_ATTEMPT_APPROVED signal fired for {user} from SSOVerification'
+ message = 'LEARNER_SSO_VERIFIED signal fired for {user} from SSOVerification'
log.info(message.format(user=self.user.username))
@@ -465,23 +454,13 @@ def approve(self, user_id=None, service=""):
)
self.save()
- # Emit event to find and generate eligible certificates
- verification_data = VerificationAttemptData(
- attempt_id=self.id,
- user=UserData(
- pii=None,
- id=self.user.id,
- is_active=self.user.is_active,
- ),
- status=self.status,
- name=self.name,
- expiration_date=self.expiration_datetime,
- )
- IDV_ATTEMPT_APPROVED.send_event(
- idv_attempt=verification_data,
+ # Emit signal to find and generate eligible certificates
+ PHOTO_VERIFICATION_APPROVED.send_robust(
+ sender=PhotoVerification,
+ user=self.user,
)
- message = 'IDV_ATTEMPT_APPROVED signal fired for {user} from PhotoVerification'
+ message = 'PHOTO_VERIFICATION_APPROVED signal fired for {user} from PhotoVerification'
log.info(message.format(user=self.user.username))
@status_before_must_be("ready", "must_retry")
@@ -1250,6 +1229,22 @@ def should_display_status_to_user(self):
"""When called, returns true or false based on the type of VerificationAttempt"""
return not self.hide_status_from_user
+ def active_at_datetime(self, deadline):
+ """Check whether the verification was active at a particular datetime.
+
+ Arguments:
+ deadline (datetime): The date at which the verification was active
+ (created before and expiration datetime is after today).
+
+ Returns:
+ bool
+
+ """
+ return (
+ self.created_at <= deadline and
+ (self.expiration_datetime is None or self.expiration_datetime > now())
+ )
+
@classmethod
def retire_user(cls, user_id):
"""
diff --git a/lms/djangoapps/verify_student/services.py b/lms/djangoapps/verify_student/services.py
index bee016de7740..95dbccf0d59d 100644
--- a/lms/djangoapps/verify_student/services.py
+++ b/lms/djangoapps/verify_student/services.py
@@ -176,10 +176,20 @@ def user_status(cls, user):
if verifications:
attempt = verifications[0]
for verification in verifications:
- if verification.expiration_datetime > now() and verification.status == 'approved':
- # Always select the LATEST non-expired approved verification if there is such
- if attempt.status != 'approved' or (
- attempt.expiration_datetime < verification.expiration_datetime
+ # If a verification has no expiration_datetime, it's implied that it never expires, so we should still
+ # consider verifications in the approved state that have no expiration date.
+ if (
+ not verification.expiration_datetime or
+ verification.expiration_datetime > now()
+ ) and verification.status == 'approved':
+ # Always select the LATEST non-expired approved verification if there is such.
+ if (
+ attempt.status != 'approved' or
+ (
+ attempt.expiration_datetime and
+ verification.expiration_datetime and
+ attempt.expiration_datetime < verification.expiration_datetime
+ )
):
attempt = verification
@@ -188,7 +198,7 @@ def user_status(cls, user):
user_status['should_display'] = attempt.should_display_status_to_user()
- if attempt.expiration_datetime < now() and attempt.status == 'approved':
+ if attempt.expiration_datetime and attempt.expiration_datetime < now() and attempt.status == 'approved':
if user_status['should_display']:
user_status['status'] = 'expired'
user_status['error'] = _("Your {platform_name} verification has expired.").format(
diff --git a/lms/djangoapps/verify_student/tests/__init__.py b/lms/djangoapps/verify_student/tests/__init__.py
index cea71e52c37d..015cd354aba7 100644
--- a/lms/djangoapps/verify_student/tests/__init__.py
+++ b/lms/djangoapps/verify_student/tests/__init__.py
@@ -9,7 +9,7 @@
from django.utils.timezone import now
from common.djangoapps.student.tests.factories import UserFactory
-from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification
+from lms.djangoapps.verify_student.models import SoftwareSecurePhotoVerification, VerificationAttempt
class TestVerificationBase(TestCase):
@@ -52,11 +52,14 @@ def verification_active_at_datetime(self, attempt):
# Active immediately before expiration date
expiration = attempt.expiration_datetime
- before_expiration = expiration - timedelta(seconds=1)
- assert attempt.active_at_datetime(before_expiration)
+ if expiration:
+ before_expiration = expiration - timedelta(seconds=1)
+ assert attempt.active_at_datetime(before_expiration)
# Not active after the expiration date
- attempt.expiration_date = now() - timedelta(days=1)
+ field = 'expiration_datetime' if isinstance(attempt, VerificationAttempt) else 'expiration_date'
+ setattr(attempt, field, now() - timedelta(days=1))
+ # attempt.expiration_date = now() - timedelta(days=1)
attempt.save()
assert not attempt.active_at_datetime(now())
diff --git a/lms/djangoapps/verify_student/tests/test_models.py b/lms/djangoapps/verify_student/tests/test_models.py
index 9ea45463011d..dfea8081e4d4 100644
--- a/lms/djangoapps/verify_student/tests/test_models.py
+++ b/lms/djangoapps/verify_student/tests/test_models.py
@@ -20,6 +20,7 @@
PhotoVerification,
SoftwareSecurePhotoVerification,
SSOVerification,
+ VerificationAttempt,
VerificationException
)
from lms.djangoapps.verify_student.tests import TestVerificationBase
@@ -437,3 +438,14 @@ def test_active_at_datetime(self):
user = UserFactory.create()
verification = ManualVerification.objects.create(user=user)
self.verification_active_at_datetime(verification)
+
+
+class VerificationAttemptTest(TestVerificationBase):
+ """
+ Tests for the VerificationAttempt model
+ """
+
+ def test_active_at_datetime(self):
+ user = UserFactory.create()
+ attempt = VerificationAttempt.objects.create(user=user)
+ self.verification_active_at_datetime(attempt)
diff --git a/lms/djangoapps/verify_student/tests/test_services.py b/lms/djangoapps/verify_student/tests/test_services.py
index 5b6d740a1ba0..4bfa8c27d5b3 100644
--- a/lms/djangoapps/verify_student/tests/test_services.py
+++ b/lms/djangoapps/verify_student/tests/test_services.py
@@ -2,6 +2,7 @@
Tests for the service classes in verify_student.
"""
+import itertools
from datetime import datetime, timedelta, timezone
from unittest.mock import patch
@@ -273,6 +274,29 @@ def test_denied_software_secure_verification(self):
}
self.assertDictEqual(status, expected_status)
+ def test_approved_verification_attempt_verification(self):
+ with freeze_time('2015-01-02'):
+ # test for when Verification Attempt verification has been created
+ VerificationAttempt.objects.create(user=self.user, status='approved')
+ status = IDVerificationService.user_status(self.user)
+ expected_status = {'status': 'approved', 'error': '', 'should_display': True, 'verification_expiry': '',
+ 'status_date': datetime.now(utc)}
+ self.assertDictEqual(status, expected_status)
+
+ def test_denied_verification_attempt_verification(self):
+ with freeze_time('2015-2-02'):
+ # create denied photo verification for the user, make sure the denial
+ # is handled properly
+ VerificationAttempt.objects.create(
+ user=self.user, status='denied'
+ )
+ status = IDVerificationService.user_status(self.user)
+ expected_status = {
+ 'status': 'must_reverify', 'error': '',
+ 'should_display': True, 'verification_expiry': '', 'status_date': '',
+ }
+ self.assertDictEqual(status, expected_status)
+
def test_approved_sso_verification(self):
with freeze_time('2015-03-02'):
# test for when sso verification has been created
@@ -303,22 +327,19 @@ def test_manual_verification(self):
'status_date': datetime.now(utc)}
self.assertDictEqual(status, expected_status)
- @ddt.data(
- 'submitted',
- 'denied',
- 'approved',
- 'created',
- 'ready',
- 'must_retry'
+ @ddt.idata(itertools.product(
+ [SoftwareSecurePhotoVerification, VerificationAttempt],
+ ['submitted', 'denied', 'approved', 'created', 'ready', 'must_retry'])
)
- def test_expiring_software_secure_verification(self, new_status):
+ def test_expiring_software_secure_verification(self, value):
+ verification_model, new_status = value
with freeze_time('2015-07-11') as frozen_datetime:
# create approved photo verification for the user
- SoftwareSecurePhotoVerification.objects.create(user=self.user, status='approved')
+ verification_model.objects.create(user=self.user, status='approved')
expiring_datetime = datetime.now(utc)
frozen_datetime.move_to('2015-07-14')
# create another according to status passed in.
- SoftwareSecurePhotoVerification.objects.create(user=self.user, status=new_status)
+ verification_model.objects.create(user=self.user, status=new_status)
status_date = expiring_datetime
if new_status == 'approved':
status_date = datetime.now(utc)
@@ -327,13 +348,16 @@ def test_expiring_software_secure_verification(self, new_status):
status = IDVerificationService.user_status(self.user)
self.assertDictEqual(status, expected_status)
- def test_expired_verification(self):
+ @ddt.data(SoftwareSecurePhotoVerification, VerificationAttempt)
+ def test_expired_verification(self, verification_model):
with freeze_time('2015-07-11') as frozen_datetime:
- # create approved photo verification for the user
- SoftwareSecurePhotoVerification.objects.create(
+ key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+
+ # create approved verification for the user
+ verification_model.objects.create(
user=self.user,
status='approved',
- expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+ **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
)
frozen_datetime.move_to('2016-07-11')
expected_status = {
@@ -348,28 +372,28 @@ def test_expired_verification(self):
status = IDVerificationService.user_status(self.user)
self.assertDictEqual(status, expected_status)
- @ddt.data(
- 'submitted',
- 'denied',
- 'approved',
- 'created',
- 'ready',
- 'must_retry'
+ @ddt.idata(itertools.product(
+ [SoftwareSecurePhotoVerification, VerificationAttempt],
+ ['submitted', 'denied', 'approved', 'created', 'ready', 'must_retry'])
)
- def test_reverify_after_expired(self, new_status):
+ def test_reverify_after_expired(self, value):
+ verification_model, new_status = value
with freeze_time('2015-07-11') as frozen_datetime:
- # create approved photo verification for the user
- SoftwareSecurePhotoVerification.objects.create(
+ key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+
+ # create approved verification for the user
+ verification_model.objects.create(
user=self.user,
status='approved',
- expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+ **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
)
+
frozen_datetime.move_to('2016-07-12')
# create another according to status passed in.
- SoftwareSecurePhotoVerification.objects.create(
+ verification_model.objects.create(
user=self.user,
status=new_status,
- expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+ **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
)
check_status = new_status
@@ -390,9 +414,10 @@ def test_reverify_after_expired(self, new_status):
@ddt.data(
SSOVerification,
- ManualVerification
+ ManualVerification,
+ VerificationAttempt
)
- def test_override_verification(self, verification_type):
+ def test_override_verification(self, verification_model):
with freeze_time('2015-07-11') as frozen_datetime:
# create approved photo verification for the user
SoftwareSecurePhotoVerification.objects.create(
@@ -401,19 +426,27 @@ def test_override_verification(self, verification_type):
expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
)
frozen_datetime.move_to('2015-07-14')
- verification_type.objects.create(
+
+ key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+ verification_model.objects.create(
user=self.user,
status='approved',
- expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+ **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
)
expected_status = {
- 'status': 'approved', 'error': '', 'should_display': False,
+ 'status': 'approved', 'error': '',
+ 'should_display': verification_model == VerificationAttempt,
'verification_expiry': '', 'status_date': now()
}
status = IDVerificationService.user_status(self.user)
self.assertDictEqual(status, expected_status)
- def test_denied_after_approved_verification(self):
+ @ddt.data(
+ SSOVerification,
+ ManualVerification,
+ VerificationAttempt
+ )
+ def test_denied_after_approved_verification(self, verification_model):
with freeze_time('2015-07-11') as frozen_datetime:
# create approved photo verification for the user
SoftwareSecurePhotoVerification.objects.create(
@@ -423,10 +456,12 @@ def test_denied_after_approved_verification(self):
)
expected_date = now()
frozen_datetime.move_to('2015-07-14')
- SoftwareSecurePhotoVerification.objects.create(
+
+ key = 'expiration_datetime' if verification_model == VerificationAttempt else 'expiration_date'
+ verification_model.objects.create(
user=self.user,
status='denied',
- expiration_date=now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])
+ **{key: now() + timedelta(days=settings.VERIFY_STUDENT["DAYS_GOOD_FOR"])},
)
expected_status = {
'status': 'approved', 'error': '', 'should_display': True,
diff --git a/lms/envs/common.py b/lms/envs/common.py
index f2bcfa822b6e..df8878f26914 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -949,17 +949,6 @@
# .. toggle_tickets: 'https://openedx.atlassian.net/browse/OSPR-5290'
'ENABLE_BULK_USER_RETIREMENT': False,
- # .. toggle_name: FEATURES['ENABLE_V2_CERT_DISPLAY_SETTINGS']
- # .. toggle_implementation: DjangoSetting
- # .. toggle_default: False
- # .. toggle_description: Whether to use the reimagined certificates_display_behavior and certificate_available_date
- # .. settings. Will eventually become the default.
- # .. toggle_use_cases: temporary
- # .. toggle_creation_date: 2021-07-26
- # .. toggle_target_removal_date: 2021-10-01
- # .. toggle_tickets: 'https://openedx.atlassian.net/browse/MICROBA-1405'
- 'ENABLE_V2_CERT_DISPLAY_SETTINGS': False,
-
# .. toggle_name: FEATURES['ENABLE_INTEGRITY_SIGNATURE']
# .. toggle_implementation: DjangoSetting
# .. toggle_default: False
diff --git a/lms/templates/dashboard/_dashboard_certificate_information.html b/lms/templates/dashboard/_dashboard_certificate_information.html
index 5f3436a7f718..5e8225bdcb8b 100644
--- a/lms/templates/dashboard/_dashboard_certificate_information.html
+++ b/lms/templates/dashboard/_dashboard_certificate_information.html
@@ -44,14 +44,11 @@
<%
- if settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False):
- certificate_available_date_string = ""
- if course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE and course_overview.certificate_available_date:
- certificate_available_date_string = course_overview.certificate_available_date.strftime('%Y-%m-%dT%H:%M:%S%z')
- elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END and course_overview.end:
- certificate_available_date_string = course_overview.end.strftime('%Y-%m-%dT%H:%M:%S%z')
- else:
+ certificate_available_date_string = ""
+ if course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END_WITH_DATE and course_overview.certificate_available_date:
certificate_available_date_string = course_overview.certificate_available_date.strftime('%Y-%m-%dT%H:%M:%S%z')
+ elif course_overview.certificates_display_behavior == CertificatesDisplayBehaviors.END and course_overview.end:
+ certificate_available_date_string = course_overview.end.strftime('%Y-%m-%dT%H:%M:%S%z')
container_string = _("Your grade and certificate will be ready after {date}.")
format = 'shortDate'
%>
diff --git a/lms/templates/xblock_v2/xblock_iframe.html b/lms/templates/xblock_v2/xblock_iframe.html
deleted file mode 120000
index 7264c253466d..000000000000
--- a/lms/templates/xblock_v2/xblock_iframe.html
+++ /dev/null
@@ -1 +0,0 @@
-../../../cms/templates/content_libraries/xblock_iframe.html
\ No newline at end of file
diff --git a/openedx/core/djangoapps/content_libraries/library_context.py b/openedx/core/djangoapps/content_libraries/library_context.py
index 6ff426e73560..4bda10eb12fa 100644
--- a/openedx/core/djangoapps/content_libraries/library_context.py
+++ b/openedx/core/djangoapps/content_libraries/library_context.py
@@ -1,19 +1,21 @@
"""
Definition of "Library" as a learning context.
"""
-
import logging
from django.core.exceptions import PermissionDenied
+from rest_framework.exceptions import NotFound
from openedx_events.content_authoring.data import LibraryBlockData
from openedx_events.content_authoring.signals import LIBRARY_BLOCK_UPDATED
+from opaque_keys.edx.keys import UsageKeyV2
+from opaque_keys.edx.locator import LibraryUsageLocatorV2, LibraryLocatorV2
+from openedx_learning.api import authoring as authoring_api
from openedx.core.djangoapps.content_libraries import api, permissions
from openedx.core.djangoapps.content_libraries.models import ContentLibrary
from openedx.core.djangoapps.xblock.api import LearningContext
-
-from openedx_learning.api import authoring as authoring_api
+from openedx.core.types import User as UserType
log = logging.getLogger(__name__)
@@ -30,47 +32,51 @@ def __init__(self, **kwargs):
super().__init__(**kwargs)
self.use_draft = kwargs.get('use_draft', None)
- def can_edit_block(self, user, usage_key):
+ def can_edit_block(self, user: UserType, usage_key: UsageKeyV2) -> bool:
"""
- Does the specified usage key exist in its context, and if so, does the
- specified user have permission to edit it (make changes to the authored
- data store)?
-
- user: a Django User object (may be an AnonymousUser)
+ Assuming a block with the specified ID (usage_key) exists, does the
+ specified user have permission to edit it (make changes to the
+ fields / authored data store)?
- usage_key: the UsageKeyV2 subclass used for this learning context
+ May raise ContentLibraryNotFound if the library does not exist.
+ """
+ assert isinstance(usage_key, LibraryUsageLocatorV2)
+ return self._check_perm(user, usage_key.lib_key, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY)
- Must return a boolean.
+ def can_view_block_for_editing(self, user: UserType, usage_key: UsageKeyV2) -> bool:
"""
- try:
- api.require_permission_for_library_key(usage_key.lib_key, user, permissions.CAN_EDIT_THIS_CONTENT_LIBRARY)
- except (PermissionDenied, api.ContentLibraryNotFound):
- return False
+ Assuming a block with the specified ID (usage_key) exists, does the
+ specified user have permission to view its fields and OLX details (but
+ not necessarily to make changes to it)?
- return self.block_exists(usage_key)
+ May raise ContentLibraryNotFound if the library does not exist.
+ """
+ assert isinstance(usage_key, LibraryUsageLocatorV2)
+ return self._check_perm(user, usage_key.lib_key, permissions.CAN_VIEW_THIS_CONTENT_LIBRARY)
- def can_view_block(self, user, usage_key):
+ def can_view_block(self, user: UserType, usage_key: UsageKeyV2) -> bool:
"""
Does the specified usage key exist in its context, and if so, does the
specified user have permission to view it and interact with it (call
handlers, save user state, etc.)?
- user: a Django User object (may be an AnonymousUser)
-
- usage_key: the UsageKeyV2 subclass used for this learning context
-
- Must return a boolean.
+ May raise ContentLibraryNotFound if the library does not exist.
"""
+ assert isinstance(usage_key, LibraryUsageLocatorV2)
+ return self._check_perm(user, usage_key.lib_key, permissions.CAN_LEARN_FROM_THIS_CONTENT_LIBRARY)
+
+ def _check_perm(self, user: UserType, lib_key: LibraryLocatorV2, perm) -> bool:
+ """ Helper method to check a permission for the various can_ methods"""
try:
- api.require_permission_for_library_key(
- usage_key.lib_key, user, permissions.CAN_LEARN_FROM_THIS_CONTENT_LIBRARY,
- )
- except (PermissionDenied, api.ContentLibraryNotFound):
+ api.require_permission_for_library_key(lib_key, user, perm)
+ return True
+ except PermissionDenied:
return False
+ except api.ContentLibraryNotFound as exc:
+ # A 404 is probably what you want in this case, not a 500 error, so do that by default.
+ raise NotFound(f"Content Library '{lib_key}' does not exist") from exc
- return self.block_exists(usage_key)
-
- def block_exists(self, usage_key):
+ def block_exists(self, usage_key: LibraryUsageLocatorV2):
"""
Does the block for this usage_key exist in this Library?
@@ -82,7 +88,7 @@ def block_exists(self, usage_key):
version of it.
"""
try:
- content_lib = ContentLibrary.objects.get_by_key(usage_key.context_key)
+ content_lib = ContentLibrary.objects.get_by_key(usage_key.context_key) # type: ignore[attr-defined]
except ContentLibrary.DoesNotExist:
return False
@@ -97,12 +103,11 @@ def block_exists(self, usage_key):
local_key=usage_key.block_id,
)
- def send_block_updated_event(self, usage_key):
+ def send_block_updated_event(self, usage_key: UsageKeyV2):
"""
Send a "block updated" event for the library block with the given usage_key.
-
- usage_key: the UsageKeyV2 subclass used for this learning context
"""
+ assert isinstance(usage_key, LibraryUsageLocatorV2)
LIBRARY_BLOCK_UPDATED.send_event(
library_block=LibraryBlockData(
library_key=usage_key.lib_key,
diff --git a/openedx/core/djangoapps/content_libraries/permissions.py b/openedx/core/djangoapps/content_libraries/permissions.py
index c7da012c9fb4..17671b5659f8 100644
--- a/openedx/core/djangoapps/content_libraries/permissions.py
+++ b/openedx/core/djangoapps/content_libraries/permissions.py
@@ -2,7 +2,8 @@
Permissions for Content Libraries (v2, Learning-Core-based)
"""
from bridgekeeper import perms, rules
-from bridgekeeper.rules import Attribute, ManyRelation, Relation, in_current_groups
+from bridgekeeper.rules import Attribute, ManyRelation, Relation, blanket_rule, in_current_groups
+from django.conf import settings
from openedx.core.djangoapps.content_libraries.models import ContentLibraryPermission
@@ -41,6 +42,12 @@
)
+# Are we in Studio? (Is there a better or more contextual way to define this, e.g. get from learning context?)
+@blanket_rule
+def is_studio_request(_):
+ return settings.SERVICE_VARIANT == "cms"
+
+
########################### Permissions ###########################
# Is the user allowed to view XBlocks from the specified content library
@@ -51,10 +58,12 @@
perms[CAN_LEARN_FROM_THIS_CONTENT_LIBRARY] = (
# Global staff can learn from any library:
is_global_staff |
- # Regular users can learn if the library allows public learning:
+ # Regular and even anonymous users can learn if the library allows public learning:
Attribute('allow_public_learning', True) |
# Users/groups who are explicitly granted permission can learn from the library:
- (is_user_active & has_explicit_read_permission_for_library)
+ (is_user_active & has_explicit_read_permission_for_library) |
+ # Or, in Studio (but not the LMS) any users can access libraries with "public read" permissions:
+ (is_studio_request & is_user_active & Attribute('allow_public_read', True))
)
# Is the user allowed to create content libraries?
diff --git a/openedx/core/djangoapps/content_libraries/tests/base.py b/openedx/core/djangoapps/content_libraries/tests/base.py
index 987133255f58..0ed47f995f50 100644
--- a/openedx/core/djangoapps/content_libraries/tests/base.py
+++ b/openedx/core/djangoapps/content_libraries/tests/base.py
@@ -308,3 +308,12 @@ def _get_block_handler_url(self, block_key, handler_name):
"""
url = URL_BLOCK_GET_HANDLER_URL.format(block_key=block_key, handler_name=handler_name)
return self._api('get', url, None, expect_response=200)["handler_url"]
+
+ def _get_library_block_fields(self, block_key, expect_response=200):
+ """ Get the fields of a specific block in the library. This API is only used by the MFE editors. """
+ result = self._api('get', URL_BLOCK_FIELDS_URL.format(block_key=block_key), None, expect_response)
+ return result
+
+ def _set_library_block_fields(self, block_key, new_fields, expect_response=200):
+ """ Set the fields of a specific block in the library. This API is only used by the MFE editors. """
+ return self._api('post', URL_BLOCK_FIELDS_URL.format(block_key=block_key), new_fields, expect_response)
diff --git a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
index d995a2c79683..56e258f8a1f1 100644
--- a/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
+++ b/openedx/core/djangoapps/content_libraries/tests/test_content_libraries.py
@@ -502,6 +502,30 @@ def test_library_blocks_type_constrained(self, slug, library_type, block_type, e
# Add a 'problem' XBlock to the library:
self._add_block_to_library(lib_id, block_type, 'test-block', expect_response=expect_response)
+ def test_library_not_found(self):
+ """Test that requests fail with 404 when the library does not exist"""
+ valid_not_found_key = 'lb:valid:key:video:1'
+ response = self.client.get(URL_BLOCK_METADATA_URL.format(block_key=valid_not_found_key))
+ self.assertEqual(response.status_code, 404)
+ self.assertEqual(response.json(), {
+ 'detail': "Content Library 'lib:valid:key' does not exist",
+ })
+
+ def test_block_not_found(self):
+ """Test that requests fail with 404 when the library exists but the XBlock does not"""
+ lib = self._create_library(
+ slug="test_lib_block_event_delete",
+ title="Event Test Library",
+ description="Testing event in library"
+ )
+ library_key = LibraryLocatorV2.from_string(lib['id'])
+ non_existent_block_key = LibraryUsageLocatorV2(lib_key=library_key, block_type='video', usage_id='123')
+ response = self.client.get(URL_BLOCK_METADATA_URL.format(block_key=non_existent_block_key))
+ self.assertEqual(response.status_code, 404)
+ self.assertEqual(response.json(), {
+ 'detail': f"The component '{non_existent_block_key}' does not exist.",
+ })
+
# Test that permissions are enforced for content libraries
def test_library_permissions(self): # pylint: disable=too-many-statements
@@ -635,21 +659,27 @@ def test_library_permissions(self): # pylint: disable=too-many-statements
# A random user cannot read OLX nor assets (this library has allow_public_read False):
with self.as_user(random_user):
self._get_library_block_olx(block3_key, expect_response=403)
+ self._get_library_block_fields(block3_key, expect_response=403)
self._get_library_block_assets(block3_key, expect_response=403)
self._get_library_block_asset(block3_key, file_name="whatever.png", expect_response=403)
+ # Nor can they preview the block:
+ self._render_block_view(block3_key, view_name="student_view", expect_response=403)
# But if we grant allow_public_read, then they can:
with self.as_user(admin):
self._update_library(lib_id, allow_public_read=True)
# self._set_library_block_asset(block3_key, "whatever.png", b"data")
with self.as_user(random_user):
self._get_library_block_olx(block3_key)
+ self._render_block_view(block3_key, view_name="student_view")
+ f = self._get_library_block_fields(block3_key)
# self._get_library_block_assets(block3_key)
# self._get_library_block_asset(block3_key, file_name="whatever.png")
- # Users without authoring permission cannot edit nor delete XBlocks (this library has allow_public_read False):
+ # Users without authoring permission cannot edit nor delete XBlocks:
for user in [reader, random_user]:
with self.as_user(user):
self._set_library_block_olx(block3_key, "", expect_response=403)
+ self._set_library_block_fields(block3_key, {"data": "", "metadata": {}}, expect_response=403)
# self._set_library_block_asset(block3_key, "test.txt", b"data", expect_response=403)
self._delete_library_block(block3_key, expect_response=403)
self._commit_library_changes(lib_id, expect_response=403)
@@ -659,6 +689,7 @@ def test_library_permissions(self): # pylint: disable=too-many-statements
with self.as_user(author_group_member):
olx = self._get_library_block_olx(block3_key)
self._set_library_block_olx(block3_key, olx)
+ self._set_library_block_fields(block3_key, {"data": olx, "metadata": {}})
# self._get_library_block_assets(block3_key)
# self._set_library_block_asset(block3_key, "test.txt", b"data")
# self._get_library_block_asset(block3_key, file_name="test.txt")
@@ -1087,12 +1118,3 @@ def test_xblock_handler_invalid_key(self):
secure_token='random',
)))
self.assertEqual(response.status_code, 404)
-
- def test_not_found_fails_correctly(self):
- """Test fails with 404 when xblock key is valid but not found."""
- valid_not_found_key = 'lb:valid:key:video:1'
- response = self.client.get(URL_BLOCK_METADATA_URL.format(block_key=valid_not_found_key))
- self.assertEqual(response.status_code, 404)
- self.assertEqual(response.json(), {
- 'detail': f"XBlock {valid_not_found_key} does not exist, or you don't have permission to view it.",
- })
diff --git a/openedx/core/djangoapps/content_libraries/views.py b/openedx/core/djangoapps/content_libraries/views.py
index 835a5de1f1f2..3712af6e597f 100644
--- a/openedx/core/djangoapps/content_libraries/views.py
+++ b/openedx/core/djangoapps/content_libraries/views.py
@@ -919,7 +919,7 @@ class LtiToolLaunchView(TemplateResponseMixin, LtiToolView):
LTI platform. Other features and resouces are ignored.
"""
- template_name = 'content_libraries/xblock_iframe.html'
+ template_name = 'xblock_v2/xblock_iframe.html'
@property
def launch_data(self):
diff --git a/openedx/core/djangoapps/models/course_details.py b/openedx/core/djangoapps/models/course_details.py
index d8d5deae0110..c00d7d0b8816 100644
--- a/openedx/core/djangoapps/models/course_details.py
+++ b/openedx/core/djangoapps/models/course_details.py
@@ -371,10 +371,6 @@ def validate_certificate_settings(cls, certificate_available_date, certificates_
tuple[str, str]: updated certificate_available_date, updated certificates_display_behavior
None
"""
- # If V2 is not enable, return original values
- if not settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS", False):
- return (certificate_available_date, certificates_display_behavior)
-
# "early_no_info" will always show regardless of settings
if certificates_display_behavior == CertificatesDisplayBehaviors.EARLY_NO_INFO:
return (None, CertificatesDisplayBehaviors.EARLY_NO_INFO)
diff --git a/openedx/core/djangoapps/models/tests/test_course_details.py b/openedx/core/djangoapps/models/tests/test_course_details.py
index 86301740c7f1..41e739ecb4c8 100644
--- a/openedx/core/djangoapps/models/tests/test_course_details.py
+++ b/openedx/core/djangoapps/models/tests/test_course_details.py
@@ -8,7 +8,6 @@
import pytest
import ddt
from pytz import UTC
-from unittest.mock import patch # lint-amnesty, pylint: disable=wrong-import-order
from django.conf import settings
from xmodule.modulestore import ModuleStoreEnum
@@ -212,30 +211,7 @@ def test_fetch_video(self):
),
)
@ddt.unpack
- @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=True)
- def test_validate_certificate_settings_v2(self, stored_date, stored_behavior, expected_date, expected_behavior):
- assert CourseDetails.validate_certificate_settings(
- stored_date, stored_behavior
- ) == (expected_date, expected_behavior)
-
- @ddt.data(
- (
- EXAMPLE_CERTIFICATE_AVAILABLE_DATE,
- CertificatesDisplayBehaviors.END_WITH_DATE,
- EXAMPLE_CERTIFICATE_AVAILABLE_DATE,
- CertificatesDisplayBehaviors.END_WITH_DATE
- ),
- (
- None,
- "invalid_option",
- None,
- "invalid_option"
- ),
- )
- @ddt.unpack
- @patch.dict(settings.FEATURES, ENABLE_V2_CERT_DISPLAY_SETTINGS=False)
- def test_validate_certificate_settings_v1(self, stored_date, stored_behavior, expected_date, expected_behavior):
- """Test that method just returns passed in arguments if v2 is off"""
+ def test_validate_certificate_settings(self, stored_date, stored_behavior, expected_date, expected_behavior):
assert CourseDetails.validate_certificate_settings(
stored_date, stored_behavior
) == (expected_date, expected_behavior)
diff --git a/openedx/core/djangoapps/signals/signals.py b/openedx/core/djangoapps/signals/signals.py
index 495389152f7a..24624464ab91 100644
--- a/openedx/core/djangoapps/signals/signals.py
+++ b/openedx/core/djangoapps/signals/signals.py
@@ -36,5 +36,16 @@
# ]
COURSE_GRADE_NOW_FAILED = Signal()
+# Signal that indicates that a user has become verified via SSO for certificate purposes
+# providing_args=['user']
+LEARNER_SSO_VERIFIED = Signal()
+
+# Signal that indicates a user has been verified via verify_studnet.PhotoVerification for certificate purposes
+# Please note that this signal and the corresponding PhotoVerification model are planned for deprecation.
+# Future implementations of IDV will use the verify_student.VerificationAttempt model and corresponding
+# openedx events.
+# DEPR: https://github.com/openedx/edx-platform/issues/35128
+PHOTO_VERIFICATION_APPROVED = Signal()
+
# providing_args=['user']
USER_ACCOUNT_ACTIVATED = Signal() # Signal indicating email verification
diff --git a/openedx/core/djangoapps/xblock/api.py b/openedx/core/djangoapps/xblock/api.py
index 80a4bd57eab8..43ec3909bcd6 100644
--- a/openedx/core/djangoapps/xblock/api.py
+++ b/openedx/core/djangoapps/xblock/api.py
@@ -8,11 +8,12 @@
Studio APIs cover use cases like adding/deleting/editing blocks.
"""
# pylint: disable=unused-import
-
+from enum import Enum
from datetime import datetime
import logging
import threading
+from django.core.exceptions import PermissionDenied
from django.urls import reverse
from django.utils.translation import gettext as _
from openedx_learning.api import authoring as authoring_api
@@ -21,7 +22,7 @@
from opaque_keys.edx.locator import BundleDefinitionLocator, LibraryUsageLocatorV2
from rest_framework.exceptions import NotFound
from xblock.core import XBlock
-from xblock.exceptions import NoSuchViewError
+from xblock.exceptions import NoSuchUsage, NoSuchViewError
from xblock.plugin import PluginMissingError
from openedx.core.djangoapps.xblock.apps import get_xblock_app_config
@@ -43,6 +44,16 @@
log = logging.getLogger(__name__)
+class CheckPerm(Enum):
+ """ Options for the default permission check done by load_block() """
+ # can view the published block and call handlers etc. but not necessarily view its OLX source nor field data
+ CAN_LEARN = 1
+ # read-only studio view: can see the block (draft or published), see its OLX, see its field data, etc.
+ CAN_READ_AS_AUTHOR = 2
+ # can view everything and make changes to the block
+ CAN_EDIT = 3
+
+
def get_runtime_system():
"""
Return a new XBlockRuntimeSystem.
@@ -74,15 +85,15 @@ def get_runtime_system():
return runtime
-def load_block(usage_key, user):
+def load_block(usage_key, user, *, check_permission: CheckPerm | None = CheckPerm.CAN_LEARN):
"""
Load the specified XBlock for the given user.
Returns an instantiated XBlock.
Exceptions:
- NotFound - if the XBlock doesn't exist or if the user doesn't have the
- necessary permissions
+ NotFound - if the XBlock doesn't exist
+ PermissionDenied - if the user doesn't have the necessary permissions
Args:
usage_key(OpaqueKey): block identifier
@@ -94,10 +105,17 @@ def load_block(usage_key, user):
# Now, check if the block exists in this context and if the user has
# permission to render this XBlock view:
- if user is not None and not context_impl.can_view_block(user, usage_key):
- # We do not know if the block was not found or if the user doesn't have
- # permission, but we want to return the same result in either case:
- raise NotFound(f"XBlock {usage_key} does not exist, or you don't have permission to view it.")
+ if check_permission and user is not None:
+ if check_permission == CheckPerm.CAN_EDIT:
+ has_perm = context_impl.can_edit_block(user, usage_key)
+ elif check_permission == CheckPerm.CAN_READ_AS_AUTHOR:
+ has_perm = context_impl.can_view_block_for_editing(user, usage_key)
+ elif check_permission == CheckPerm.CAN_LEARN:
+ has_perm = context_impl.can_view_block(user, usage_key)
+ else:
+ has_perm = False
+ if not has_perm:
+ raise PermissionDenied(f"You don't have permission to access the component '{usage_key}'.")
# TODO: load field overrides from the context
# e.g. a course might specify that all 'problem' XBlocks have 'max_attempts'
@@ -105,7 +123,11 @@ def load_block(usage_key, user):
# field_overrides = context_impl.get_field_overrides(usage_key)
runtime = get_runtime_system().get_runtime(user=user)
- return runtime.get_block(usage_key)
+ try:
+ return runtime.get_block(usage_key)
+ except NoSuchUsage as exc:
+ # Convert NoSuchUsage to NotFound so we do the right thing (404 not 500) by default.
+ raise NotFound(f"The component '{usage_key}' does not exist.") from exc
def get_block_metadata(block, includes=()):
diff --git a/openedx/core/djangoapps/xblock/learning_context/learning_context.py b/openedx/core/djangoapps/xblock/learning_context/learning_context.py
index 2dc5155dc4e2..b535e84ca7c1 100644
--- a/openedx/core/djangoapps/xblock/learning_context/learning_context.py
+++ b/openedx/core/djangoapps/xblock/learning_context/learning_context.py
@@ -2,6 +2,8 @@
A "Learning Context" is a course, a library, a program, or some other collection
of content where learning happens.
"""
+from openedx.core.types import User as UserType
+from opaque_keys.edx.keys import UsageKeyV2
class LearningContext:
@@ -23,11 +25,11 @@ def __init__(self, **kwargs):
parameters without changing the API.
"""
- def can_edit_block(self, user, usage_key): # pylint: disable=unused-argument
+ def can_edit_block(self, user: UserType, usage_key: UsageKeyV2) -> bool: # pylint: disable=unused-argument
"""
- Does the specified usage key exist in its context, and if so, does the
- specified user have permission to edit it (make changes to the authored
- data store)?
+ Assuming a block with the specified ID (usage_key) exists, does the
+ specified user have permission to edit it (make changes to the
+ fields / authored data store)?
user: a Django User object (may be an AnonymousUser)
@@ -37,11 +39,20 @@ def can_edit_block(self, user, usage_key): # pylint: disable=unused-argument
"""
return False
- def can_view_block(self, user, usage_key): # pylint: disable=unused-argument
+ def can_view_block_for_editing(self, user: UserType, usage_key: UsageKeyV2) -> bool:
"""
- Does the specified usage key exist in its context, and if so, does the
+ Assuming a block with the specified ID (usage_key) exists, does the
+ specified user have permission to view its fields and OLX details (but
+ not necessarily to make changes to it)?
+ """
+ return self.can_edit_block(user, usage_key)
+
+ def can_view_block(self, user: UserType, usage_key: UsageKeyV2) -> bool: # pylint: disable=unused-argument
+ """
+ Assuming a block with the specified ID (usage_key) exists, does the
specified user have permission to view it and interact with it (call
- handlers, save user state, etc.)?
+ handlers, save user state, etc.)? This is also sometimes called the
+ "can_learn" permission.
user: a Django User object (may be an AnonymousUser)
diff --git a/openedx/core/djangoapps/xblock/rest_api/views.py b/openedx/core/djangoapps/xblock/rest_api/views.py
index 7934e24bd2db..20e6a6dde0b2 100644
--- a/openedx/core/djangoapps/xblock/rest_api/views.py
+++ b/openedx/core/djangoapps/xblock/rest_api/views.py
@@ -29,6 +29,7 @@
from openedx.core.djangoapps.xblock.learning_context.manager import get_learning_context_impl
from openedx.core.lib.api.view_utils import view_auth_classes
from ..api import (
+ CheckPerm,
get_block_metadata,
get_block_display_name,
get_handler_url as _get_handler_url,
@@ -108,7 +109,7 @@ def embed_block_view(request, usage_key_str, view_name):
raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
try:
- block = load_block(usage_key, request.user)
+ block = load_block(usage_key, request.user, check_permission=CheckPerm.CAN_LEARN)
except NoSuchUsage as exc:
raise NotFound(f"{usage_key} not found") from exc
@@ -246,7 +247,8 @@ def get(self, request, usage_key_str):
except InvalidKeyError as e:
raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
- block = load_block(usage_key, request.user)
+ # The "fields" view requires "read as author" permissions because the fields can contain answers, etc.
+ block = load_block(usage_key, request.user, check_permission=CheckPerm.CAN_READ_AS_AUTHOR)
block_dict = {
"display_name": get_block_display_name(block), # potentially duplicated from metadata
"data": block.data,
@@ -265,7 +267,7 @@ def post(self, request, usage_key_str):
raise NotFound(invalid_not_found_fmt.format(usage_key=usage_key_str)) from e
user = request.user
- block = load_block(usage_key, user)
+ block = load_block(usage_key, user, check_permission=CheckPerm.CAN_EDIT)
data = request.data.get("data")
metadata = request.data.get("metadata")
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index 5a6074093eeb..dd727a4b1801 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -7,7 +7,8 @@
# link to other information that will help people in the future to remove the
# pin when possible. Writing an issue against the offending project and
# linking to it here is good.
-
+# For further details on how to properly write constraints here please consult
+# https://openedx.atlassian.net/wiki/spaces/COMM/pages/4400250883/Adding+pinned+dependencies+in+constraint+file
# This file contains all common constraints for edx-repos
-c common_constraints.txt
@@ -18,127 +19,176 @@
# Ticket: https://github.com/openedx/edx-platform/issues/35334
algoliasearch<4.0.0
+# Date: 2024-03-14
+# Temporary to Support the python 3.11 Upgrade
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35281
+backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
+
+# Date: 2020-02-26
# As it is not clarified what exact breaking changes will be introduced as per
# the next major release, ensure the installed version is within boundaries.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35280
celery>=5.2.2,<6.0.0
+# Date: 2021-05-17
+# greater version breaking upgrade builds
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35279
+click==8.1.6
-# The team that owns this package will manually bump this package rather than having it pulled in automatically.
-# This is to allow them to better control its deployment and to do it in a process that works better
-# for them.
-edx-enterprise==4.26.0
+# Date: 2022-07-20
+# edx-enterprise, snowflake-connector-python require charset-normalizer==2.0.0
+# Can be removed once snowflake-connector-python>2.7.9 is released with the fix.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35278
+charset-normalizer<2.1.0
+# Date: 2024-02-02
# Stay on LTS version, remove once this is added to common constraint
Django<5.0
+# Date: 2020-02-10
# django-oauth-toolkit version >=2.0.0 has breaking changes. More details
# mentioned on this issue https://github.com/openedx/edx-platform/issues/32884
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35277
django-oauth-toolkit==1.7.1
+# Date: 2024-02-02
# incremental upgrade
django-simple-history==3.4.0
-# Adding pin to avoid any major upgrade
-pymongo<4.4.1
-
-# To override the constraint of edx-lint
-# This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved
-# and the upstream constraint in edx-lint has been removed.
-event-tracking==3.0.0
-
+# Date: 2021-05-17
# greater version has breaking changes and requires some migration steps.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35276
django-webpack-loader==0.7.0
-# At the time of writing this comment, we do not know whether py2neo>=2022
-# will support our currently-deployed Neo4j version (3.5).
-# Feel free to loosen this constraint if/when it is confirmed that a later
-# version of py2neo will work with Neo4j 3.5.
-py2neo<2022
-
-# edx-enterprise, snowflake-connector-python require charset-normalizer==2.0.0
-# Can be removed once snowflake-connector-python>2.7.9 is released with the fix.
-charset-normalizer<2.1.0
-
-# markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail
-# pinning the version untill the issue gets resolved in the package itself
-markdown<3.4.0
-
-# pycodestyle==2.9.0 generates false positive error E275.
-# Constraint can be removed once the issue https://github.com/PyCQA/pycodestyle/issues/1090 is fixed.
-pycodestyle<2.9.0
-
-pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
-
-# urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages
-# which require urllib3<2 for now.
-# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
-urllib3<2.0.0
-
-
+# Date: 2023-06-20
# Adding pin to avoid any major upgrade
djangorestframework<3.15.0
+# Date: 2023-07-19
# The version of django-stubs we can use depends on which Django release we're using
# 1.16.0 works with Django 3.2 through 4.1
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35275
django-stubs==1.16.0
djangorestframework-stubs==3.14.0 # Pinned to match django-stubs. Remove this when we can remove the above pin.
+# Date: 2024-07-23
+# django-storages==1.14.4 breaks course imports
+# Two lines were added in 1.14.4 that make file_exists_in_storage function always return False,
+# as the default value of AWS_S3_FILE_OVERWRITE is True
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35170
+django-storages<1.14.4
+
+# Date: 2019-08-16
+# The team that owns this package will manually bump this package rather than having it pulled in automatically.
+# This is to allow them to better control its deployment and to do it in a process that works better
+# for them.
+edx-enterprise==4.27.2
+
+# Date: 2024-05-09
+# This has to be constrained as well because newer versions of edx-i18n-tools need the
+# newer version of lxml but that requirement was not made expilict in the 1.6.0 version
+# of the package. This can be un-pinned when we're upgrading lxml.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35274
+edx-i18n-tools<1.6.0
+
+# Date: 2024-07-26
+# To override the constraint of edx-lint
+# This can be removed once https://github.com/openedx/edx-platform/issues/34586 is resolved
+# and the upstream constraint in edx-lint has been removed.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35273
+event-tracking==3.0.0
+
+# Date: 2023-07-26
# Our legacy Sass code is incompatible with anything except this ancient libsass version.
# Here is a ticket to upgrade, but it's of debatable importance given that we are rapidly moving
# away from legacy LMS/CMS frontends:
# https://github.com/openedx/edx-platform/issues/31616
libsass==0.10.0
-# greater version breaking upgrade builds
-click==8.1.6
+# Date: 2024-04-30
+# lxml>=5.0 introduced breaking changes related to system dependencies
+# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean]
+# This constraint can be removed once we upgrade to Python 3.11
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35272
+lxml<5.0
-# pinning this version to avoid updates while the library is being developed
-openedx-learning==0.13.1
+# Date: 2018-12-14
+# markdown>=3.4.0 has failures due to internal refactorings which causes the tests to fail
+# pinning the version untill the issue gets resolved in the package itself
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35271
+markdown<3.4.0
-# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
-openai<=0.28.1
+# Date: 2024-04-24
+# moto==5.0 contains breaking changes. Needs to be updated separately.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35270
+moto<5.0
+# Date: 2024-07-16
+# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
+# Otherwise we see a failure while running the following command:
+# export DJANGO_SETTINGS_MODULE=cms.envs.test; python manage.py cms check_reserved_keywords --override_file db_keyword_overrides.yml --report_path reports/reserved_keywords --report_file cms_reserved_keyword_report.csv
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35126
+numpy<2.0.0
+
+# Date: 2024-01-26
# optimizely-sdk 5.0.0 is breaking following test with segmentation fault
# common/djangoapps/third_party_auth/tests/test_views.py::SAMLMetadataTest::test_secure_key_configuration
# needs to be fixed in the follow up issue
-# https://github.com/openedx/edx-platform/issues/34103
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/34103
optimizely-sdk<5.0
-# lxml>=5.0 introduced breaking changes related to system dependencies
-# lxml==5.2.1 introduced new extra so we'll nee to rename lxml --> lxml[html-clean]
-# This constraint can be removed once we upgrade to Python 3.11
-lxml<5.0
-# This has to be constrained as well because newer versions of edx-i18n-tools need the
-# newer version of lxml but that requirement was not made expilict in the 1.6.0 version
-# of the package. This can be un-pinned when we're upgrading lxml.
-edx-i18n-tools<1.6.0
-
-# xmlsec==1.3.14 breaking tests for all builds, can be removed once a fix is available
-xmlsec<1.3.14
+# Date: 2023-09-18
+# pinning this version to avoid updates while the library is being developed
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35269
+openedx-learning==0.13.1
-# moto==5.0 contains breaking changes. Needs to be updated separately.
-moto<5.0
+# Date: 2023-11-29
+# Open AI version 1.0.0 dropped support for openai.ChatCompletion which is currently in use in enterprise.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35268
+openai<=0.28.1
+# Date: 2024-04-26
# path==16.12.0 breaks the unit test collections check
# needs to be investigated and fixed separately
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35267
path<16.12.0
-# Temporary to Support the python 3.11 Upgrade
-backports.zoneinfo;python_version<"3.9" # Newer versions have zoneinfo available in the standard library
+# Date: 2022-08-03
+# pycodestyle==2.9.0 generates false positive error E275.
+# Constraint can be removed once the issue https://github.com/PyCQA/pycodestyle/issues/1090 is fixed.
+pycodestyle<2.9.0
-# Relevant GitHub Issue: https://github.com/openedx/edx-platform/issues/35126
-# We need to upgrade the version of elasticsearch to atleast 7.15 before we can upgrade to Numpy 2.0.0
-# Otherwise we see a failure while running the following command:
-# export DJANGO_SETTINGS_MODULE=cms.envs.test; python manage.py cms check_reserved_keywords --override_file db_keyword_overrides.yml --report_path reports/reserved_keywords --report_file cms_reserved_keyword_report.csv
-numpy<2.0.0
+# Date: 2021-07-12
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/33560
+pylint<2.16.0 # greater version failing quality test. Fix them in seperate ticket.
-# django-storages==1.14.4 breaks course imports
-# Two lines were added in 1.14.4 that make file_exists_in_storage function always return False,
-# as the default value of AWS_S3_FILE_OVERWRITE is True
-django-storages<1.14.4
+# Date: 2021-08-25
+# At the time of writing this comment, we do not know whether py2neo>=2022
+# will support our currently-deployed Neo4j version (3.5).
+# Feel free to loosen this constraint if/when it is confirmed that a later
+# version of py2neo will work with Neo4j 3.5.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35266
+py2neo<2022
+
+# Date: 2020-04-08
+# Adding pin to avoid any major upgrade
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35265
+pymongo<4.4.1
+# Date: 2024-08-06
# social-auth-app-django 5.4.2 introduces a new migration that will not play nicely with large installations. This will touch
# user tables, which are quite large, especially on instances like edx.org.
# We are pinning this until after all the smaller migrations get handled and then we can migrate this all at once.
-# Ticket to unpin: https://github.com/edx/edx-arch-experiments/issues/760
+# Issue for unpinning: https://github.com/edx/edx-arch-experiments/issues/760
social-auth-app-django<=5.4.1
+
+# Date: 2023-11-05
+# urllib3>=2.0.0 conflicts with elastic search && snowflake-connector-python packages
+# which require urllib3<2 for now.
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/32222
+urllib3<2.0.0
+
+# Date: 2024-04-24
+# xmlsec==1.3.14 breaking tests or all builds, can be removed once a fix is available
+# Issue for unpinning: https://github.com/openedx/edx-platform/issues/35264
+xmlsec<1.3.14
diff --git a/requirements/edx-sandbox/base.txt b/requirements/edx-sandbox/base.txt
index 1d94a4649a5f..bf0a4376da70 100644
--- a/requirements/edx-sandbox/base.txt
+++ b/requirements/edx-sandbox/base.txt
@@ -53,7 +53,7 @@ numpy==1.26.4
# matplotlib
# openedx-calc
# scipy
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via -r requirements/edx-sandbox/base.in
packaging==24.1
# via matplotlib
diff --git a/requirements/edx-sandbox/releases/quince.txt b/requirements/edx-sandbox/releases/quince.txt
index c8b5cff8816e..270a6b4f0a90 100644
--- a/requirements/edx-sandbox/releases/quince.txt
+++ b/requirements/edx-sandbox/releases/quince.txt
@@ -56,7 +56,7 @@ numpy==1.22.4
# matplotlib
# openedx-calc
# scipy
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via -r requirements/edx-sandbox/base.in
packaging==23.2
# via matplotlib
diff --git a/requirements/edx-sandbox/releases/redwood.txt b/requirements/edx-sandbox/releases/redwood.txt
index d12c994fd206..432985e40905 100644
--- a/requirements/edx-sandbox/releases/redwood.txt
+++ b/requirements/edx-sandbox/releases/redwood.txt
@@ -54,7 +54,7 @@ numpy==1.24.4
# matplotlib
# openedx-calc
# scipy
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via -r requirements/edx-sandbox/base.in
packaging==24.0
# via matplotlib
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index 72333a45814f..55793bd0c5af 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -467,7 +467,7 @@ edx-drf-extensions==10.4.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==4.26.0
+edx-enterprise==4.27.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/kernel.in
@@ -482,7 +482,7 @@ edx-i18n-tools==1.5.0
# ora2
edx-milestones==0.6.0
# via -r requirements/edx/kernel.in
-edx-name-affirmation==2.4.2
+edx-name-affirmation==3.0.1
# via -r requirements/edx/kernel.in
edx-opaque-keys[django]==2.11.0
# via
@@ -502,7 +502,7 @@ edx-opaque-keys[django]==2.11.0
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/kernel.in
-edx-proctoring==4.18.1
+edx-proctoring==4.18.2
# via
# -r requirements/edx/kernel.in
# edx-proctoring-proctortrack
@@ -801,7 +801,7 @@ openai==0.28.1
# edx-enterprise
openedx-atlas==0.6.2
# via -r requirements/edx/kernel.in
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via -r requirements/edx/kernel.in
openedx-django-pyfs==3.7.0
# via
@@ -817,6 +817,7 @@ openedx-events==9.14.1
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
+ # edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.10.0
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index 53004d094820..1bdd3736516b 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -741,7 +741,7 @@ edx-drf-extensions==10.4.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==4.26.0
+edx-enterprise==4.27.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/doc.txt
@@ -766,7 +766,7 @@ edx-milestones==0.6.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-edx-name-affirmation==2.4.2
+edx-name-affirmation==3.0.1
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -790,7 +790,7 @@ edx-organizations==6.13.0
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-edx-proctoring==4.18.1
+edx-proctoring==4.18.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1340,7 +1340,7 @@ openedx-atlas==0.6.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via
# -r requirements/edx/doc.txt
# -r requirements/edx/testing.txt
@@ -1365,6 +1365,7 @@ openedx-events==9.14.1
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
+ # edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.10.0
diff --git a/requirements/edx/doc.txt b/requirements/edx/doc.txt
index dcef8359eccd..6f12d8046759 100644
--- a/requirements/edx/doc.txt
+++ b/requirements/edx/doc.txt
@@ -547,7 +547,7 @@ edx-drf-extensions==10.4.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==4.26.0
+edx-enterprise==4.27.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -562,7 +562,7 @@ edx-i18n-tools==1.5.0
# ora2
edx-milestones==0.6.0
# via -r requirements/edx/base.txt
-edx-name-affirmation==2.4.2
+edx-name-affirmation==3.0.1
# via -r requirements/edx/base.txt
edx-opaque-keys[django]==2.11.0
# via
@@ -581,7 +581,7 @@ edx-opaque-keys[django]==2.11.0
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/base.txt
-edx-proctoring==4.18.1
+edx-proctoring==4.18.2
# via
# -r requirements/edx/base.txt
# edx-proctoring-proctortrack
@@ -959,7 +959,7 @@ openai==0.28.1
# edx-enterprise
openedx-atlas==0.6.2
# via -r requirements/edx/base.txt
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via -r requirements/edx/base.txt
openedx-django-pyfs==3.7.0
# via
@@ -976,6 +976,7 @@ openedx-events==9.14.1
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
+ # edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.10.0
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 05c761338b45..d3b14a6f4373 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -571,7 +571,7 @@ edx-drf-extensions==10.4.0
# edx-when
# edxval
# openedx-learning
-edx-enterprise==4.26.0
+edx-enterprise==4.27.2
# via
# -c requirements/edx/../constraints.txt
# -r requirements/edx/base.txt
@@ -588,7 +588,7 @@ edx-lint==5.4.0
# via -r requirements/edx/testing.in
edx-milestones==0.6.0
# via -r requirements/edx/base.txt
-edx-name-affirmation==2.4.2
+edx-name-affirmation==3.0.1
# via -r requirements/edx/base.txt
edx-opaque-keys[django]==2.11.0
# via
@@ -607,7 +607,7 @@ edx-opaque-keys[django]==2.11.0
# ora2
edx-organizations==6.13.0
# via -r requirements/edx/base.txt
-edx-proctoring==4.18.1
+edx-proctoring==4.18.2
# via
# -r requirements/edx/base.txt
# edx-proctoring-proctortrack
@@ -1010,7 +1010,7 @@ openai==0.28.1
# edx-enterprise
openedx-atlas==0.6.2
# via -r requirements/edx/base.txt
-openedx-calc==3.1.0
+openedx-calc==3.1.2
# via -r requirements/edx/base.txt
openedx-django-pyfs==3.7.0
# via
@@ -1027,6 +1027,7 @@ openedx-events==9.14.1
# edx-enterprise
# edx-event-bus-kafka
# edx-event-bus-redis
+ # edx-name-affirmation
# event-tracking
# ora2
openedx-filters==1.10.0
diff --git a/xmodule/capa/tests/test_responsetypes.py b/xmodule/capa/tests/test_responsetypes.py
index 37a6647ce7d0..e8df8894c78f 100644
--- a/xmodule/capa/tests/test_responsetypes.py
+++ b/xmodule/capa/tests/test_responsetypes.py
@@ -1538,6 +1538,20 @@ def test_floats(self):
problem = self.build_problem(answer=given_answer)
self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
+ def test_percentage(self):
+ """
+ Test percentage
+ """
+ problem_setup = [
+ # [given_answer, [list of correct responses], [list of incorrect responses]]
+ ["1%", ["1%", "1.0%", "1.00%", "0.01"], [""]],
+ ["2.0%", ["2%", "2.0%", "2.00%", "0.02"], [""]],
+ ["4.00%", ["4%", "4.0%", "4.00%", "0.04"], [""]],
+ ]
+ for given_answer, correct_responses, incorrect_responses in problem_setup:
+ problem = self.build_problem(answer=given_answer)
+ self.assert_multiple_grade(problem, correct_responses, incorrect_responses)
+
def test_grade_with_script(self):
script_text = "computed_response = math.sqrt(4)"
problem = self.build_problem(answer="$computed_response", script=script_text)
diff --git a/xmodule/course_block.py b/xmodule/course_block.py
index 46ad7476f6d1..5b1f92d77734 100644
--- a/xmodule/course_block.py
+++ b/xmodule/course_block.py
@@ -1115,9 +1115,6 @@ def __init__(self, *args, **kwargs):
except InvalidTabsException as err:
raise type(err)(f'{str(err)} For course: {str(self.id)}') # lint-amnesty, pylint: disable=line-too-long
- if not settings.FEATURES.get("ENABLE_V2_CERT_DISPLAY_SETTINGS"):
- self.set_default_certificate_available_date()
-
def set_grading_policy(self, course_policy):
"""
The JSON object can have the keys GRADER and GRADE_CUTOFFS. If either is
