MozReview: Migrate rbbz/middleware.py to mozreview/middleware.py (
Bug 1262548). r?smacleod
MozReview-Commit-ID: 63LYrwU6cAG
--- a/pylib/mozreview/mozreview/extension.py
+++ b/pylib/mozreview/mozreview/extension.py
@@ -62,16 +62,17 @@ from mozreview.hostingservice.bmo_bugtra
)
from mozreview.hostingservice.hmo_repository import (
HMORepository,
)
from mozreview.ldap.resources import (
ldap_association_resource,
)
from mozreview.middleware import (
+ CorsHeaderMiddleware,
MozReviewCacheDisableMiddleware,
MozReviewUserProfileMiddleware,
)
from mozreview.pulse import (
initialize_pulse_handlers,
)
from mozreview.resources.bugzilla_login import (
bugzilla_api_key_login_resource,
@@ -179,16 +180,17 @@ class MozReviewExtension(Extension):
commit_rewrite_resource,
file_diff_reviewer_resource,
ldap_association_resource,
review_request_summary_resource,
try_autoland_trigger_resource,
]
middleware = [
+ CorsHeaderMiddleware,
MozReviewCacheDisableMiddleware,
MozReviewUserProfileMiddleware,
]
def initialize(self):
self.original_opcode_generator = get_diff_opcode_generator_class()
set_diff_opcode_generator_class(NoFilterDiffOpcodeGenerator)
--- a/pylib/mozreview/mozreview/middleware.py
+++ b/pylib/mozreview/mozreview/middleware.py
@@ -1,8 +1,10 @@
+from django.conf import settings
+
from mozreview.models import get_profile, MozReviewUserProfile
class MozReviewUserProfileMiddleware(object):
"""Fetch the MozReviewUserProfile and attach it to the request object."""
def process_request(self, request):
if not request.user.is_authenticated():
@@ -34,9 +36,18 @@ class MozReviewCacheDisableMiddleware(ob
def process_response(self, request, response):
if (request.resolver_match and
request.resolver_match.url_name in self.URLNAME_BLACKLIST and
'ETag' in response):
# Clear the etag Review Board generated
del response['ETag']
- return response
\ No newline at end of file
+ return response
+
+
+class CorsHeaderMiddleware(object):
+ """Add a CORS header if running in debug mode."""
+
+ def process_response(self, request, response):
+ if settings.DEBUG:
+ response['Access-Control-Allow-Origin'] = '*'
+ return response
--- a/pylib/rbbz/rbbz/extension.py
+++ b/pylib/rbbz/rbbz/extension.py
@@ -30,26 +30,23 @@ from mozreview.extra_data import (
)
from mozreview.models import (
get_bugzilla_api_key,
)
from mozreview.rb_utils import (
get_obj_url,
)
from rbbz.auth import BugzillaBackend
-from rbbz.middleware import CorsHeaderMiddleware
from rbbz.resources import bugzilla_cookie_login_resource
logger = logging.getLogger(__name__)
class BugzillaExtension(Extension):
- middleware = [CorsHeaderMiddleware]
-
resources = [
bugzilla_cookie_login_resource,
]
def initialize(self):
AuthBackendHook(self, BugzillaBackend)
# Any abortable signal hooks that talk to Bugzilla should have
deleted file mode 100644
--- a/pylib/rbbz/rbbz/middleware.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-from django.conf import settings
-
-
-class CorsHeaderMiddleware(object):
- """Add a CORS header if running in debug mode."""
-
- def process_response(self, request, response):
- if settings.DEBUG:
- response['Access-Control-Allow-Origin'] = '*'
- return response