Migrate middleware

diff --git a/app/settings.py b/app/settings.py
index d1a3e2c0888ade649e2436f7c5d8784e9c7bc6c1..ef89351362d463e1781a189285dff5164c17d33c 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -120,7 +120,10 @@ MIDDLEWARE = (
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.locale.LocaleMiddleware',
-    'pagination.middleware.PaginationMiddleware',
+    # TODO : check if useless
+    # 'pagination.middleware.PaginationMiddleware',
+    'teleforma.middleware.XsSharing',
+    'django_user_agents.middleware.UserAgentMiddleware',
 )
 
 ROOT_URLCONF = 'urls'

diff --git a/teleforma/middleware.py b/teleforma/middleware.py
index adc5f4b5f06083969f0d2bb25335d8cb3c8ea7a4..a5c8511f76b65d586b367042bea4c84bb01c335e 100644 (file)
--- a/teleforma/middleware.py
+++ b/teleforma/middleware.py
@@ -21,6 +21,9 @@ class XsSharing(object):
         Access-Control-Allow-Methods: POST, GET, OPTIONS, PUT, DELETE
     """
 
+    def __init__(self, get_response):
+        self.get_response = get_response
+
     def process_request(self, request):
 
         if 'HTTP_ACCESS_CONTROL_REQUEST_METHOD' in request.META:
@@ -31,14 +34,12 @@ class XsSharing(object):
             response['Access-Control-Allow-Headers'] = ",".join(
                 XS_SHARING_ALLOWED_HEADERS)
 
-            return response
-
-        return None
+        return self.get_response(request)
 
     def process_response(self, request, response):
         # Avoid unnecessary work
         if response.has_header('Access-Control-Allow-Origin'):
-            return response
+            return self.get_response(request)
 
         response['Access-Control-Allow-Origin'] = XS_SHARING_ALLOWED_ORIGINS
         response['Access-Control-Allow-Methods'] = ",".join(
@@ -46,4 +47,4 @@ class XsSharing(object):
         response['Access-Control-Allow-Headers'] = ",".join(
             XS_SHARING_ALLOWED_HEADERS)
 
-        return response
+        return self.get_response(request)