From cdfea6d3f0de9367b2e4875cef4a99bd3ea71b32 Mon Sep 17 00:00:00 2001
From: Rafiuzzaman Khan <rafiuzzamank@gmail.com>
Date: Thu, 18 Jun 2026 17:26:38 -0400
Subject: [PATCH 1/3] add delete invite feature

---
 exceptions/http_exceptions.py                 |   7 +
 routers/core/invitation.py                    |  73 +++++++-
 static/css/extras.css                         |  15 ++
 .../organization/modals/members_card.html     |  22 +--
 .../partials/invitations_list.html            |  19 +-
 .../organization/partials/members_table.html  |  21 +--
 tests/routers/core/test_invitation.py         | 177 ++++++++++++++++++
 tests/test_htmx.py                            |  62 ++++++
 8 files changed, 358 insertions(+), 38 deletions(-)

diff --git a/exceptions/http_exceptions.py b/exceptions/http_exceptions.py
index 6f4dcf1..f155ce5 100644
--- a/exceptions/http_exceptions.py
+++ b/exceptions/http_exceptions.py
@@ -177,6 +177,13 @@ def __init__(self):
         )
 
 
+class InvitationNotFoundError(HTTPException):
+    """Raised when an invitation ID does not exist."""
+
+    def __init__(self):
+        super().__init__(status_code=404, detail="Invitation not found")
+
+
 class InvalidInvitationTokenError(HTTPException):
     """Raised when an invitation token is invalid, expired, or not found."""
 
diff --git a/routers/core/invitation.py b/routers/core/invitation.py
index da85913..4ea601b 100644
--- a/routers/core/invitation.py
+++ b/routers/core/invitation.py
@@ -1,7 +1,7 @@
 from uuid import uuid4
 from typing import Optional
 from fastapi import APIRouter, Depends, Form, Query, Request, status
-from fastapi.responses import RedirectResponse
+from fastapi.responses import RedirectResponse, Response
 from fastapi.templating import Jinja2Templates
 from fastapi.exceptions import HTTPException
 from pydantic import EmailStr
@@ -15,6 +15,7 @@
 )
 from utils.core.models import User, Role, Account, Invitation, Organization
 from utils.core.enums import ValidPermissions
+from utils.app.enums import AppPermissions
 from utils.core.invitations import send_invitation_email, process_invitation
 from exceptions.http_exceptions import (
     UserIsAlreadyMemberError,
@@ -23,6 +24,7 @@
     OrganizationNotFoundError,
     InvitationEmailSendError,
     InvalidInvitationTokenError,
+    InvitationNotFoundError,
 )
 from exceptions.exceptions import EmailSendFailedError
 from utils.core.htmx import is_htmx_request, append_toast
@@ -32,6 +34,7 @@
 from routers.core.organization import (
     router as org_router,
 )  # Already imported, check usage
+from routers.core.user import _load_org_for_members_partial
 
 # Setup logger
 logger = getLogger("uvicorn.error")
