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

Fix phantom membership

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2025-10-29 20:47:33 +01:00
parent b92d78e4cf
commit f67d5bfd33
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/authz/service.go
View File

@@ -280,10 +280,12 @@ func (s *Service) EnsureSAMLMembership(
func(tx pg.Conn) error { func(tx pg.Conn) error {
var membership coredata.Membership var membership coredata.Membership
// Try to load existing membership
err := membership.LoadByUserAndOrg(ctx, tx, scope, userID, organizationID) err := membership.LoadByUserAndOrg(ctx, tx, scope, userID, organizationID)
if err != nil { if err != nil {
// Membership doesn't exist, create it if _, ok := err.(coredata.ErrMembershipNotFound); !ok {
return fmt.Errorf("cannot load membership: %w", err)
}
membershipID := gid.New(tenantID, coredata.MembershipEntityType) membershipID := gid.New(tenantID, coredata.MembershipEntityType)
membership = coredata.Membership{ membership = coredata.Membership{
ID: membershipID, ID: membershipID,
@@ -301,7 +303,6 @@ func (s *Service) EnsureSAMLMembership(
return nil return nil
} }
// Membership exists, update role if changed
if membership.Role != role { if membership.Role != role {
membership.Role = role membership.Role = role
membership.UpdatedAt = now membership.UpdatedAt = now