more fine-grained errors for invalid invitations

tests/domain/test_invitations.py

@@ -2,7 +2,12 @@ import datetime
 import pytest
 import re
 
-from atst.domain.invitations import Invitations, InvitationError, WrongUserError
+from atst.domain.invitations import (
+    Invitations,
+    InvitationError,
+    WrongUserError,
+    ExpiredError,
+)
 from atst.models.invitation import Status
 
 from tests.factories import (
@@ -42,7 +47,7 @@ def test_accept_expired_invitation():
     invite = InvitationFactory.create(
         user_id=user.id, expiration_time=expiration_time, status=Status.PENDING
     )
-    with pytest.raises(InvitationError):
+    with pytest.raises(ExpiredError):
         Invitations.accept(user, invite.token)
 
     assert invite.is_rejected
@@ -69,3 +74,12 @@ def test_wrong_user_accepts_invitation():
     with pytest.raises(WrongUserError):
         Invitations.accept(wrong_user, invite.token)
 
+
+def test_accept_invitation_twice():
+    workspace = WorkspaceFactory.create()
+    user = UserFactory.create()
+    ws_role = WorkspaceRoleFactory.create(user=user, workspace=workspace)
+    invite = Invitations.create(ws_role, workspace.owner, user)
+    Invitations.accept(user, invite.token)
+    with pytest.raises(InvitationError):
+        Invitations.accept(user, invite.token)

tests/routes/test_workspaces.py

@@ -1,3 +1,4 @@
+import datetime
 from flask import url_for
 
 from tests.factories import (
@@ -333,10 +334,7 @@ def test_new_member_accepts_valid_invite(client, user_session):
     user_session(workspace.owner)
     client.post(
         url_for("workspaces.create_member", workspace_id=workspace.id),
-        data={
-            "workspace_role": "developer",
-            **user_info,
-        }
+        data={"workspace_role": "developer", **user_info},
     )
 
     user = Users.get_by_dod_id(user_info["dod_id"])
@@ -394,10 +392,26 @@ def test_user_accepts_invite_with_wrong_dod_id(client, user_session):
     ws_role = WorkspaceRoleFactory.create(
         user=user, workspace=workspace, status=WorkspaceRoleStatus.PENDING
     )
-    invite = InvitationFactory.create(
-        user_id=user.id, workspace_role_id=ws_role.id
-    )
+    invite = InvitationFactory.create(user_id=user.id, workspace_role_id=ws_role.id)
     user_session(different_user)
     response = client.get(url_for("workspaces.accept_invitation", token=invite.token))
 
     assert response.status_code == 404
+
+
+def test_user_accepts_expired_invite(client, user_session):
+    workspace = WorkspaceFactory.create()
+    user = UserFactory.create()
+    ws_role = WorkspaceRoleFactory.create(
+        user=user, workspace=workspace, status=WorkspaceRoleStatus.PENDING
+    )
+    invite = InvitationFactory.create(
+        user_id=user.id,
+        workspace_role_id=ws_role.id,
+        status=InvitationStatus.REJECTED,
+        expiration_time=datetime.datetime.now() - datetime.timedelta(seconds=1),
+    )
+    user_session(user)
+    response = client.get(url_for("workspaces.accept_invitation", token=invite.token))
+
+    assert response.status_code == 404