diff --git a/access/serializers.py b/access/serializers.py index 5a3dafa..756c3b1 100644 --- a/access/serializers.py +++ b/access/serializers.py @@ -59,7 +59,7 @@ class UserSelfSerializer(serializers.ModelSerializer): class Meta: model = get_user_model() fields = ('id', 'email', 'first_name', 'last_name', 'progress', 'achievements', - 'account', 'groups', 'is_staff', 'is_superuser', 'diplomas') + 'account', 'groups', 'is_staff', 'is_superuser', 'diplomas', 'is_active') @staticmethod def get_diplomas(self): diff --git a/access/urls.py b/access/urls.py index 39dafea..ab8f2b6 100644 --- a/access/urls.py +++ b/access/urls.py @@ -7,7 +7,6 @@ urlpatterns = [ url(r'detail/([0-9]{1,99})/$', views.DetailUserView.as_view()), url(r'guard/(?P[0-9]{1,99})/(?P.+)/$', views.UserGuardView.as_view()), url(r'find/$', views.FindUserView.as_view()), - url(r'check/$', views.CheckUserView.as_view()), url(r'registration/$', views.RegistrationView.as_view()), url(r'change_password/$', views.ChangePasswordView.as_view()), url(r'login/$', views.LoginView.as_view()), diff --git a/access/views.py b/access/views.py index 51bf92c..6926379 100644 --- a/access/views.py +++ b/access/views.py @@ -24,18 +24,6 @@ class TeacherListView(APIView): return Response([i.email for i in get_user_model().objects.filter(groups__name='teachers')], self.status_code) -class CheckUserView(APIView): - renderer_classes = (JSONRenderer,) - - @staticmethod - def get(request): - if request.user.is_authenticated() and request.user.is_staff or request.user.is_superuser: - return Response('staff', status=200) - if request.user.is_authenticated(): - return Response('auth', status=200) - return Response('anonymous', status=200) - - class ResetPasswordView(APIView): renderer_classes = (JSONRenderer,) @@ -197,7 +185,11 @@ class LoginView(APIView): auth.login(request, user) except AttributeError: return Response("Неверный пароль", status=404) - return Response(UserSelfSerializer(request.user).data, status=200) + + serialized_user = UserSelfSerializer(user).data + serialized_user['is_i'] = True + + return Response(serialized_user, status=200) class LogoutView(APIView):