paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-17 12:21:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use json_error rather than HttpResponseBadRequest and friends.

Browse Source 
(imported from commit a9f6df2e561218db46f4ade86bac1ecd87b6ca78)
This commit is contained in:
Tim Abbott
2012-10-30 14:38:22 -04:00
parent 9fa2f0d4f8
commit c00e37c106
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zephyr/views.py
View File

@@ -40,7 +40,7 @@ SERVER_GENERATION = int(time.time())
def require_post(view_func): def require_post(view_func):
def _wrapped_view_func(request, *args, **kwargs): def _wrapped_view_func(request, *args, **kwargs):
if request.method != "POST": if request.method != "POST":
return HttpResponseBadRequest('This form can only be submitted by POST.') return json_error('This form can only be submitted by POST.')
return view_func(request, *args, **kwargs) return view_func(request, *args, **kwargs)
return _wrapped_view_func return _wrapped_view_func
@@ -80,8 +80,8 @@ def json_response(res_type="success", msg="", data={}, status=200):
def json_success(data={}): def json_success(data={}):
return json_response(data=data) return json_response(data=data)
def json_error(msg, data={}): def json_error(msg, data={}, status=400):
return json_response(res_type="error", msg=msg, data=data, status=400) return json_response(res_type="error", msg=msg, data=data, status=status)
def get_stream(stream_name, realm): def get_stream(stream_name, realm):
stream = Stream.objects.filter(name__iexact=stream_name, realm=realm) stream = Stream.objects.filter(name__iexact=stream_name, realm=realm)
@@ -862,12 +862,12 @@ def api_fetch_api_key(request):
username = request.POST['username'] username = request.POST['username']
password = request.POST['password'] password = request.POST['password']
except KeyError: except KeyError:
return HttpResponseBadRequest("You must specify the username and password via POST.") return json_error("You must specify the username and password via POST.")
user = authenticate(username=username, password=password) user = authenticate(username=username, password=password)
if user is None: if user is None:
return HttpResponseForbidden("Your username or password is incorrect.") return json_error("Your username or password is incorrect.", status=403)
if not user.is_active: if not user.is_active:
return HttpResponseForbidden("Your account has been disabled.") return json_error("Your account has been disabled.", status=403)
return HttpResponse(user.userprofile.api_key) return HttpResponse(user.userprofile.api_key)
@login_required_json_view @login_required_json_view