diff options
| author | Carlton Gibson | 2014-11-28 14:24:19 +0100 | 
|---|---|---|
| committer | Carlton Gibson | 2014-11-28 14:24:19 +0100 | 
| commit | a741418f5062d8dea76145fdf656c10b51fd982d (patch) | |
| tree | 193c36d2b6ad1734af641746c564734a9df77da2 | |
| parent | 66b3daebbd0da8aee178585cae9ebe561494533e (diff) | |
| parent | d9a09f7826d7faf7e6bfa10fc83e0b7db4689a72 (diff) | |
| download | django-rest-framework-a741418f5062d8dea76145fdf656c10b51fd982d.tar.bz2 | |
Merge pull request #2153 from maryokhin/patch-1
Update token auth view. Closes #2151.
| -rw-r--r-- | rest_framework/authtoken/views.py | 14 | 
1 files changed, 5 insertions, 9 deletions
| diff --git a/rest_framework/authtoken/views.py b/rest_framework/authtoken/views.py index 103abb27..b75c2e25 100644 --- a/rest_framework/authtoken/views.py +++ b/rest_framework/authtoken/views.py @@ -1,5 +1,4 @@  from rest_framework.views import APIView -from rest_framework import status  from rest_framework import parsers  from rest_framework import renderers  from rest_framework.response import Response @@ -12,16 +11,13 @@ class ObtainAuthToken(APIView):      permission_classes = ()      parser_classes = (parsers.FormParser, parsers.MultiPartParser, parsers.JSONParser,)      renderer_classes = (renderers.JSONRenderer,) -    serializer_class = AuthTokenSerializer -    model = Token      def post(self, request): -        serializer = self.serializer_class(data=request.data) -        if serializer.is_valid(): -            user = serializer.validated_data['user'] -            token, created = Token.objects.get_or_create(user=user) -            return Response({'token': token.key}) -        return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) +        serializer = AuthTokenSerializer(data=request.data) +        serializer.is_valid(raise_exception=True) +        user = serializer.validated_data['user'] +        token, created = Token.objects.get_or_create(user=user) +        return Response({'token': token.key})  obtain_auth_token = ObtainAuthToken.as_view() | 
