Skip to content

Commit

Permalink
fix 'User already exists' when updating an accepted invitation
Browse files Browse the repository at this point in the history
ensure only pending invitations can be updated
  • Loading branch information
kelvin-muchiri committed Jul 20, 2023
1 parent a1fa983 commit c3b2b0b
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 4 deletions.
22 changes: 22 additions & 0 deletions onadata/apps/api/tests/viewsets/test_project_viewset.py
Original file line number Diff line number Diff line change
Expand Up @@ -3152,6 +3152,28 @@ def test_update_email_only(self):
},
)

def test_only_pending_allowed(self):
"""Only pending invitation can be updated"""
for value, _ in ProjectInvitation.Status.choices:
invitation = self.project.invitations.create(
email=f"jandoe-{value}@example.com",
role="editor",
status=value,
)
payload = {
"email": "[email protected]",
"role": "readonly",
"invitation_id": invitation.id,
}
request = self.factory.put("/", data=payload, **self.extra)
response = self.view(request, pk=self.project.pk)

if value == ProjectInvitation.Status.PENDING:
self.assertEqual(response.status_code, 200)

else:
self.assertEqual(response.status_code, 400)


class RevokeInvitationTestCase(TestAbstractViewSet):
"""Tests for revoke invitation"""
Expand Down
17 changes: 13 additions & 4 deletions onadata/libs/serializers/project_invitation_serializer.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ def validate_email(self, email):
]:
raise serializers.ValidationError(_(err_msg))

# email should not be of an existing user
if User.objects.filter(email=email).exists():
raise serializers.ValidationError(_("User already exists"))

return email

def validate_role(self, role):
Expand All @@ -73,6 +69,10 @@ def create(self, validated_data):
).exists():
raise serializers.ValidationError(_("Invitation already exists."))

# email should not be of an existing user
if User.objects.filter(email=validated_data["email"]).exists():
raise serializers.ValidationError(_("User already exists"))

instance = super().create(validated_data)
instance.invited_by = self.context["request"].user
instance.save()
Expand All @@ -81,6 +81,15 @@ def create(self, validated_data):

return instance

def update(self, instance, validated_data):
# only a pending invitation can be updated
if instance.status != ProjectInvitation.Status.PENDING:
raise serializers.ValidationError(
_("Only pending invitations can be updated")
)

return super().update(instance, validated_data)


# pylint: disable=abstract-method
class ProjectInvitationUpdateBaseSerializer(serializers.Serializer):
Expand Down

0 comments on commit c3b2b0b

Please sign in to comment.