- refactoring: change response format

Author: koladev32

api/authentication/backends.py

@@ -42,11 +42,17 @@ def _authenticate_credentials(self, token):
         try:
             user = active_session.user
         except User.DoesNotExist:
-            msg = 'No user matching this token was found.'
+            msg = {
+                "success": False,
+                "msg": 'No user matching this token was found.'
+            }
             raise exceptions.AuthenticationFailed(msg)
 
         if not user.is_active:
-            msg = 'This user has been deactivated.'
+            msg = {
+                "success": False,
+                "msg": 'This user has been deactivated.'
+            }
             raise exceptions.AuthenticationFailed(msg)
 
         return (user, token)

api/authentication/serializers/login.py

@@ -30,11 +30,17 @@ def validate(self, data):
 
         if email is None:
             raise serializers.ValidationError(
-                'An email address is required to log in.'
+                {
+                    "success": False,
+                    "msg": "Email is required to login"
+                }
             )
         if password is None:
             raise serializers.ValidationError(
-                'A password is required to log in.'
+                {
+                    "success": False,
+                    "msg": "Password is required to log in."
+                }
             )
         user = authenticate(username=email, password=password)
 
@@ -48,7 +54,10 @@ def validate(self, data):
 
         if not user.is_active:
             raise serializers.ValidationError(
-                'This user has been deactivated.'
+                {
+                    "success": False,
+                    "msg": "User is not active"
+                }
             )
 
         try:

api/authentication/serializers/register.py

@@ -20,5 +20,8 @@ def create(self, validated_data):
         except ObjectDoesNotExist:
             return User.objects.create_user(**validated_data)
 
-        raise ValidationError({"user": "A user with this email address already exists."})
-
+        raise ValidationError({
+            "success": False,
+            "msg": "Email already taken"
+            }
+        )

api/authentication/viewsets/logout.py

@@ -16,5 +16,6 @@ def create(self, request, *args, **kwargs):
         session.delete()
 
         return Response({
-            "success": True
+            "success": True,
+            "msg": "Token revoked"
         }, status=status.HTTP_200_OK)

api/authentication/viewsets/register.py

@@ -16,8 +16,6 @@ def create(self, request, *args, **kwargs):
         serializer.is_valid(raise_exception=True)
         user = serializer.save()
 
-        print(user.id)
-
         return Response(
             {
                 "success": True,

api/user/viewsets.py

@@ -11,6 +11,11 @@ class UserViewSet(viewsets.GenericViewSet, mixins.CreateModelMixin, mixins.Updat
     serializer_class = UserSerializer
     permission_classes = (IsAuthenticated,)
 
+    error_message = {
+                "success": False,
+                "msg": "Error updating user"
+            }
+
     def update(self, request, *args, **kwargs):
         partial = kwargs.pop('partial', True)
         instance = User.objects.get(id=request.data.get('userID'))
@@ -27,14 +32,10 @@ def create(self, request, *args, **kwargs):
         user_id = request.data.get('userID')
 
         if not user_id:
-            raise ValidationError({"user": "Precise an ID."})
+            raise ValidationError(self.error_message)
 
         if self.request.user.pk != user_id and not self.request.user.is_superuser:
-
-            raise ValidationError({
-                "success": False,
-                "msg": "Error updating user"
-            })
+            raise ValidationError(self.error_message)
         self.update(request)
 
         return Response({