aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework
diff options
context:
space:
mode:
authorMarko Tibold2012-11-30 11:58:10 -0800
committerMarko Tibold2012-11-30 11:58:10 -0800
commit52b12434d0d8efd3159bc21e966528103f3292f5 (patch)
tree0dcb79acc2d2bba29792b21b77feaea7bda93a0c /rest_framework
parent8d485da483c2a5cc0713a65ef30606966c082327 (diff)
parent1b9d0eefba07cb3567ad7dbeb72c4c3b3c1f0de3 (diff)
downloaddjango-rest-framework-52b12434d0d8efd3159bc21e966528103f3292f5.tar.bz2
Merge pull request #458 from asfaltboy/fix_authtoken_response
Fix authtoken response
Diffstat (limited to 'rest_framework')
-rw-r--r--rest_framework/authtoken/views.py2
-rw-r--r--rest_framework/tests/authentication.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py
index 3ac674e2..cfaacbe9 100644
--- a/rest_framework/authtoken/views.py
+++ b/rest_framework/authtoken/views.py
@@ -18,7 +18,7 @@ class ObtainAuthToken(APIView):
if serializer.is_valid():
token, created = Token.objects.get_or_create(user=serializer.object['user'])
return Response({'token': token.key})
- return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
+ return Response(serializer.errors, status=status.HTTP_401_UNAUTHORIZED)
obtain_auth_token = ObtainAuthToken.as_view()
diff --git a/rest_framework/tests/authentication.py b/rest_framework/tests/authentication.py
index 96ca9f52..802bc6c1 100644
--- a/rest_framework/tests/authentication.py
+++ b/rest_framework/tests/authentication.py
@@ -167,14 +167,14 @@ class TokenAuthTests(TestCase):
client = Client(enforce_csrf_checks=True)
response = client.post('/auth-token/login/',
json.dumps({'username': self.username, 'password': "badpass"}), 'application/json')
- self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.status_code, 401)
def test_token_login_json_missing_fields(self):
"""Ensure token login view using JSON POST fails if missing fields."""
client = Client(enforce_csrf_checks=True)
response = client.post('/auth-token/login/',
json.dumps({'username': self.username}), 'application/json')
- self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.status_code, 401)
def test_token_login_form(self):
"""Ensure token login view using form POST works."""