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

Fix re-activitating membership does not reset the role

Browse Source 
Signed-off-by: Bryan Frimin <bryan@getprobo.com>
This commit is contained in:
Bryan Frimin
2026-01-05 21:34:26 +01:00
parent 2092e4e9bb
commit c4285cdc42
1 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/iam/scim/service.go
View File

@@ -176,8 +176,12 @@ func (s *Service) CreateUser(
return fmt.Errorf("cannot load membership: %w", err) return fmt.Errorf("cannot load membership: %w", err)
} else { } else {
// Update existing membership - reactivate if inactive, update source to SCIM // Update existing membership - reactivate if inactive, update source to SCIM
wasInactive := membership.State == coredata.MembershipStateInactive
membership.Source = coredata.MembershipSourceSCIM membership.Source = coredata.MembershipSourceSCIM
membership.State = coredata.MembershipStateActive membership.State = coredata.MembershipStateActive
if wasInactive {
membership.Role = coredata.MembershipRoleViewer
}
membership.UpdatedAt = now membership.UpdatedAt = now
err = membership.Update(ctx, tx, scope) err = membership.Update(ctx, tx, scope)
@@ -232,7 +236,6 @@ func (s *Service) GetUser(
return membershipToResource(membership), nil return membershipToResource(membership), nil
} }
// ListUsers lists all users in an organization, with optional filter support
func (s *Service) ListUsers( func (s *Service) ListUsers(
ctx context.Context, ctx context.Context,
config *coredata.SCIMConfiguration, config *coredata.SCIMConfiguration,
@@ -297,6 +300,7 @@ func (s *Service) ReplaceUser(
if err != nil { if err != nil {
return scim.Resource{}, err return scim.Resource{}, err
} }
return membershipToResource(membership), nil return membershipToResource(membership), nil
} }
@@ -311,6 +315,7 @@ func (s *Service) PatchUser(
if err != nil { if err != nil {
return scim.Resource{}, err return scim.Resource{}, err
} }
return membershipToResource(membership), nil return membershipToResource(membership), nil
} }
@@ -326,7 +331,9 @@ func (s *Service) updateUser(
var membership *coredata.Membership var membership *coredata.Membership
err := s.pg.WithTx(ctx, func(tx pg.Conn) error { err := s.pg.WithTx(
ctx,
func(tx pg.Conn) error {
membership = &coredata.Membership{} membership = &coredata.Membership{}
err := membership.LoadByID(ctx, tx, scope, membershipID) err := membership.LoadByID(ctx, tx, scope, membershipID)
if err != nil { if err != nil {
@@ -345,6 +352,7 @@ func (s *Service) updateUser(
if active != nil { if active != nil {
if *active && membership.State == coredata.MembershipStateInactive { if *active && membership.State == coredata.MembershipStateInactive {
membership.State = coredata.MembershipStateActive membership.State = coredata.MembershipStateActive
membership.Role = coredata.MembershipRoleViewer
needsUpdate = true needsUpdate = true
} else if !*active && membership.State == coredata.MembershipStateActive { } else if !*active && membership.State == coredata.MembershipStateActive {
membership.State = coredata.MembershipStateInactive membership.State = coredata.MembershipStateInactive
@@ -380,7 +388,8 @@ func (s *Service) updateUser(
} }
return nil return nil
}) },
)
if err != nil { if err != nil {
return nil, err return nil, err