--- a/server/src/authentication/views.py Fri Jun 05 16:10:12 2015 +0200
+++ b/server/src/authentication/views.py Sat Jun 06 22:47:54 2015 +0200
@@ -9,7 +9,7 @@
from rest_framework.views import APIView
from ammico.views import populateVisit
-from config import URL_JAMESPOT
+from django.conf import settings
class UserSerializer(serializers.ModelSerializer):
@@ -21,21 +21,21 @@
get list user or add user
"""
permission_classes = (permissions.AllowAny,)
-
+
def get(self, request):
user = get_user_model().objects.all()
serializer = UserSerializer(user, many=True)
return Response(serializer.data)
-
+
def post(self, request):
VALID_USER_FIELDS = [f.name for f in get_user_model()._meta.fields]
serialized = UserSerializer(data=request.data)
-
+
if serialized.is_valid():
user_data = {field: data for (field, data) in request.DATA.items() if field in VALID_USER_FIELDS}
-
+
params = {'o': 'user', 'f': 'get', 'mail': user_data['email']}
- r = requests.get(URL_JAMESPOT, params=params)
+ r = requests.get(settings.URL_JAMESPOT, params=params)
infoUser = json.loads(r.content.decode('utf-8'))
if ('idUser' in infoUser['VAL']):
user_data.update({"idUser":infoUser['VAL']['idUser']})
@@ -45,7 +45,7 @@
return Response(UserSerializer(instance=user).data, status=status.HTTP_201_CREATED)
else:
return Response(serialized._errors, status=status.HTTP_400_BAD_REQUEST)
-
+
class ObtainAuthToken(APIView):
throttle_classes = ()
permission_classes = ()
@@ -57,4 +57,4 @@
if (user.idUser):
populateVisit(user)
token, _ = Token.objects.get_or_create(user=user)
- return Response({'token': token.key})
\ No newline at end of file
+ return Response({'token': token.key})