Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync opencraft-release/palm.1 with Upstream 20231106-1699229227 #600

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions lms/djangoapps/certificates/tests/test_webview_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
)
from openedx.core.djangolib.js_utils import js_escaped_string
from openedx.core.djangolib.testing.utils import CacheIsolationTestCase
from openedx.core.lib.courses import course_image_url
from openedx.core.lib.tests.assertions.events import assert_event_matches
from openedx.features.name_affirmation_api.utils import get_name_affirmation_service
from xmodule.data import CertificatesDisplayBehaviors # lint-amnesty, pylint: disable=wrong-import-order
Expand Down Expand Up @@ -351,6 +352,68 @@ def test_linkedin_share_url_site(self):
js_escaped_string(self.linkedin_url.format(params=urlencode(params))),
)

@patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {
"CERTIFICATE_FACEBOOK": True,
"CERTIFICATE_FACEBOOK_TEXT": "test FB text"
})
@override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
def test_render_certificate_html_view_with_facebook_meta_tags(self):
"""
Test view html certificate if share to FB is enabled.
If 'facebook_share_enabled=True', <meta> tags with property="og:..."
must be enabled to pass parameters to FB.
"""
self._add_course_certificates(count=1, signatory_count=1, is_active=True)
self.course.cert_html_view_enabled = True
self.course.save()
self.update_course(self.course, self.user.id)
test_url = get_certificate_url(
user_id=self.user.id,
course_id=str(self.course.id),
uuid=self.cert.verify_uuid
)
platform_name = settings.PLATFORM_NAME
share_url = f'http://testserver{test_url}'
full_course_image_url = f'http://testserver{course_image_url(self.course)}'
document_title = f'{self.course.org} {self.course.number} Certificate | {platform_name}'
response = self.client.get(test_url)

assert response.status_code == 200
self.assertContains(response, f'<meta property="og:url" content="{share_url}" />')
self.assertContains(response, f'<meta property="og:title" content="{document_title}" />')
self.assertContains(response, '<meta property="og:type" content="image/png" />')
self.assertContains(response, f'<meta property="og:image" content="{full_course_image_url}" />')
self.assertContains(response, '<meta property="og:description" content="test FB text" />')

@patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {
"CERTIFICATE_FACEBOOK": False,
})
@override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
def test_render_certificate_html_view_without_facebook_meta_tags(self):
"""
Test view html certificate if share to FB is disabled.
If 'facebook_share_enabled=False', html certificate view
should not contain <meta> tags with parameters property="og:..."
"""
self._add_course_certificates(count=1, signatory_count=1, is_active=True)
self.course.cert_html_view_enabled = True
self.course.save()
self.update_course(self.course, self.user.id)

test_url = get_certificate_url(
user_id=self.user.id,
course_id=str(self.course.id),
uuid=self.cert.verify_uuid
)
response = self.client.get(test_url)

assert response.status_code == 200
self.assertNotContains(response, '<meta property="og:url" ')
self.assertNotContains(response, '<meta property="og:title" ')
self.assertNotContains(response, '<meta property="og:type" content="image/png" />')
self.assertNotContains(response, '<meta property="og:image" ')
self.assertNotContains(response, '<meta property="og:description" ')

@override_settings(FEATURES=FEATURES_WITH_CERTS_ENABLED)
@patch.dict("django.conf.settings.SOCIAL_SHARING_SETTINGS", {"CERTIFICATE_FACEBOOK": True})
@with_site_configuration(
Expand Down
6 changes: 5 additions & 1 deletion lms/djangoapps/discussion/rest_api/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@
CourseView.as_view(),
name="discussion_course"
),
path('v1/accounts/retire_forum', RetireUserView.as_view(), name="retire_discussion_user"),
re_path(
r"^v1/accounts/retire_forum/?$",
RetireUserView.as_view(),
name="retire_discussion_user"
),
path('v1/accounts/replace_username', ReplaceUsernamesView.as_view(), name="replace_discussion_username"),
re_path(
fr"^v1/course_topics/{settings.COURSE_ID_PATTERN}",
Expand Down
2 changes: 1 addition & 1 deletion lms/templates/certificates/_accomplishment-banner.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ <h3 class="sr-only">${_("Print or share your certificate:")}</h3>
% if facebook_share_enabled:
<button class="action action-share-facebook btn-inverse btn-small icon-only" id="action-share-facebook"
## xss-lint: disable=mako-invalid-html-filter
onclick="FaceBook.share({share_text: '${facebook_share_text | n, js_escaped_string}', share_link: '${share_url | n, js_escaped_string}', picture_link: '${full_course_image_url | n, js_escaped_string}', description: '${_('Click the link to see my certificate.') | n, js_escaped_string}'});">
onclick="FaceBook.share({share_link: '${share_url | n, js_escaped_string}'});"></button>
<span class="icon fa fa-facebook-official" aria-hidden="true"></span>
<span class="action-label">${_("Post on Facebook")}</span>
</button>
Expand Down
10 changes: 9 additions & 1 deletion lms/templates/certificates/accomplishment-base.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">

% if facebook_share_enabled:
## OG (Open Graph) url, title, type, image and description added below to give social media info to display
## (https://developers.facebook.com/docs/opengraph/howtos/maximizing-distribution-media-content#tags)
<meta property="og:url" content="${share_url}" />
<meta property="og:title" content="${document_title}" />
<meta property="og:type" content="image/png" />
<meta property="og:image" content="${full_course_image_url}" />
<meta property="og:description" content="${facebook_share_text}" />
%endif
<title>${document_title}</title>

<%static:css group='style-certificates'/>
Expand Down
Loading