From 92643a0ba036122040ad40be77df2b0a14938258 Mon Sep 17 00:00:00 2001 From: Javier Rodriguez Date: Fri, 1 Aug 2025 11:36:58 +0200 Subject: [PATCH] feat(events): Include invitation ID on event Signed-off-by: Javier Rodriguez --- app/controlplane/pkg/auditor/events/organization.go | 6 ++++-- app/controlplane/pkg/biz/orginvitation.go | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controlplane/pkg/auditor/events/organization.go b/app/controlplane/pkg/auditor/events/organization.go index 977d27bd7..38342c37f 100644 --- a/app/controlplane/pkg/auditor/events/organization.go +++ b/app/controlplane/pkg/auditor/events/organization.go @@ -83,6 +83,8 @@ type OrgUserJoined struct { UserID uuid.UUID `json:"user_id,omitempty"` // UserEmail of the user that joined the organization UserEmail string `json:"user_email,omitempty"` + // InvitationID is the ID of the invitation that was used to join the organization + InvitationID uuid.UUID `json:"invitation_id,omitempty"` } func (p *OrgUserJoined) ActionType() string { @@ -94,8 +96,8 @@ func (p *OrgUserJoined) Description() string { } func (p *OrgUserJoined) ActionInfo() (json.RawMessage, error) { - if p.OrgName == "" || p.OrgID == nil || p.UserID == uuid.Nil || p.UserEmail == "" { - return nil, errors.New("org name, org id, user id and user email are required") + if p.OrgName == "" || p.OrgID == nil || p.UserID == uuid.Nil || p.UserEmail == "" || p.InvitationID == uuid.Nil { + return nil, errors.New("org name, org id, user id, user email and invitation id are required") } return json.Marshal(&p) diff --git a/app/controlplane/pkg/biz/orginvitation.go b/app/controlplane/pkg/biz/orginvitation.go index 1744acb61..ddab056fa 100644 --- a/app/controlplane/pkg/biz/orginvitation.go +++ b/app/controlplane/pkg/biz/orginvitation.go @@ -290,8 +290,9 @@ func (uc *OrgInvitationUseCase) AcceptPendingInvitations(ctx context.Context, re OrgID: &orgUUID, OrgName: invitation.Org.Name, }, - UserID: userUUID, - UserEmail: user.Email, + UserID: userUUID, + UserEmail: user.Email, + InvitationID: invitation.ID, }, &orgUUID) }