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

Minor fixes in auth services and invitations API

remotes/origin/enhancement/email-actions
David Barragán Merino 2014-07-21 14:35:44 +02:00
parent 346ee5e51e
commit a9453b97b7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
taiga/auth/services.py
View File

@ -87,9 +87,9 @@ def get_membership_by_token(token:str):
is raised. is raised.
""" """
membership_model = get_model("projects", "Membership") 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: if len(qs) == 0:
raise exc.NotFound("Token not matches any member.") raise exc.NotFound("Token not matches any valid invitation.")
return qs[0] return qs[0]
@ -129,7 +129,7 @@ def private_register_for_existing_user(token:str, username:str, password:str):
as existing user. 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 = get_membership_by_token(token)
membership.user = user membership.user = user

2
taiga/projects/api.py
View File

@ -167,7 +167,7 @@ class InvitationViewSet(RetrieveModelMixin, viewsets.ReadOnlyModelViewSet):
""" """
Only used by front for get invitation by it token. 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 serializer_class = serializers.MembershipSerializer
lookup_field = "token" lookup_field = "token"
permission_classes = (AllowAny,) permission_classes = (AllowAny,)