taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Now LoginView and LogoutView are AuthView

remotes/origin/enhancement/email-actions
Andrey Antukh 2013-10-03 11:03:06 +02:00
parent 4375f98276
commit ec61beb1ed
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
greenmine/base/users/api.py
View File

@ -32,7 +32,7 @@ class RolesViewSet(viewsets.ViewSet):
try: try:
role = Role.objects.get(pk=pk) role = Role.objects.get(pk=pk)
except Role.DoesNotExist: except Role.DoesNotExist:
raise excp.NotFound() raise exc.NotFound()
serializer = self.serializer_class(role) serializer = self.serializer_class(role)
return Response(serializer.data) return Response(serializer.data)
@ -88,7 +88,7 @@ class UsersViewSet(viewsets.ViewSet):
return Response({"detail": "Mail sended successful!"}) return Response({"detail": "Mail sended successful!"})
class LoginViewSet(viewsets.ViewSet): class AuthViewSet(viewsets.ViewSet):
permission_classes = (AllowAny,) permission_classes = (AllowAny,)
def create(self, request, **kwargs): def create(self, request, **kwargs):
@ -98,12 +98,10 @@ class LoginViewSet(viewsets.ViewSet):
try: try:
user = User.objects.get(username=username) user = User.objects.get(username=username)
except User.DoesNotExist: except User.DoesNotExist:
return Response({"detail": "Invalid username or password"}, raise exc.BadRequest("Invalid username or password")
status.HTTP_400_BAD_REQUEST)
if not user.check_password(password): if not user.check_password(password):
return Response({"detail": "Invalid username or password"}, raise exc.BadRequest("Invalid username or password")
status.HTTP_400_BAD_REQUEST)
user = authenticate(username=username, password=password) user = authenticate(username=username, password=password)
login(request, user) login(request, user)
@ -111,19 +109,8 @@ class LoginViewSet(viewsets.ViewSet):
serializer = UserSerializer(user) serializer = UserSerializer(user)
response_data = serializer.data response_data = serializer.data
response_data["token"] = request.session.session_key response_data["token"] = request.session.session_key
return Response(response_data) return Response(response_data)
def destroy(self, request, pk=None):
class LogoutViewSet(viewsets.ViewSet):
permission_classes = (IsAuthenticated,)
def list(self, request, **kwargs):
return self.logout(request)
def create(self, request, **kwargs):
return self.logout(request)
def logout(self, request):
logout(request) logout(request)
return Response({}) return Response({})