From b26f26e993bfd5021bd8cc28966b080979aa1ce3 Mon Sep 17 00:00:00 2001 From: adeelehsan Date: Wed, 8 Jul 2020 13:09:09 +0500 Subject: [PATCH] Get user email from request PROD-674 --- .../static/support/jsx/single_support_form.jsx | 4 ---- .../djangoapps/zendesk_proxy/tests/test_v1_views.py | 13 ++++++++----- openedx/core/djangoapps/zendesk_proxy/v1/views.py | 4 ++-- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx index bd75f701f4..d98625baf2 100644 --- a/lms/djangoapps/support/static/support/jsx/single_support_form.jsx +++ b/lms/djangoapps/support/static/support/jsx/single_support_form.jsx @@ -135,10 +135,6 @@ class RenderForm extends React.Component { value: formData.course, }], tags: this.props.context.tags, - requester: { - email: this.userInformation.email, - name: this.userInformation.username, - }, }; request.open('POST', url, true); request.setRequestHeader('Content-type', 'application/json;charset=UTF-8'); diff --git a/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py b/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py index ea14562a6e..5853e3d8b0 100644 --- a/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py +++ b/openedx/core/djangoapps/zendesk_proxy/tests/test_v1_views.py @@ -11,6 +11,7 @@ from mock import MagicMock, patch import six from six.moves import range +from common.djangoapps.student.tests.factories import UserFactory from openedx.core.djangoapps.zendesk_proxy.v1.views import ZendeskProxyThrottle from openedx.core.lib.api.test_utils import ApiTestCase @@ -25,10 +26,12 @@ class ZendeskProxyTestCase(ApiTestCase): def setUp(self): self.url = reverse('zendesk_proxy_v1') + self.user = UserFactory(username='test', password='test123') + self.client.login(username='test', password='test123') self.request_data = { 'requester': { - 'email': 'JohnQStudent@example.com', - 'name': 'John Q. Student' + 'email': self.user.email, + 'name': self.user.username }, 'subject': 'Python Unit Test Help Request', 'comment': { @@ -73,8 +76,8 @@ class ZendeskProxyTestCase(ApiTestCase): }, 'custom_fields': [{'id': '001', 'value': 'demo-course'}], 'requester': { - 'email': 'JohnQStudent@example.com', - 'name': 'John Q. Student', + 'email': self.user.email, + 'name': self.user.username }, 'subject': 'Python Unit Test Help Request', 'tags': ['python_unit_test'], @@ -82,7 +85,7 @@ class ZendeskProxyTestCase(ApiTestCase): } ) - @ddt.data('requester', 'tags') + @ddt.data('subject', 'tags') def test_bad_request(self, key_to_delete): test_data = deepcopy(self.request_data) _ = test_data.pop(key_to_delete) diff --git a/openedx/core/djangoapps/zendesk_proxy/v1/views.py b/openedx/core/djangoapps/zendesk_proxy/v1/views.py index 25f5640e27..52bb22932c 100644 --- a/openedx/core/djangoapps/zendesk_proxy/v1/views.py +++ b/openedx/core/djangoapps/zendesk_proxy/v1/views.py @@ -57,8 +57,8 @@ class ZendeskPassthroughView(APIView): """ try: proxy_status = create_zendesk_ticket( - requester_name=request.data['requester']['name'], - requester_email=request.data['requester']['email'], + requester_name=request.user.username, + requester_email=request.user.email, subject=request.data['subject'], body=request.data['comment']['body'], custom_fields=request.data['custom_fields'],