User info cookie

* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.

common/djangoapps/third_party_auth/pipeline.py

@@ -61,7 +61,6 @@ import random
 import string  # pylint: disable-msg=deprecated-module
 from collections import OrderedDict
 import urllib
-from ipware.ip import get_ip
 import analytics
 from eventtracking import tracker
 
@@ -534,7 +533,7 @@ def ensure_user_information(strategy, auth_entry, backend=None, user=None, socia
 
 
 @partial.partial
-def set_logged_in_cookie(backend=None, user=None, strategy=None, auth_entry=None, *args, **kwargs):
+def set_logged_in_cookies(backend=None, user=None, strategy=None, auth_entry=None, *args, **kwargs):
     """This pipeline step sets the "logged in" cookie for authenticated users.
 
     Some installations have a marketing site front-end separate from
@@ -566,7 +565,7 @@ def set_logged_in_cookie(backend=None, user=None, strategy=None, auth_entry=None
             # Check that the cookie isn't already set.
             # This ensures that we allow the user to continue to the next
             # pipeline step once he/she has the cookie set by this step.
-            has_cookie = student.helpers.is_logged_in_cookie_set(request)
+            has_cookie = student.cookies.is_logged_in_cookie_set(request)
             if not has_cookie:
                 try:
                     redirect_url = get_complete_url(backend.name)
@@ -577,7 +576,7 @@ def set_logged_in_cookie(backend=None, user=None, strategy=None, auth_entry=None
                     pass
                 else:
                     response = redirect(redirect_url)
-                    return student.helpers.set_logged_in_cookie(request, response)
+                    return student.cookies.set_logged_in_cookies(request, response, user)
 
 
 @partial.partial

common/djangoapps/third_party_auth/settings.py

@@ -111,7 +111,7 @@ def _set_global_settings(django_settings):
         'social.pipeline.social_auth.associate_user',
         'social.pipeline.social_auth.load_extra_data',
         'social.pipeline.user.user_details',
-        'third_party_auth.pipeline.set_logged_in_cookie',
+        'third_party_auth.pipeline.set_logged_in_cookies',
         'third_party_auth.pipeline.login_analytics',
     )
 

common/djangoapps/third_party_auth/tests/specs/base.py

@@ -372,11 +372,15 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
             response["Location"],
             pipeline.get_complete_url(self.PROVIDER_CLASS.BACKEND_CLASS.name)
         )
-        self.assertEqual(response.cookies[django_settings.EDXMKTG_COOKIE_NAME].value, 'true')
+        self.assertEqual(response.cookies[django_settings.EDXMKTG_LOGGED_IN_COOKIE_NAME].value, 'true')
+        self.assertIn(django_settings.EDXMKTG_USER_INFO_COOKIE_NAME, response.cookies)
 
-    def set_logged_in_cookie(self, request):
+    def set_logged_in_cookies(self, request):
         """Simulate setting the marketing site cookie on the request. """
-        request.COOKIES[django_settings.EDXMKTG_COOKIE_NAME] = 'true'
+        request.COOKIES[django_settings.EDXMKTG_LOGGED_IN_COOKIE_NAME] = 'true'
+        request.COOKIES[django_settings.EDXMKTG_USER_INFO_COOKIE_NAME] = json.dumps({
+            'version': django_settings.EDXMKTG_USER_INFO_COOKIE_VERSION,
+        })
 
     # Actual tests, executed once per child.
 
@@ -434,7 +438,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
         ))
 
         # Set the cookie and try again
-        self.set_logged_in_cookie(request)
+        self.set_logged_in_cookies(request)
 
         # Fire off the auth pipeline to link.
         self.assert_redirect_to_dashboard_looks_correct(actions.do_complete(
@@ -456,7 +460,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
         self.assert_social_auth_exists_for_user(user, strategy)
 
         # We're already logged in, so simulate that the cookie is set correctly
-        self.set_logged_in_cookie(request)
+        self.set_logged_in_cookies(request)
 
         # Instrument the pipeline to get to the dashboard with the full
         # expected state.
@@ -582,7 +586,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
         ))
 
         # Set the cookie and try again
-        self.set_logged_in_cookie(request)
+        self.set_logged_in_cookies(request)
 
         self.assert_redirect_to_dashboard_looks_correct(
             actions.do_complete(request.backend, social_views._do_login, user=user))
@@ -683,7 +687,7 @@ class IntegrationTest(testutil.TestCase, test.TestCase):
         ))
 
         # Set the cookie and try again
-        self.set_logged_in_cookie(request)
+        self.set_logged_in_cookies(request)
         self.assert_redirect_to_dashboard_looks_correct(
             actions.do_complete(strategy.request.backend, social_views._do_login, user=created_user))
         # Now the user has been redirected to the dashboard. Their third party account should now be linked.