use invite token instead of id for invitation url

This commit is contained in:
dandds
2018-10-29 09:59:34 -04:00
parent b81a831c85
commit 151d5be5ea
7 changed files with 53 additions and 20 deletions

View File

@@ -1,5 +1,6 @@
import datetime
import pytest
import re
from atst.domain.invitations import Invitations, InvitationError
from atst.models.invitation import Status
@@ -15,6 +16,7 @@ def test_create_invitation():
assert invite.workspace == workspace
assert invite.inviter == workspace.owner
assert invite.status == Status.PENDING
assert re.match(r"^[\w\-_]+$", invite.token)
def test_accept_invitation():
@@ -22,7 +24,7 @@ def test_accept_invitation():
user = UserFactory.create()
invite = Invitations.create(workspace, workspace.owner, user)
assert invite.is_pending
accepted_invite = Invitations.accept(invite.id)
accepted_invite = Invitations.accept(invite.token)
assert accepted_invite.is_accepted
@@ -38,7 +40,7 @@ def test_accept_expired_invitation():
status=Status.PENDING,
)
with pytest.raises(InvitationError):
Invitations.accept(invite.id)
Invitations.accept(invite.token)
assert invite.is_rejected
@@ -50,7 +52,7 @@ def test_accept_rejected_invite():
workspace_id=workspace.id, user_id=user.id, status=Status.REJECTED
)
with pytest.raises(InvitationError):
Invitations.accept(invite.id)
Invitations.accept(invite.token)
def test_accept_revoked_invite():
@@ -60,4 +62,4 @@ def test_accept_revoked_invite():
workspace_id=workspace.id, user_id=user.id, status=Status.REVOKED
)
with pytest.raises(InvitationError):
Invitations.accept(invite.id)
Invitations.accept(invite.token)

View File

@@ -308,7 +308,7 @@ def test_new_member_accepts_valid_invite(client, user_session):
assert len(Workspaces.for_user(user)) == 0
user_session(user)
response = client.get(url_for("workspaces.accept_invitation", invite_id=invite.id))
response = client.get(url_for("workspaces.accept_invitation", token=invite.token))
# user is redirected to the workspace view
assert response.status_code == 302
@@ -333,7 +333,7 @@ def test_new_member_accept_invalid_invite(client, user_session):
status=InvitationStatus.REJECTED,
)
user_session(user)
response = client.get(url_for("workspaces.accept_invitation", invite_id=invite.id))
response = client.get(url_for("workspaces.accept_invitation", token=invite.token))
assert response.status_code == 404