From 44e0f33b25e56434bc28038ca6336e5b0a9d4217 Mon Sep 17 00:00:00 2001 From: Mateusz Sikora Date: Fri, 30 May 2014 11:17:25 +0200 Subject: [PATCH] make IS_TEST not required, enhancement in Login view --- rest_auth/urls.py | 9 +-------- rest_auth/views.py | 6 ++++-- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/rest_auth/urls.py b/rest_auth/urls.py index c83cd72..b51bc1e 100644 --- a/rest_auth/urls.py +++ b/rest_auth/urls.py @@ -27,13 +27,6 @@ urlpatterns = patterns('rest_auth.views', name='rest_password_change'), ) -if settings.DEBUG and not settings.IS_TEST: - urlpatterns += patterns('', - # Swagger Docs - url(r'^docs/', - include('rest_framework_swagger.urls')), - ) - -if settings.IS_TEST: +if getattr(settings, 'IS_TEST', False): from django.contrib.auth.tests import urls urlpatterns += patterns('', url(r'^test-admin/', include(urls))) diff --git a/rest_auth/views.py b/rest_auth/views.py index 7f01f5f..b83e976 100644 --- a/rest_auth/views.py +++ b/rest_auth/views.py @@ -68,6 +68,8 @@ class Login(LoggedOutRESTAPIView, GenericAPIView): """ serializer_class = LoginSerializer + token_model = Token + token_serializer = TokenSerializer def post(self, request): # Create a serializer with request.DATA @@ -86,8 +88,8 @@ class Login(LoggedOutRESTAPIView, GenericAPIView): login(request, user) # Return REST Token object with OK HTTP status - token, created = Token.objects.get_or_create(user=user) - return Response(TokenSerializer(token).data, + token, created = self.token_model.objects.get_or_create(user=user) + return Response(self.token_serializer(token).data, status=status.HTTP_200_OK) else: return Response({'error': 'This account is disabled.'},