API login function modifications

Zambom
1 parent 3c58e75f
Showing 1 changed file with 21 additions and 7 deletions Show diff stats
api/views.py
@@ -4,7 +4,7 @@ from django.contrib.auth import authenticate
 from django.views.decorators.csrf import csrf_exempt
 from rest_framework import viewsets
 from rest_framework.response import Response
-from rest_framework.decorators import detail_route
+from rest_framework.decorators import detail_route, list_route
 from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
  
 from security.models import Security
@@ -18,18 +18,32 @@ from django.http import HttpResponse
  
 class LoginViewset(viewsets.ReadOnlyModelViewSet):
 	queryset = User.objects.all()
-	permissions_classes = (IsAuthenticatedOrReadOnly,)
+	permissions_classes = (IsAuthenticated,)
  
 	@csrf_exempt
-	@detail_route(methods = ['post'])
+	@list_route(methods = ['POST'], permissions_classes = [IsAuthenticated])
 	def login(self, request):
-		username = request.DATA['email']
+		username = request.data['email']
  
-		user = get_object_or_404(self.queryset, email = username)
+		user = self.queryset.get(email = username)
  
-		serializer = UserSerializer(user)
+		if not user is None:
+			serializer = UserSerializer(user)
+
+			json_r = json.dumps(serializer.data)
+			json_r = json.loads(json_r)
+			print(type(serializer.data))
+
+			json_r["message"] = ""
+			json_r["type"] = ""
+			json_r["title"] = ""
+			json_r["success"] = True
+			json_r["number"] = 1
+			json_r['extra'] = 0
+
+			response = json.dumps(json_r)
  
-		return Response(serializer.data)
+		return HttpResponse(response)
  
 @csrf_exempt
 def getToken(request):
...	...	@@ -4,7 +4,7 @@ from django.contrib.auth import authenticate
4	4	from django.views.decorators.csrf import csrf_exempt
5	5	from rest_framework import viewsets
6	6	from rest_framework.response import Response
7		-from rest_framework.decorators import detail_route
	7	+from rest_framework.decorators import detail_route, list_route
8	8	from rest_framework.permissions import IsAuthenticated, IsAuthenticatedOrReadOnly
9	9
10	10	from security.models import Security
...	...	@@ -18,18 +18,32 @@ from django.http import HttpResponse
18	18
19	19	class LoginViewset(viewsets.ReadOnlyModelViewSet):
20	20	queryset = User.objects.all()
21		- permissions_classes = (IsAuthenticatedOrReadOnly,)
	21	+ permissions_classes = (IsAuthenticated,)
22	22
23	23	@csrf_exempt
24		- @detail_route(methods = ['post'])
	24	+ @list_route(methods = ['POST'], permissions_classes = [IsAuthenticated])
25	25	def login(self, request):
26		- username = request.DATA['email']
	26	+ username = request.data['email']
27	27
28		- user = get_object_or_404(self.queryset, email = username)
	28	+ user = self.queryset.get(email = username)
29	29
30		- serializer = UserSerializer(user)
	30	+ if not user is None:
	31	+ serializer = UserSerializer(user)
	32	+
	33	+ json_r = json.dumps(serializer.data)
	34	+ json_r = json.loads(json_r)
	35	+ print(type(serializer.data))
	36	+
	37	+ json_r["message"] = ""
	38	+ json_r["type"] = ""
	39	+ json_r["title"] = ""
	40	+ json_r["success"] = True
	41	+ json_r["number"] = 1
	42	+ json_r['extra'] = 0
	43	+
	44	+ response = json.dumps(json_r)
31	45
32		- return Response(serializer.data)
	46	+ return HttpResponse(response)
33	47
34	48	@csrf_exempt
35	49	def getToken(request):
...	...