CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-12 21:04:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

decorators: Use @has_request_variables to extract client.

Browse Source 
(imported from commit 8407a556fcc1922d69e593edee3897957742f3fb)
This commit is contained in:
Tim Abbott 2012-11-28 15:15:50 -05:00
parent 4024306613
commit 16b1f63800
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
zephyr/decorator.py
View File

@ -27,12 +27,6 @@ def asynchronous(method):
# I like the all-lowercase name better
require_post = require_POST
def parse_client(request, default):
client_name = default
if 'client' in request.POST:
client_name = request.POST['client']
return get_client(client_name)
def update_user_activity(request, user_profile, client):
current_time = now()
try:
@ -59,6 +53,7 @@ def authenticated_api_view(view_func):
@has_request_variables
@wraps(view_func)
def _wrapped_view_func(request, email=POST, api_key=POST('api-key'),
client=POST(default=get_client("API"), converter=get_client),
*args, **kwargs):
try:
user_profile = UserProfile.objects.get(user__email=email)
@ -66,8 +61,8 @@ def authenticated_api_view(view_func):
return json_error("Invalid user: %s" % (email,))
if api_key != user_profile.api_key:
return json_error("Invalid API key for user '%s'" % (email,))
request._client = parse_client(request, "API")
update_user_activity(request, user_profile, request._client)
request._client = client
update_user_activity(request, user_profile, client)
return view_func(request, user_profile, *args, **kwargs)
return _wrapped_view_func
@ -76,13 +71,16 @@ def authenticated_api_view(view_func):
# redirecting to a login page doesn't make sense for json views)
def authenticated_json_view(view_func):
@require_post
@has_request_variables
@wraps(view_func)
def _wrapped_view_func(request, *args, **kwargs):
def _wrapped_view_func(request,
client=POST(default=get_client("website"), converter=get_client),
*args, **kwargs):
if not request.user.is_authenticated():
return json_error("Not logged in", status=401)
request._client = parse_client(request, "website")
request._client = client
user_profile = request.user.userprofile
update_user_activity(request, user_profile, request._client)
update_user_activity(request, user_profile, client)
return view_func(request, user_profile, *args, **kwargs)
return _wrapped_view_func