Reestructuring the base api
parent
6e3f9d63a3
commit
faa75c45b3
|
@ -9,6 +9,7 @@ from rest_framework.parsers import JSONParser
|
||||||
from rest_framework.reverse import reverse
|
from rest_framework.reverse import reverse
|
||||||
from rest_framework.views import APIView
|
from rest_framework.views import APIView
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
|
from rest_framework import status
|
||||||
|
|
||||||
from greenmine.base.serializers import LoginSerializer, UserLogged
|
from greenmine.base.serializers import LoginSerializer, UserLogged
|
||||||
from greenmine.base.models import User
|
from greenmine.base.models import User
|
||||||
|
@ -69,10 +70,10 @@ class Login(APIView):
|
||||||
except User.DoesNotExist:
|
except User.DoesNotExist:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
return http.HttpResponseBadRequest()
|
return Response({"detail": "Invalid username or password"}, status.HTTP_400_BAD_REQUEST)
|
||||||
|
|
||||||
|
|
||||||
class Logout(APIView):
|
class Logout(APIView):
|
||||||
def post(self, request, format=None):
|
def post(self, request, format=None):
|
||||||
logout(request)
|
logout(request)
|
||||||
return http.HttpResponse()
|
return Response()
|
|
@ -1,7 +1,7 @@
|
||||||
from django.conf.urls import patterns, url
|
from django.conf.urls import patterns, url
|
||||||
from rest_framework.urlpatterns import format_suffix_patterns
|
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('',
|
urlpatterns = format_suffix_patterns(patterns('',
|
||||||
url(r'^auth/login/$', Login.as_view(), name='login'),
|
url(r'^auth/login/$', Login.as_view(), name='login'),
|
||||||
|
|
|
@ -3,8 +3,6 @@ from django.conf.urls import patterns, include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
from greenmine.base.views import ApiRoot
|
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
url(r'^api/', include('greenmine.base.urls')),
|
url(r'^api/', include('greenmine.base.urls')),
|
||||||
url(r'^api/scrum/', include('greenmine.scrum.urls')),
|
url(r'^api/scrum/', include('greenmine.scrum.urls')),
|
||||||
|
|
Loading…
Reference in New Issue