From eda6169b8b4a11dea221df37ec3cdfb93e36c819 Mon Sep 17 00:00:00 2001
From: Diana Huang <dkh@edx.org>
Date: Fri, 15 Mar 2013 09:45:31 -0400
Subject: [PATCH] Pass along a url creator as opposed to just a url through the
 ModuleSystem.

---
 common/lib/capa/capa/responsetypes.py         |  3 ++-
 .../open_ended_module.py                      |  4 ++--
 .../xmodule/tests/test_combined_open_ended.py |  5 +++-
 lms/djangoapps/courseware/module_render.py    | 23 +++++++++++++------
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/common/lib/capa/capa/responsetypes.py b/common/lib/capa/capa/responsetypes.py
index 62da901656..f997829cd0 100644
--- a/common/lib/capa/capa/responsetypes.py
+++ b/common/lib/capa/capa/responsetypes.py
@@ -1413,8 +1413,9 @@ class CodeResponse(LoncapaResponse):
         queuekey = xqueue_interface.make_hashkey(str(self.system.seed) + qtime +
                                                  anonymous_student_id +
                                                  self.answer_id)
+        callback_url = self.system.xqueue['construct_callback']()
         xheader = xqueue_interface.make_xheader(
-            lms_callback_url=self.system.xqueue['callback_url'],
+            lms_callback_url=callback_url,
             lms_key=queuekey,
             queue_name=self.queue_name)
 
diff --git a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
index 1f84d2ab8c..8373700837 100644
--- a/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
@@ -174,7 +174,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                                                  str(len(self.child_history)))
 
         xheader = xqueue_interface.make_xheader(
-            lms_callback_url=system.xqueue['callback_url'],
+            lms_callback_url=system.xqueue['construct_callback'](),
             lms_key=queuekey,
             queue_name=self.message_queue_name
         )
@@ -224,7 +224,7 @@ class OpenEndedModule(openendedchild.OpenEndedChild):
                                                  anonymous_student_id +
                                                  str(len(self.child_history)))
 
-        xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['callback_url'],
+        xheader = xqueue_interface.make_xheader(lms_callback_url=system.xqueue['construct_callback'](),
                                                 lms_key=queuekey,
                                                 queue_name=self.queue_name)
 
diff --git a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
index 09c86baf27..aa8a077cc1 100644
--- a/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
+++ b/common/lib/xmodule/xmodule/tests/test_combined_open_ended.py
@@ -183,7 +183,10 @@ class OpenEndedModuleTest(unittest.TestCase):
         self.test_system.location = self.location
         self.mock_xqueue = MagicMock()
         self.mock_xqueue.send_to_queue.return_value = (None, "Message")
-        self.test_system.xqueue = {'interface': self.mock_xqueue, 'callback_url': '/', 'default_queuename': 'testqueue',
+        def constructed_callback(dispatch = "score_update"):
+            return dispatch
+        
+        self.test_system.xqueue = {'interface': self.mock_xqueue, 'construct_callback': constructed_callback, 'default_queuename': 'testqueue',
                                    'waittime': 1}
         self.openendedmodule = OpenEndedModule(self.test_system, self.location,
                                                self.definition, self.descriptor, self.static_data, self.metadata)
diff --git a/lms/djangoapps/courseware/module_render.py b/lms/djangoapps/courseware/module_render.py
index 08df7bfb8c..0954f8d28c 100644
--- a/lms/djangoapps/courseware/module_render.py
+++ b/lms/djangoapps/courseware/module_render.py
@@ -181,12 +181,21 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
         host=request.get_host(),
         proto=request.META.get('HTTP_X_FORWARDED_PROTO', 'https' if request.is_secure() else 'http')
     )
-    xqueue_callback_url += reverse('xqueue_callback',
-                                  kwargs=dict(course_id=course_id,
-                                              userid=str(user.id),
-                                              id=descriptor.location.url(),
-                                              dispatch='score_update'),
-                                  )
+
+    def make_xqueue_callback(dispatch = 'score_update'):
+        # Fully qualified callback URL for external queueing system
+        xqueue_callback_url = '{proto}://{host}'.format(
+            host=request.get_host(),
+            proto=request.META.get('HTTP_X_FORWARDED_PROTO', 'https' if request.is_secure() else 'http')
+        )
+
+        xqueue_callback_url += reverse('xqueue_callback',
+                                      kwargs=dict(course_id=course_id,
+                                                  userid=str(user.id),
+                                                  id=descriptor.location.url(),
+                                                  dispatch=dispatch),
+                                      )
+        return xqueue_callback_url
 
     # Default queuename is course-specific and is derived from the course that
     #   contains the current module.
@@ -194,7 +203,7 @@ def get_module_for_descriptor(user, request, descriptor, model_data_cache, cours
     xqueue_default_queuename = descriptor.location.org + '-' + descriptor.location.course
 
     xqueue = {'interface': xqueue_interface,
-              'callback_url': xqueue_callback_url,
+              'construct_callback': make_xqueue_callback,
               'default_queuename': xqueue_default_queuename.replace(' ', '_'),
               'waittime': settings.XQUEUE_WAITTIME_BETWEEN_REQUESTS
              }