Skip to content

fix(group): resolve PAT to user before owner wiring on group create #1658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AmanGIT07 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(group): resolve PAT to user before owner wiring on group create #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2e858e
fix(group): resolve PAT to user before owner wiring on group create
AmanGIT07 May 29, 2026
65b0f73
fix(group): roll back Postgres row when OnGroupCreated fails
AmanGIT07 May 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion core/group/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,12 @@ func (s Service) Create(ctx context.Context, grp Group) (Group, error) {
return Group{}, err
}

if err = s.membershipService.OnGroupCreated(ctx, newGroup.ID, newGroup.OrganizationID, principal.ID, principal.Type); err != nil {
// PAT → resolve to underlying user so ownership is on the user, not the token
subjectID, subjectType := principal.ResolveSubject()
if err = s.membershipService.OnGroupCreated(ctx, newGroup.ID, newGroup.OrganizationID, subjectID, subjectType); err != nil {
if cleanupErr := s.repository.Delete(ctx, newGroup.ID); cleanupErr != nil {
return Group{}, errors.Join(err, fmt.Errorf("rollback group create: %w", cleanupErr))
}
return Group{}, err
Comment thread
AmanGIT07 marked this conversation as resolved.
}

Expand Down
61 changes: 60 additions & 1 deletion core/group/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,63 @@ func TestService_Create(t *testing.T) {
assert.Equal(t, strings.Contains(err.Error(), authenticate.ErrInvalidID.Error()), true)
})

t.Run("should propagate error from membership.OnGroupCreated", func(t *testing.T) {
t.Run("PAT creator resolves to underlying user before OnGroupCreated", func(t *testing.T) {
mockRepo := mocks.NewRepository(t)
mockAuthnSvc := mocks.NewAuthnService(t)
mockRelationSvc := mocks.NewRelationService(t)
mockPolicySvc := mocks.NewPolicyService(t)
mockMembershipSvc := mocks.NewMembershipService(t)

svc := group.NewService(mockRepo, mockRelationSvc, mockAuthnSvc, mockPolicySvc)
svc.SetMembershipService(mockMembershipSvc)

userID := uuid.New().String()
patID := uuid.New().String()
mockAuthnSvc.On("GetPrincipal", mock.Anything).Return(authenticate.Principal{
ID: patID,
Type: schema.PATPrincipal,
PAT: &pat.PAT{ID: patID, UserID: userID},
}, nil)

groupParam := group.Group{Name: "g", OrganizationID: uuid.New().String()}
groupInRepo := groupParam
groupInRepo.ID = uuid.New().String()
mockRepo.On("Create", mock.Anything, groupParam).Return(groupInRepo, nil)
mockMembershipSvc.EXPECT().OnGroupCreated(mock.Anything, groupInRepo.ID, groupInRepo.OrganizationID, userID, schema.UserPrincipal).Return(nil)

_, err := svc.Create(context.Background(), groupParam)
assert.NoError(t, err)
})

t.Run("OnGroupCreated failure rolls back the Postgres group row", func(t *testing.T) {
mockRepo := mocks.NewRepository(t)
mockAuthnSvc := mocks.NewAuthnService(t)
mockRelationSvc := mocks.NewRelationService(t)
mockPolicySvc := mocks.NewPolicyService(t)
mockMembershipSvc := mocks.NewMembershipService(t)

svc := group.NewService(mockRepo, mockRelationSvc, mockAuthnSvc, mockPolicySvc)
svc.SetMembershipService(mockMembershipSvc)

mockUserID := uuid.New().String()
mockAuthnSvc.On("GetPrincipal", mock.Anything).Return(authenticate.Principal{
ID: mockUserID,
Type: schema.UserPrincipal,
User: &user.User{ID: mockUserID},
}, nil)

groupParam := group.Group{Name: "g", OrganizationID: uuid.New().String()}
groupInRepo := groupParam
groupInRepo.ID = uuid.New().String()
mockRepo.On("Create", mock.Anything, groupParam).Return(groupInRepo, nil)
mockMembershipSvc.EXPECT().OnGroupCreated(mock.Anything, groupInRepo.ID, groupInRepo.OrganizationID, mockUserID, schema.UserPrincipal).Return(errors.New("spicedb down"))
mockRepo.On("Delete", mock.Anything, groupInRepo.ID).Return(nil).Once()

_, err := svc.Create(context.Background(), groupParam)
assert.ErrorContains(t, err, "spicedb down")
})

t.Run("rollback failure surfaces both errors", func(t *testing.T) {
mockRepo := mocks.NewRepository(t)
mockAuthnSvc := mocks.NewAuthnService(t)
mockRelationSvc := mocks.NewRelationService(t)
Expand All @@ -90,9 +146,12 @@ func TestService_Create(t *testing.T) {
groupInRepo.ID = uuid.New().String()
mockRepo.On("Create", mock.Anything, groupParam).Return(groupInRepo, nil)
mockMembershipSvc.EXPECT().OnGroupCreated(mock.Anything, groupInRepo.ID, groupInRepo.OrganizationID, mockUserID, schema.UserPrincipal).Return(errors.New("spicedb down"))
mockRepo.On("Delete", mock.Anything, groupInRepo.ID).Return(errors.New("pg gone")).Once()

_, err := svc.Create(context.Background(), groupParam)
assert.ErrorContains(t, err, "spicedb down")
assert.ErrorContains(t, err, "rollback group create")
assert.ErrorContains(t, err, "pg gone")
})
}

Expand Down
Loading