From 431f2fd557359adc1b71c9077494723630452d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <emile@getprobo.com>
Date: Mon, 5 Jan 2026 15:47:33 +0100
Subject: [PATCH] Fix cannot delete expired invitation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Émile Ré <emile@getprobo.com>
---
 .../settings/_components/InvitationListItem.tsx   |  3 ++-
 pkg/iam/errors.go                                 | 15 +++++++++------
 pkg/iam/organization_service.go                   |  6 ++++--
 pkg/server/api/connect/v1/v1_resolver.go          |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx b/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx
index 6a37884ac..3cbcd9bfa 100644
--- a/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx
+++ b/apps/console/src/pages/iam/organizations/settings/_components/InvitationListItem.tsx
@@ -119,7 +119,8 @@ export function InvitationListItem(props: {
           {isDeleting ? (
             <Spinner size={16} />
           ) : (
-            invitation.canDelete && (
+            invitation.canDelete &&
+            invitation.status !== "ACCEPTED" && (
               <Button
                 variant="danger"
                 onClick={handleDelete}
diff --git a/pkg/iam/errors.go b/pkg/iam/errors.go
index af2aa368e..c30d1c71a 100644
--- a/pkg/iam/errors.go
+++ b/pkg/iam/errors.go
@@ -273,14 +273,17 @@ func (e ErrInvalidCredentials) Error() string {
 	return e.message
 }
 
-type ErrInvitationNotPending struct{ InvitationID gid.GID }
-
-func NewInvitationNotPendingError(invitationID gid.GID) error {
-	return &ErrInvitationNotPending{InvitationID: invitationID}
+type ErrInvitationNotDeleted struct {
+	InvitationID gid.GID
+	Status       string
 }
 
-func (e ErrInvitationNotPending) Error() string {
-	return fmt.Sprintf("invitation %q is not pending", e.InvitationID)
+func NewInvitationNotDeletedError(invitationID gid.GID, status string) error {
+	return &ErrInvitationNotDeleted{InvitationID: invitationID, Status: status}
+}
+
+func (e ErrInvitationNotDeleted) Error() string {
+	return fmt.Sprintf("cannot delete invitation %q in %q status", e.InvitationID, e.Status)
 }
 
 type ErrPasswordRequired struct {
diff --git a/pkg/iam/organization_service.go b/pkg/iam/organization_service.go
index f4139e276..a61e97a98 100644
--- a/pkg/iam/organization_service.go
+++ b/pkg/iam/organization_service.go
@@ -283,8 +283,10 @@ func (s *OrganizationService) DeleteInvitation(
 				return fmt.Errorf("cannot load invitation: %w", err)
 			}
 
-			if invitation.Status != coredata.InvitationStatusPending {
-				return NewInvitationNotPendingError(invitationID)
+			switch invitation.Status {
+			case coredata.InvitationStatusAccepted:
+				return NewInvitationNotDeletedError(invitationID, invitation.Status.String())
+			case coredata.InvitationStatusPending, coredata.InvitationStatusExpired:
 			}
 
 			err = invitation.Delete(ctx, tx, scope, invitationID)
diff --git a/pkg/server/api/connect/v1/v1_resolver.go b/pkg/server/api/connect/v1/v1_resolver.go
index 9dfdc0954..c23e38f7b 100644
--- a/pkg/server/api/connect/v1/v1_resolver.go
+++ b/pkg/server/api/connect/v1/v1_resolver.go
@@ -925,13 +925,13 @@ func (r *mutationResolver) DeleteInvitation(ctx context.Context, input types.Del
 	err := r.iam.OrganizationService.DeleteInvitation(ctx, input.OrganizationID, input.InvitationID)
 	if err != nil {
 		var errInvitationNotFound *iam.ErrInvitationNotFound
-		var errInvitationNotPending *iam.ErrInvitationNotPending
+		var errInvitationNotDeleted *iam.ErrInvitationNotDeleted
 
 		if errors.As(err, &errInvitationNotFound) {
 			return nil, gqlutils.NotFound(err)
 		}
 
-		if errors.As(err, &errInvitationNotPending) {
+		if errors.As(err, &errInvitationNotDeleted) {
 			return nil, gqlutils.Invalid(err, nil)
 		}