Download as
Browse Code »

Commit dba43d19409a9edda4cfd9594b8c39ce986b806d

Authored by Zambom
1 parent 704baa74
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adding api function to login user

Showing 2 changed files with 5 additions and 9 deletions   Show diff stats
@@ -17,5 +17,5 @@ router.register(r'users', views.LoginViewset) @@ -17,5 +17,5 @@ router.register(r'users', views.LoginViewset)
17 urlpatterns = [ 17 urlpatterns = [
18 #API REST 18 #API REST
19 url(r'^', include(router.urls)), 19 url(r'^', include(router.urls)),
20 - url(r'^token', views.getToken), 20 + url(r'^token$', views.getToken),
21 ] 21 ]
22 \ No newline at end of file 22 \ No newline at end of file
@@ -23,16 +23,12 @@ class LoginViewset(viewsets.ReadOnlyModelViewSet): @@ -23,16 +23,12 @@ class LoginViewset(viewsets.ReadOnlyModelViewSet):
23 @detail_route(methods = ['post']) 23 @detail_route(methods = ['post'])
24 def login(self, request): 24 def login(self, request):
25 username = request.DATA['email'] 25 username = request.DATA['email']
26 - password = request.DATA['password']  
27 - user = authenticate(username = username, password = password) 26 +
  27 + user = get_object_or_404(self.queryset, email = username)
28 28
29 - if user is not None:  
30 - if not security.maintence or user.is_staff:  
31 - serializer = UserSerializer(user) 29 + serializer = UserSerializer(user)
32 30
33 - return Response(serializer.data)  
34 -  
35 - return Response() 31 + return Response(serializer.data)
36 32
37 def getToken(request): 33 def getToken(request):
38 oauth = Application.objects.filter(name = "amadeus-droid") 34 oauth = Application.objects.filter(name = "amadeus-droid")