From faa75c45b3506461dac161805c4eca5162ca738d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jes=C3=BAs=20Espino?= <jesus.espino@kaleidos.net>
Date: Thu, 28 Mar 2013 08:28:44 +0100
Subject: [PATCH] Reestructuring the base api

---
 greenmine/base/{views.py => api.py} | 5 +++--
 greenmine/base/urls.py              | 2 +-
 greenmine/urls.py                   | 2 --
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename greenmine/base/{views.py => api.py} (95%)

diff --git a/greenmine/base/views.py b/greenmine/base/api.py
similarity index 95%
rename from greenmine/base/views.py
rename to greenmine/base/api.py
index 0c26a0a6..cb0050a9 100644
--- a/greenmine/base/views.py
+++ b/greenmine/base/api.py
@@ -9,6 +9,7 @@ from rest_framework.parsers import JSONParser
 from rest_framework.reverse import reverse
 from rest_framework.views import APIView
 from rest_framework.response import Response
+from rest_framework import status
 
 from greenmine.base.serializers import LoginSerializer, UserLogged
 from greenmine.base.models import User
@@ -69,10 +70,10 @@ class Login(APIView):
         except User.DoesNotExist:
             pass
 
-        return http.HttpResponseBadRequest()
+        return Response({"detail": "Invalid username or password"}, status.HTTP_400_BAD_REQUEST)
 
 
 class Logout(APIView):
     def post(self, request, format=None):
         logout(request)
-        return http.HttpResponse()
+        return Response()
diff --git a/greenmine/base/urls.py b/greenmine/base/urls.py
index c810451b..bb309594 100644
--- a/greenmine/base/urls.py
+++ b/greenmine/base/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, url
 from rest_framework.urlpatterns import format_suffix_patterns
 
-from greenmine.base.views import Login, Logout, ApiRoot
+from greenmine.base.api import Login, Logout, ApiRoot
 
 urlpatterns = format_suffix_patterns(patterns('',
     url(r'^auth/login/$', Login.as_view(), name='login'),
diff --git a/greenmine/urls.py b/greenmine/urls.py
index 765712e2..4136a7e7 100644
--- a/greenmine/urls.py
+++ b/greenmine/urls.py
@@ -3,8 +3,6 @@ from django.conf.urls import patterns, include, url
 from django.contrib import admin
 admin.autodiscover()
 
-from greenmine.base.views import ApiRoot
-
 urlpatterns = patterns('',
     url(r'^api/', include('greenmine.base.urls')),
     url(r'^api/scrum/', include('greenmine.scrum.urls')),