From 4bc15a4392e6c656774a5b8172e5cde8a39ad850 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Wed, 20 Nov 2013 00:43:27 -0500 Subject: [PATCH] More for AC-694, use the new rest framework materialized user --- awx/main/middleware.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/awx/main/middleware.py b/awx/main/middleware.py index 4813f9a67c..f6ed0dc69b 100644 --- a/awx/main/middleware.py +++ b/awx/main/middleware.py @@ -26,28 +26,13 @@ class ActivityStreamMiddleware(object): def process_response(self, request, response): drf_request = getattr(request, 'drf_request', None) drf_user = getattr(drf_request, 'user', None) - # FIXME: Associate the user above from Django REST framework with instances. post_save.disconnect(dispatch_uid=self.disp_uid) self.finished = True if self.isActivityStreamEvent: for instance in self.instances: - if self.cached_user is not None: - instance.user = self.cached_user + if drf_user is not None: + instance.user = drf_user instance.save() - elif "current_user" in request.COOKIES and "id" in request.COOKIES["current_user"]: - userInfo = json.loads(urllib2.unquote(request.COOKIES['current_user']).decode('utf8')) - userActual = User.objects.get(id=int(userInfo['id'])) - self.cached_user = userActual - instance.user = self.cached_user - instance.save() - elif "HTTP_AUTHORIZATION" in request.META: - token_actual = request.META['HTTP_AUTHORIZATION'] - token_actual = token_actual.split(" ")[1] - matching_tokens = AuthToken.objects.filter(key=token_actual) - if matching_tokens.exists(): - self.cached_user = matching_tokens[0].user - instance.user = self.cached_user - instance.save() else: obj1_type_actual = instance.object1_type.split(".")[-1] if obj1_type_actual in ("InventoryUpdate", "ProjectUpdate", "JobEvent", "Job") and instance.id is not None: