From a9453b97b7ebd23f7c20c54f7926390887cc075f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Mon, 21 Jul 2014 14:35:44 +0200 Subject: [PATCH] Minor fixes in auth services and invitations API --- taiga/auth/services.py | 6 +++--- taiga/projects/api.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/taiga/auth/services.py b/taiga/auth/services.py index cebc24e6..665c6801 100644 --- a/taiga/auth/services.py +++ b/taiga/auth/services.py @@ -87,9 +87,9 @@ def get_membership_by_token(token:str): is raised. """ membership_model = get_model("projects", "Membership") - qs = membership_model.objects.filter(token=token) + qs = membership_model.objects.filter(user__isnull=True, token=token) if len(qs) == 0: - raise exc.NotFound("Token not matches any member.") + raise exc.NotFound("Token not matches any valid invitation.") return qs[0] @@ -129,7 +129,7 @@ def private_register_for_existing_user(token:str, username:str, password:str): as existing user. """ - user = get_and_validate_user(username=username, password=password) + user = get_and_validate_user(username=username, email=username, password=password) membership = get_membership_by_token(token) membership.user = user diff --git a/taiga/projects/api.py b/taiga/projects/api.py index 065cfc42..4993a82d 100644 --- a/taiga/projects/api.py +++ b/taiga/projects/api.py @@ -167,7 +167,7 @@ class InvitationViewSet(RetrieveModelMixin, viewsets.ReadOnlyModelViewSet): """ Only used by front for get invitation by it token. """ - queryset = models.Membership.objects.all() + queryset = models.Membership.objects.filter(user__isnull=True) serializer_class = serializers.MembershipSerializer lookup_field = "token" permission_classes = (AllowAny,)