@@ -161,11 +164,20 @@ async def create_invitation(
 
     # HTMX: return partial; non-HTMX: PRG redirect
     if is_htmx_request(request):
-        active_invitations = Invitation.get_active_for_org(session, organization_id)
+        organization, user_permissions, active_invitations = (
+            _load_org_for_members_partial(session, organization_id, current_user)
+        )
         response = templates.TemplateResponse(
             request,
-            "organization/partials/invitations_list.html",
-            {"active_invitations": active_invitations},
+            "organization/partials/members_table.html",
+            {
+                "organization": organization,
+                "active_invitations": active_invitations,
+                "user": current_user,
+                "user_permissions": user_permissions,
+                "ValidPermissions": ValidPermissions,
+                "all_permissions": list(ValidPermissions) + list(AppPermissions),
+            },
         )
         response.headers["HX-Trigger"] = "modalDismiss"
         return append_toast(
@@ -174,6 +186,59 @@ async def create_invitation(
     return RedirectResponse(url=f"/organizations/{organization_id}", status_code=303)
 
 
+@router.post("/delete", name="delete_invitation", response_class=RedirectResponse)
+async def delete_invitation(
+    request: Request,
+    current_user: User = Depends(get_authenticated_user),
+    session: Session = Depends(get_session),
+    invitation_id: int = Form(
+        ..., title="Invitation ID", description="ID of the invitation to delete"
+    ),
+    organization_id: int = Form(
+        ...,
+        title="Organization ID",
+        description="ID of the organization the invitation belongs to",
+    ),
+) -> Response:
+    organization = session.get(Organization, organization_id)
+    if not organization:
+        raise OrganizationNotFoundError()
+
+    if not current_user.has_permission(ValidPermissions.INVITE_USER, organization):
+        raise HTTPException(
+            status_code=403,
+            detail="You don't have permission to manage invitations for this organization",
+        )
+
+    invitation = session.get(Invitation, invitation_id)
+    if not invitation or invitation.organization_id != organization_id:
+        raise InvitationNotFoundError()
+
+    session.delete(invitation)
+    session.commit()
+
+    if is_htmx_request(request):
+        organization, user_permissions, active_invitations = (
+            _load_org_for_members_partial(session, organization_id, current_user)
+        )
+        response = templates.TemplateResponse(
+            request,
+            "organization/partials/members_table.html",
+            {
+                "organization": organization,
+                "active_invitations": active_invitations,
+                "user": current_user,
+                "user_permissions": user_permissions,
+                "ValidPermissions": ValidPermissions,
+                "all_permissions": list(ValidPermissions) + list(AppPermissions),
+            },
+        )
+        return append_toast(
+            response, request, templates, "Invitation cancelled successfully."
+        )
+    return RedirectResponse(url=f"/organizations/{organization_id}", status_code=303)
+
+
 @router.get("/accept", name="accept_invitation")
 async def accept_invitation(
     invitation: Invitation = Depends(get_valid_invitation),
diff --git a/static/css/extras.css b/static/css/extras.css
index b126461..7822548 100644
--- a/static/css/extras.css
+++ b/static/css/extras.css
@@ -5,4 +5,19 @@
 
 input:invalid:not(:placeholder-shown) + .invalid-feedback {
     display: block;
+}
+
+/* Align pending-invitation Cancel buttons with card-header actions (e.g. Invite Member). */
+.card-body .invitation-list.list-group-flush {
+    margin-left: calc(-1 * var(--bs-card-spacer-x));
+    margin-right: calc(-1 * var(--bs-card-spacer-x));
+}
+
+.card-body .invitation-list .invitation-list-item {
+    padding-left: var(--bs-card-spacer-x);
+    padding-right: var(--bs-card-spacer-x);
+}
+
+.invitation-cancel-form .btn {
+    min-width: 6.75rem;
 }
\ No newline at end of file
diff --git a/templates/organization/modals/members_card.html b/templates/organization/modals/members_card.html
index dd91bf5..8c3174d 100644
--- a/templates/organization/modals/members_card.html
+++ b/templates/organization/modals/members_card.html
@@ -76,23 +76,13 @@
         </div>
         {% endif %}
 
-        {# Pending Invitations Section #}
         <hr class="my-4">
-        <h4>Pending Invitations</h4>
-        {% if active_invitations %}
-            <ul class="list-group list-group-flush" id="invitations-list">
-            {% for inv in active_invitations %}
-                <li class="list-group-item d-flex justify-content-between align-items-center">
-                    <span>{{ inv.invitee_email }} (Role: {{ inv.role.name }})</span>
-                    <small class="text-muted">Expires: {{ inv.expires_at.strftime('%Y-%m-%d') }}</small>
-                </li>
-            {% endfor %}
-            </ul>
-        {% else %}
-            <ul class="list-group list-group-flush" id="invitations-list">
-                <li class="list-group-item text-muted">No pending invitations.</li>
-            </ul>
-        {% endif %}
+        <h4 class="mb-3">Pending Invitations</h4>
+        <ul class="list-group list-group-flush invitation-list" id="invitations-list">
+        {% with show_invitation_cancel=true %}
+        {% include 'organization/partials/invitations_list.html' %}
+        {% endwith %}
+        </ul>
     </div>
 </div>
 
diff --git a/templates/organization/partials/invitations_list.html b/templates/organization/partials/invitations_list.html
index bbde63d..21abd3a 100644
--- a/templates/organization/partials/invitations_list.html
+++ b/templates/organization/partials/invitations_list.html
@@ -1,8 +1,21 @@
 {# Partial: <li> items for pending invitations. Swapped into <ul id="invitations-list">. #}
+{# Set show_invitation_cancel=true via {% with %} to render Cancel controls (members card only). #}
 {% for inv in active_invitations %}
-<li class="list-group-item d-flex justify-content-between align-items-center">
-    <span>{{ inv.invitee_email }} (Role: {{ inv.role.name }})</span>
-    <small class="text-muted">Expires: {{ inv.expires_at.strftime('%Y-%m-%d') }}</small>
+<li class="list-group-item invitation-list-item">
+    <div class="d-flex align-items-center">
+        <span class="me-auto">{{ inv.invitee_email }} (Role: {{ inv.role.name }})</span>
+        <small class="text-muted invitation-list-expiry me-3">Expires: {{ inv.expires_at.strftime('%Y-%m-%d') }}</small>
+        {% if show_invitation_cancel is defined and show_invitation_cancel and ValidPermissions is defined and user_permissions is defined and ValidPermissions.INVITE_USER in user_permissions %}
+        <form method="POST" action="{{ url_for('delete_invitation') }}" class="invitation-cancel-form mb-0"
+              hx-post="{{ url_for('delete_invitation') }}"
+              hx-target="#members-card-content"
+              hx-swap="innerHTML">
+            <input type="hidden" name="invitation_id" value="{{ inv.id }}">
+            <input type="hidden" name="organization_id" value="{{ organization.id }}">
+            <button type="submit" class="btn btn-sm btn-outline-danger">Cancel</button>
+        </form>
+        {% endif %}
+    </div>
 </li>
 {% else %}
 <li class="list-group-item text-muted">No pending invitations.</li>
diff --git a/templates/organization/partials/members_table.html b/templates/organization/partials/members_table.html
index a82b965..d5ddf8a 100644
--- a/templates/organization/partials/members_table.html
+++ b/templates/organization/partials/members_table.html
@@ -65,21 +65,12 @@
 {% endif %}
 
 <hr class="my-4">
-<h4>Pending Invitations</h4>
-{% if active_invitations %}
-    <ul class="list-group list-group-flush" id="invitations-list">
-    {% for inv in active_invitations %}
-        <li class="list-group-item d-flex justify-content-between align-items-center">
-            <span>{{ inv.invitee_email }} (Role: {{ inv.role.name }})</span>
-            <small class="text-muted">Expires: {{ inv.expires_at.strftime('%Y-%m-%d') }}</small>
-        </li>
-    {% endfor %}
-    </ul>
-{% else %}
-    <ul class="list-group list-group-flush" id="invitations-list">
-        <li class="list-group-item text-muted">No pending invitations.</li>
-    </ul>
-{% endif %}
+<h4 class="mb-3">Pending Invitations</h4>
+<ul class="list-group list-group-flush invitation-list" id="invitations-list">
+{% with show_invitation_cancel=true %}
+{% include 'organization/partials/invitations_list.html' %}
+{% endwith %}
+</ul>
 
 <div id="member-role-modals-container" hx-swap-oob="true">
 {% if ValidPermissions.EDIT_USER_ROLE in user_permissions %}
diff --git a/tests/routers/core/test_invitation.py b/tests/routers/core/test_invitation.py
index 7dee11b..afc6bd3 100644
--- a/tests/routers/core/test_invitation.py
+++ b/tests/routers/core/test_invitation.py
@@ -737,3 +737,180 @@ def test_organization_page_invite_form_visibility(
     # Example check if invitations are shown (if any exist)
     if "Pending Invitations" in member_response.text:
         assert 'action="/invitations"' not in member_response.text
+
+
+# --- Delete Invitation Tests ---
+
+
+def test_delete_invitation_success(
+    auth_client_owner,
+    test_organization: Organization,
+    session: Session,
+    existing_invitation: Invitation,
+):
+    """Test that an authorized user can delete a pending invitation."""
+    assert test_organization.id is not None
+    assert existing_invitation.id is not None
+    invitation_id = existing_invitation.id
+
+    response = auth_client_owner.post(
+        app.url_path_for("delete_invitation"),
+        data={
+            "invitation_id": str(invitation_id),
+            "organization_id": str(test_organization.id),
+        },
+        follow_redirects=False,
+    )
+
+    assert response.status_code == 303
+    assert response.headers["location"] == f"/organizations/{test_organization.id}"
+
+    session.expire_all()
+    assert session.get(Invitation, invitation_id) is None
+
+
+def test_delete_invitation_unauthorized(
+    auth_client_member,
+    test_organization: Organization,
+    existing_invitation: Invitation,
+):
+    """Test that users without INVITE_USER cannot delete invitations."""
+    assert test_organization.id is not None
+    assert existing_invitation.id is not None
+
+    response = auth_client_member.post(
+        app.url_path_for("delete_invitation"),
+        data={
+            "invitation_id": str(existing_invitation.id),
+            "organization_id": str(test_organization.id),
+        },
+        follow_redirects=False,
+    )
+
+    assert response.status_code == 403
+
+
+def test_delete_invitation_not_found(
+    auth_client_owner,
+    test_organization: Organization,
+):
+    """Test deleting a non-existent invitation returns 404."""
+    assert test_organization.id is not None
+
+    response = auth_client_owner.post(
+        app.url_path_for("delete_invitation"),
+        data={
+            "invitation_id": "99999",
+            "organization_id": str(test_organization.id),
+        },
+        follow_redirects=False,
+    )
+
+    assert response.status_code == 404
+
+
+def test_delete_invitation_wrong_organization(
+    auth_client_owner,
+    test_organization: Organization,
+    session: Session,
+    member_role: Role,
+):
+    """Test deleting an invitation with mismatched organization_id returns 404."""
+    assert test_organization.id is not None
+    assert member_role.id is not None
+
+    other_org = Organization(name="Other Org For Delete Test")
+    session.add(other_org)
+    session.commit()
+    session.refresh(other_org)
+    assert other_org.id is not None
+
+    other_invitation = Invitation(
+        organization_id=other_org.id,
+        role_id=member_role.id,
+        invitee_email="otherorg@example.com",
+        token="other-org-token",
+    )
+    session.add(other_invitation)
+    session.commit()
+    session.refresh(other_invitation)
+
+    response = auth_client_owner.post(
+        app.url_path_for("delete_invitation"),
+        data={
+            "invitation_id": str(other_invitation.id),
+            "organization_id": str(test_organization.id),
+        },
+        follow_redirects=False,
+    )
+
+    assert response.status_code == 404
+    session.expire_all()
+    assert session.get(Invitation, other_invitation.id) is not None
+
+
+def test_delete_invitation_invalidates_token(
+    auth_client_owner,
+    test_organization: Organization,
+    session: Session,
+    existing_invitation: Invitation,
+):
+    """Test that a deleted invitation's accept link no longer works."""
+    assert test_organization.id is not None
+    assert existing_invitation.id is not None
+    token = existing_invitation.token
+
+    auth_client_owner.post(
+        app.url_path_for("delete_invitation"),
+        data={
+            "invitation_id": str(existing_invitation.id),
+            "organization_id": str(test_organization.id),
+        },
+        follow_redirects=False,
+    )
+
+    accept_response = auth_client_owner.get(
+        app.url_path_for("accept_invitation"),
+        params={"token": token},
+        follow_redirects=False,
+    )
+    assert accept_response.status_code == 404
+
+
+def test_organization_page_shows_cancel_invitation_button(
+    auth_client_owner,
+    test_organization: Organization,
+    existing_invitation: Invitation,
+):
+    """Test that users with INVITE_USER see a Cancel button on pending invitations."""
+    assert test_organization.id is not None
+
+    response = auth_client_owner.get(
+        app.url_path_for("read_organization", org_id=test_organization.id),
+    )
+
+    assert response.status_code == 200
+    assert (
+        f'action="http://testserver{app.url_path_for("delete_invitation")}"'
+        in response.text.replace("&amp;", "&")
+    )
+    assert "Cancel" in response.text
+
+
+def test_organization_page_hides_cancel_invitation_button_for_members(
+    auth_client_member,
+    test_organization: Organization,
+    existing_invitation: Invitation,
+):
+    """Test that regular members do not see invitation cancel controls."""
+    assert test_organization.id is not None
+
+    response = auth_client_member.get(
+        app.url_path_for("read_organization", org_id=test_organization.id),
+    )
+
+    assert response.status_code == 200
+    assert (
+        f'action="http://testserver{app.url_path_for("delete_invitation")}"'
+        not in response.text.replace("&amp;", "&")
+    )
diff --git a/tests/test_htmx.py b/tests/test_htmx.py
index 727fb8a..050558c 100644
--- a/tests/test_htmx.py
+++ b/tests/test_htmx.py
@@ -968,6 +968,68 @@ def test_create_invitation_htmx_includes_success_toast(
     assert "Invitation sent successfully" in response.text
 
 
+def test_delete_invitation_htmx_returns_members_partial(
+    auth_client_owner,
+    test_organization,
+    member_role,
+    session,
+):
+    from utils.core.models import Invitation
+
+    invitation = Invitation(
+        organization_id=test_organization.id,
+        role_id=member_role.id,
+        invitee_email="cancelme@example.com",
+        token="htmx-delete-token",
+    )
+    session.add(invitation)
+    session.commit()
+    session.refresh(invitation)
+
+    response = auth_client_owner.post(
+        "/invitations/delete",
+        data={
+            "invitation_id": str(invitation.id),
+            "organization_id": str(test_organization.id),
+        },
+        headers=htmx_headers(),
+    )
+    assert response.status_code == 200
+    assert "<!DOCTYPE html>" not in response.text
+    assert 'id="invitations-list"' in response.text
+    assert "cancelme@example.com" not in response.text
+
+
+def test_delete_invitation_htmx_includes_success_toast(
+    auth_client_owner,
+    test_organization,
+    member_role,
+    session,
+):
+    from utils.core.models import Invitation
+
+    invitation = Invitation(
+        organization_id=test_organization.id,
+        role_id=member_role.id,
+        invitee_email="toastcancel@example.com",
+        token="htmx-delete-toast-token",
+    )
+    session.add(invitation)
+    session.commit()
+    session.refresh(invitation)
+
+    response = auth_client_owner.post(
+        "/invitations/delete",
+        data={
+            "invitation_id": str(invitation.id),
+            "organization_id": str(test_organization.id),
+        },
+        headers=htmx_headers(),
+    )
+    assert response.status_code == 200
+    assert "Invitation cancelled successfully" in response.text
+
+
 def test_update_user_role_htmx_includes_success_toast(
     auth_client_owner, org_member_user, test_organization, member_role
 ):

From 8243f05939db0f83d4b089dd31317b097db8382c Mon Sep 17 00:00:00 2001
From: chriscarrollsmith <chriscarrollsmith@gmail.com>
Date: Mon, 22 Jun 2026 17:25:36 -0400
Subject: [PATCH 2/3] Add hx-confirm for destructive org actions and
 standardize invitation exceptions.

Mirror formettle PR #101 follow-up: require confirmation before cancelling invitations or removing members, and use InsufficientPermissionsError and RoleNotFoundError in the invitation router.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 routers/core/invitation.py                      | 14 +++++---------
 templates/organization/modals/members_card.html |  3 ++-
 .../organization/partials/invitations_list.html |  3 ++-
 templates/organization/partials/member_row.html |  3 ++-
 .../organization/partials/members_table.html    |  3 ++-
 tests/test_templates.py                         | 17 +++++++++++++++++
 6 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/routers/core/invitation.py b/routers/core/invitation.py
index 4ea601b..288e793 100644
--- a/routers/core/invitation.py
+++ b/routers/core/invitation.py
@@ -25,6 +25,8 @@
     InvitationEmailSendError,
     InvalidInvitationTokenError,
     InvitationNotFoundError,
+    InsufficientPermissionsError,
+    RoleNotFoundError,
 )
 from exceptions.exceptions import EmailSendFailedError
 from utils.core.htmx import is_htmx_request, append_toast
@@ -83,15 +85,12 @@ async def create_invitation(
 
     # Check if the current user has permission to invite users to this organization
     if not current_user.has_permission(ValidPermissions.INVITE_USER, organization):
-        raise HTTPException(
-            status_code=403,
-            detail="You don't have permission to invite users to this organization",
-        )
+        raise InsufficientPermissionsError()
 
     # Verify the role exists and belongs to this organization
     role = session.get(Role, role_id)
     if not role:
-        raise HTTPException(status_code=404, detail="Role not found")
+        raise RoleNotFoundError()
     if role.organization_id != organization_id:
         raise InvalidRoleForOrganizationError()
 
@@ -205,10 +204,7 @@ async def delete_invitation(
         raise OrganizationNotFoundError()
 
     if not current_user.has_permission(ValidPermissions.INVITE_USER, organization):
-        raise HTTPException(
-            status_code=403,
-            detail="You don't have permission to manage invitations for this organization",
-        )
+        raise InsufficientPermissionsError()
 
     invitation = session.get(Invitation, invitation_id)
     if not invitation or invitation.organization_id != organization_id:
diff --git a/templates/organization/modals/members_card.html b/templates/organization/modals/members_card.html
index 8c3174d..76fa7a9 100644
--- a/templates/organization/modals/members_card.html
+++ b/templates/organization/modals/members_card.html
@@ -59,7 +59,8 @@
                             <form method="POST" action="{{ url_for('remove_user_from_organization') }}" class="d-inline"
                                   hx-post="{{ url_for('remove_user_from_organization') }}"
                                   hx-target="#members-card-content"
-                                  hx-swap="innerHTML">
+                                  hx-swap="innerHTML"
+                                  hx-confirm="Remove {{ member.name }} from this organization?">
                                 <input type="hidden" name="user_id" value="{{ member.id }}">
                                 <input type="hidden" name="organization_id" value="{{ organization.id }}">
                                 <button type="submit" class="btn btn-sm btn-outline-danger" {% if member.id == user.id %}disabled{% endif %}>
diff --git a/templates/organization/partials/invitations_list.html b/templates/organization/partials/invitations_list.html
index 21abd3a..52503b4 100644
--- a/templates/organization/partials/invitations_list.html
+++ b/templates/organization/partials/invitations_list.html
@@ -9,7 +9,8 @@
         <form method="POST" action="{{ url_for('delete_invitation') }}" class="invitation-cancel-form mb-0"
               hx-post="{{ url_for('delete_invitation') }}"
               hx-target="#members-card-content"
-              hx-swap="innerHTML">
+              hx-swap="innerHTML"
+              hx-confirm="Cancel invitation for {{ inv.invitee_email }}?">
             <input type="hidden" name="invitation_id" value="{{ inv.id }}">
             <input type="hidden" name="organization_id" value="{{ organization.id }}">
             <button type="submit" class="btn btn-sm btn-outline-danger">Cancel</button>
diff --git a/templates/organization/partials/member_row.html b/templates/organization/partials/member_row.html
index fb9cadb..cacf573 100644
--- a/templates/organization/partials/member_row.html
+++ b/templates/organization/partials/member_row.html
@@ -29,7 +29,8 @@
         <form method="POST" action="{{ url_for('remove_user_from_organization') }}" class="d-inline"
               hx-post="{{ url_for('remove_user_from_organization') }}"
               hx-target="#members-card-content"
-              hx-swap="innerHTML">
+              hx-swap="innerHTML"
+              hx-confirm="Remove {{ member.name }} from this organization?">
             <input type="hidden" name="user_id" value="{{ member.id }}">
             <input type="hidden" name="organization_id" value="{{ organization.id }}">
             <button type="submit" class="btn btn-sm btn-outline-danger" {% if member.id == user.id %}disabled{% endif %}>
diff --git a/templates/organization/partials/members_table.html b/templates/organization/partials/members_table.html
index d5ddf8a..7f14843 100644
--- a/templates/organization/partials/members_table.html
+++ b/templates/organization/partials/members_table.html
@@ -47,7 +47,8 @@
                     <form method="POST" action="{{ url_for('remove_user_from_organization') }}" class="d-inline"
                           hx-post="{{ url_for('remove_user_from_organization') }}"
                           hx-target="#members-card-content"
-                          hx-swap="innerHTML">
+                          hx-swap="innerHTML"
+                          hx-confirm="Remove {{ member.name }} from this organization?">
                         <input type="hidden" name="user_id" value="{{ member.id }}">
                         <input type="hidden" name="organization_id" value="{{ organization.id }}">
                         <button type="submit" class="btn btn-sm btn-outline-danger" {% if member.id == user.id %}disabled{% endif %}>
diff --git a/tests/test_templates.py b/tests/test_templates.py
index ccbabeb..00b3186 100644
--- a/tests/test_templates.py
+++ b/tests/test_templates.py
@@ -99,6 +99,23 @@ def test_invite_member_form_has_hx_post():
     assert "hx-post" in content
 
 
+def test_pending_invitations_include_cancel_confirm():
+    content = Path("templates/organization/partials/invitations_list.html").read_text()
+    assert "url_for('delete_invitation')" in content
+    assert "hx-confirm" in content
+
+
+def test_remove_member_forms_include_confirm():
+    for path in (
+        "templates/organization/modals/members_card.html",
+        "templates/organization/partials/members_table.html",
+        "templates/organization/partials/member_row.html",
+    ):
+        content = Path(path).read_text()
+        assert "url_for('remove_user_from_organization')" in content
+        assert "hx-confirm" in content
+
+
 def test_edit_organization_form_has_hx_post():
     content = Path(
         "templates/organization/modals/edit_organization_modal.html"

From d5c8e2327349515c9d47041e29406ad4c74b84a6 Mon Sep 17 00:00:00 2001
From: chriscarrollsmith <chriscarrollsmith@gmail.com>
Date: Mon, 22 Jun 2026 20:57:13 -0400
Subject: [PATCH 3/3] Move private helper to shared utils and add custom
 exception message

---
 exceptions/http_exceptions.py |  9 ++++---
 routers/core/invitation.py    | 20 +++++++-------
 routers/core/role.py          | 28 +++----------------
 routers/core/user.py          | 33 +++--------------------
 utils/core/organizations.py   | 51 +++++++++++++++++++++++++++++++++++
 5 files changed, 73 insertions(+), 68 deletions(-)
 create mode 100644 utils/core/organizations.py

diff --git a/exceptions/http_exceptions.py b/exceptions/http_exceptions.py
index f155ce5..1aabdc9 100644
--- a/exceptions/http_exceptions.py
+++ b/exceptions/http_exceptions.py
@@ -43,10 +43,11 @@ def __init__(self, field: str, message: str):
 
 
 class InsufficientPermissionsError(HTTPException):
-    def __init__(self):
-        super().__init__(
-            status_code=403, detail="You don't have permission to perform this action"
-        )
+    def __init__(
+        self,
+        message: str = "You don't have permission to perform this action",
+    ):
+        super().__init__(status_code=403, detail=message)
 
 
 class OrganizationSetupError(HTTPException):
diff --git a/routers/core/invitation.py b/routers/core/invitation.py
index 288e793..07f4554 100644
--- a/routers/core/invitation.py
+++ b/routers/core/invitation.py
@@ -30,13 +30,9 @@
 )
 from exceptions.exceptions import EmailSendFailedError
 from utils.core.htmx import is_htmx_request, append_toast
-
-# Import the account router to generate URLs for login/register
+from utils.core.organizations import load_org_for_members_partial
 from routers.core.account import router as account_router
-from routers.core.organization import (
-    router as org_router,
-)  # Already imported, check usage
-from routers.core.user import _load_org_for_members_partial
+from routers.core.organization import router as org_router
 
 # Setup logger
 logger = getLogger("uvicorn.error")
@@ -85,7 +81,9 @@ async def create_invitation(
 
     # Check if the current user has permission to invite users to this organization
     if not current_user.has_permission(ValidPermissions.INVITE_USER, organization):
-        raise InsufficientPermissionsError()
+        raise InsufficientPermissionsError(
+            "You don't have permission to invite users to this organization"
+        )
 
     # Verify the role exists and belongs to this organization
     role = session.get(Role, role_id)
@@ -164,7 +162,7 @@ async def create_invitation(
     # HTMX: return partial; non-HTMX: PRG redirect
     if is_htmx_request(request):
         organization, user_permissions, active_invitations = (
-            _load_org_for_members_partial(session, organization_id, current_user)
+            load_org_for_members_partial(session, organization_id, current_user)
         )
         response = templates.TemplateResponse(
             request,
@@ -204,7 +202,9 @@ async def delete_invitation(
         raise OrganizationNotFoundError()
 
     if not current_user.has_permission(ValidPermissions.INVITE_USER, organization):
-        raise InsufficientPermissionsError()
+        raise InsufficientPermissionsError(
+            "You don't have permission to cancel invitations for this organization"
+        )
 
     invitation = session.get(Invitation, invitation_id)
     if not invitation or invitation.organization_id != organization_id:
@@ -215,7 +215,7 @@ async def delete_invitation(
 
     if is_htmx_request(request):
         organization, user_permissions, active_invitations = (
-            _load_org_for_members_partial(session, organization_id, current_user)
+            load_org_for_members_partial(session, organization_id, current_user)
         )
         response = templates.TemplateResponse(
             request,
diff --git a/routers/core/role.py b/routers/core/role.py
index 89c038c..dd57649 100644
--- a/routers/core/role.py
+++ b/routers/core/role.py
@@ -15,8 +15,8 @@
     utc_now,
     User,
     DataIntegrityError,
-    Organization,
 )
+from utils.core.organizations import load_org_for_roles_partial
 from utils.core.enums import ValidPermissions
 from utils.app.enums import AppPermissions
 from exceptions.http_exceptions import (
@@ -36,26 +36,6 @@
 templates = Jinja2Templates(directory="templates")
 
 
-def _load_org_for_roles_partial(
-    session: Session, organization_id: int, user: User
-) -> tuple:
-    """Re-query org with roles/users/permissions and compute user_permissions."""
-    organization = session.exec(
-        select(Organization)
-        .where(Organization.id == organization_id)
-        .options(
-            selectinload(Organization.roles).selectinload(Role.users),
-            selectinload(Organization.roles).selectinload(Role.permissions),
-        )
-    ).first()
-    user_permissions = set()
-    for role in user.roles:
-        if role.organization_id == organization_id:
-            for permission in role.permissions:
-                user_permissions.add(permission.name)
-    return organization, user_permissions
-
-
 # --- Routes ---
 
 
@@ -114,7 +94,7 @@ def create_role(
         raise RoleAlreadyExistsError()
 
     if is_htmx_request(request):
-        organization, user_permissions = _load_org_for_roles_partial(
+        organization, user_permissions = load_org_for_roles_partial(
             session, organization_id, user
         )
         response = templates.TemplateResponse(
@@ -221,7 +201,7 @@ def update_role(
     session.refresh(db_role)
 
     if is_htmx_request(request):
-        organization, user_permissions = _load_org_for_roles_partial(
+        organization, user_permissions = load_org_for_roles_partial(
             session, organization_id, user
         )
         response = templates.TemplateResponse(
@@ -282,7 +262,7 @@ def delete_role(
     session.commit()
 
     if is_htmx_request(request):
-        organization, user_permissions = _load_org_for_roles_partial(
+        organization, user_permissions = load_org_for_roles_partial(
             session, organization_id, user
         )
         response = templates.TemplateResponse(
diff --git a/routers/core/user.py b/routers/core/user.py
index 1d04b93..119b2a5 100644
--- a/routers/core/user.py
+++ b/routers/core/user.py
@@ -10,9 +10,8 @@
     AccountEmail,
     DataIntegrityError,
     Organization,
-    Role,
-    Invitation,
 )
+from utils.core.organizations import load_org_for_members_partial
 from utils.core.auth import MAX_EMAILS_PER_ACCOUNT
 from utils.core.dependencies import (
     get_authenticated_user,
@@ -40,32 +39,6 @@
 templates = Jinja2Templates(directory="templates")
 
 
-def _load_org_for_members_partial(
-    session: Session, organization_id: int, user: User
-) -> tuple:
-    """Re-query org with members fully loaded and compute user_permissions."""
-    organization = session.exec(
-        select(Organization)
-        .where(Organization.id == organization_id)
-        .options(
-            selectinload(Organization.roles)
-            .selectinload(Role.users)
-            .selectinload(User.account),
-            selectinload(Organization.roles)
-            .selectinload(Role.users)
-            .selectinload(User.roles),
-            selectinload(Organization.roles).selectinload(Role.permissions),
-        )
-    ).first()
-    user_permissions = set()
-    for role in user.roles:
-        if role.organization_id == organization_id:
-            for permission in role.permissions:
-                user_permissions.add(permission.name)
-    active_invitations = Invitation.get_active_for_org(session, organization_id)
-    return organization, user_permissions, active_invitations
-
-
 # --- Routes ---
 
 
@@ -267,7 +240,7 @@ def update_user_role(
 
     if is_htmx_request(request):
         organization, user_permissions, active_invitations = (
-            _load_org_for_members_partial(session, organization_id, user)
+            load_org_for_members_partial(session, organization_id, user)
         )
         response = templates.TemplateResponse(
             request,
@@ -341,7 +314,7 @@ def remove_user_from_organization(
 
     if is_htmx_request(request):
         organization, user_permissions, active_invitations = (
-            _load_org_for_members_partial(session, organization_id, user)
+            load_org_for_members_partial(session, organization_id, user)
         )
         response = templates.TemplateResponse(
             request,
diff --git a/utils/core/organizations.py b/utils/core/organizations.py
new file mode 100644
index 0000000..2282d00
--- /dev/null
+++ b/utils/core/organizations.py
@@ -0,0 +1,51 @@
+from sqlmodel import Session, select
+from sqlalchemy.orm import selectinload
+
+from utils.core.models import Organization, Role, User, Invitation
+
+
+def _user_permissions_for_org(user: User, organization_id: int) -> set[str]:
+    user_permissions: set[str] = set()
+    for role in user.roles:
+        if role.organization_id == organization_id:
+            for permission in role.permissions:
+                user_permissions.add(permission.name)
+    return user_permissions
+
+
+def load_org_for_members_partial(
+    session: Session, organization_id: int, user: User
+) -> tuple[Organization | None, set[str], list[Invitation]]:
+    """Re-query org with members fully loaded and compute user_permissions."""
+    organization = session.exec(
+        select(Organization)
+        .where(Organization.id == organization_id)
+        .options(
+            selectinload(Organization.roles)
+            .selectinload(Role.users)
+            .selectinload(User.account),
+            selectinload(Organization.roles)
+            .selectinload(Role.users)
+            .selectinload(User.roles),
+            selectinload(Organization.roles).selectinload(Role.permissions),
+        )
+    ).first()
+    user_permissions = _user_permissions_for_org(user, organization_id)
+    active_invitations = Invitation.get_active_for_org(session, organization_id)
+    return organization, user_permissions, active_invitations
+
+
+def load_org_for_roles_partial(
+    session: Session, organization_id: int, user: User
+) -> tuple[Organization | None, set[str]]:
+    """Re-query org with roles/users/permissions and compute user_permissions."""
+    organization = session.exec(
+        select(Organization)
+        .where(Organization.id == organization_id)
+        .options(
+            selectinload(Organization.roles).selectinload(Role.users),
+            selectinload(Organization.roles).selectinload(Role.permissions),
+        )
+    ).first()
+    user_permissions = _user_permissions_for_org(user, organization_id)
+    return organization, user_permissions