From 5a67f5017477669a5aadb987f7df0272ac8959f2 Mon Sep 17 00:00:00 2001
From: Ahsan Ulhaq <ahsan.haq@arbisoft.com>
Date: Tue, 20 Feb 2018 17:21:44 +0500
Subject: [PATCH] Make sure user is login in credential when redirected from
 lms LEARNER-3729

---
 .../core/djangoapps/programs/tests/test_utils.py  | 15 ++++++++++++---
 openedx/core/djangoapps/programs/utils.py         | 11 +++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/openedx/core/djangoapps/programs/tests/test_utils.py b/openedx/core/djangoapps/programs/tests/test_utils.py
index 6a22a237c5..2dd4e1865e 100644
--- a/openedx/core/djangoapps/programs/tests/test_utils.py
+++ b/openedx/core/djangoapps/programs/tests/test_utils.py
@@ -36,7 +36,8 @@ from openedx.core.djangoapps.programs.utils import (
     ProgramDataExtender,
     ProgramMarketingDataExtender,
     ProgramProgressMeter,
-    get_certificates
+    get_certificates,
+    get_logged_in_program_certificate_url
 )
 from openedx.core.djangoapps.site_configuration.tests.factories import SiteFactory
 from openedx.core.djangolib.testing.utils import skip_unless_lms
@@ -1299,7 +1300,7 @@ class TestGetCertificates(TestCase):
         self.user = UserFactory()
         self.program = ProgramFactory()
         self.course_certificate_url = 'fake-course-certificate-url'
-        self.program_certificate_url = 'fake-program-certificate-url'
+        self.program_certificate_url = 'http://fake-credentials.edx.org/credentials/fake-uuid/'
 
         for course in self.program['courses']:
             # Give all course runs a certificate URL, but only expect one to come
@@ -1332,7 +1333,7 @@ class TestGetCertificates(TestCase):
         expected.append({
             'type': 'program',
             'title': self.program['title'],
-            'url': self.program_certificate_url,
+            'url': get_logged_in_program_certificate_url(self.program_certificate_url),
         })
 
         mock_get_credentials.return_value = [{
@@ -1384,6 +1385,14 @@ class TestGetCertificates(TestCase):
         certificates = get_certificates(self.user, self.program)
         self.assertEqual(certificates, expected)
 
+    def test_get_program_certificate_url(self, mock_get_credentials):  # pylint: disable=unused-argument
+        """
+        Verify that function returns correct url with login prepended
+        """
+        expected = 'http://fake-credentials.edx.org/login/?next=/credentials/fake-uuid/'
+        actual = get_logged_in_program_certificate_url(self.program_certificate_url)
+        self.assertEqual(expected, actual)
+
 
 @ddt.ddt
 @override_settings(ECOMMERCE_PUBLIC_URL_ROOT=ECOMMERCE_URL_ROOT)
diff --git a/openedx/core/djangoapps/programs/utils.py b/openedx/core/djangoapps/programs/utils.py
index 3c9457c329..e465341606 100644
--- a/openedx/core/djangoapps/programs/utils.py
+++ b/openedx/core/djangoapps/programs/utils.py
@@ -5,7 +5,7 @@ import logging
 from collections import defaultdict
 from copy import deepcopy
 from itertools import chain
-from urlparse import urljoin
+from urlparse import urljoin, urlparse, urlunparse
 
 from dateutil.parser import parse
 from django.conf import settings
@@ -673,12 +673,19 @@ def get_certificates(user, extended_program):
         certificates.append({
             'type': 'program',
             'title': extended_program['title'],
-            'url': program_credentials[0]['certificate_url'],
+            'url': get_logged_in_program_certificate_url(program_credentials[0]['certificate_url']),
         })
 
     return certificates
 
 
+def get_logged_in_program_certificate_url(certificate_url):
+    parsed_url = urlparse(certificate_url)
+    query_string = 'next=' + parsed_url.path
+    url_parts = (parsed_url.scheme, parsed_url.netloc, '/login/', '', query_string, '')
+    return urlunparse(url_parts)
+
+
 class ProgramMarketingDataExtender(ProgramDataExtender):
     """
     Utility for extending program data meant for the program marketing page which lives in the