--- a/server/authentication/views.py	Tue Jun 02 09:46:55 2015 +0200
+++ b/server/authentication/views.py	Thu Jun 04 20:03:04 2015 +0200
@@ -5,12 +5,11 @@
 import requests
 from rest_framework import serializers, status, permissions, parsers, renderers
 from rest_framework.authtoken.models import Token
-from rest_framework.authtoken.serializers import AuthTokenSerializer
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from ammico.views import populateVisit
 from config import URL_JAMESPOT
-from ammico.views import populateVisit
 
 
 class UserSerializer(serializers.ModelSerializer):
@@ -31,11 +30,6 @@
         
     def post(self, request):
         VALID_USER_FIELDS = [f.name for f in get_user_model()._meta.fields]
-        DEFAULTS = {
-            "groups":"",
-            "user_permissions":""
-        }
-        request.data.update(DEFAULTS)
         serialized = UserSerializer(data=request.data)
         
         if serialized.is_valid():
@@ -60,10 +54,8 @@
     renderer_classes = (renderers.JSONRenderer,)
 
     def post(self, request):
-        serializer = AuthTokenSerializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        user = serializer.validated_data['user']
+        user = get_user_model().objects.get(email = request.data['email'], password = request.data['password'])
         if (user.idUser):
             populateVisit(user)
-        token, created = Token.objects.get_or_create(user=user)
+        token, _ = Token.objects.get_or_create(user=user)
         return Response({'token': token.key})
\ No newline at end of file