rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cannot delete expired invitation

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-01-05 15:47:33 +01:00
committed by Bryan Frimin
parent 7423b915ae
commit 431f2fd557
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/iam/errors.go
View File

@@ -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 {

6
pkg/iam/organization_service.go
View File

@@ -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)