External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 12:41:19 -03:30
Code Issues Packages Projects Releases Wiki Activity

More for AC-694, use the new rest framework materialized user

Browse Source
This commit is contained in:
Matthew Jones 2013-11-20 00:43:27 -05:00
parent d564d73622
commit 4bc15a4392
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
awx/main/middleware.py
View File

@ -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: