Skip to content

Commit ca231f1

Browse files
authored
chore: simplify membership check (#465)
Signed-off-by: Miguel Martinez Trivino <[email protected]>
1 parent df8e477 commit ca231f1

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

app/controlplane/internal/biz/orginvitation.go

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,26 +87,14 @@ func (uc *OrgInvitationUseCase) Create(ctx context.Context, orgID, senderID, rec
8787
}
8888

8989
// 3 - Check if the user has permissions to invite to the org
90-
memberships, err := uc.mRepo.FindByUser(ctx, senderUUID)
91-
if err != nil {
92-
return nil, fmt.Errorf("error finding memberships for user %s: %w", senderUUID.String(), err)
93-
}
94-
95-
var hasPermission bool
96-
for _, m := range memberships {
97-
if m.OrganizationID == orgUUID {
98-
// User has permission to invite to this org
99-
hasPermission = true
100-
break
101-
}
102-
}
103-
104-
if !hasPermission {
90+
if membership, err := uc.mRepo.FindByOrgAndUser(ctx, orgUUID, senderUUID); err != nil {
91+
return nil, fmt.Errorf("failed to find memberships: %w", err)
92+
} else if membership == nil {
10593
return nil, NewErrNotFound("user does not have permission to invite to this org")
10694
}
10795

10896
// 4 - The receiver does not exist in the org already
109-
memberships, err = uc.mRepo.FindByOrg(ctx, orgUUID)
97+
memberships, err := uc.mRepo.FindByOrg(ctx, orgUUID)
11098
if err != nil {
11199
return nil, fmt.Errorf("error finding memberships for user %s: %w", senderUUID.String(), err)
112100
}

0 commit comments

Comments
 (0)