From 2dde0c6d0214c07d94ac45f0cfed3a7363d88fcc Mon Sep 17 00:00:00 2001 From: test test Date: Wed, 26 May 2021 15:44:21 +0200 Subject: [PATCH] Migrate middleware --- app/settings.py | 5 ++++- teleforma/middleware.py | 11 ++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/app/settings.py b/app/settings.py index d1a3e2c0..ef893513 100644 --- 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 adc5f4b5..a5c8511f 100644 --- 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) -- 2.39.5