Skip to content

Commit 7563073

Browse files
EmyrkEmyrk
committed
refactor group sync
1 parent 40bf367 commit 7563073

File tree

7 files changed

+22
-10
lines changed

7 files changed

+22
-10
lines changed

‎coderd/database/dbauthz/dbauthz.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3075,7 +3075,7 @@ func (q *querier) RegisterWorkspaceProxy(ctx context.Context, arg database.Regis
30753075
return updateWithReturn(q.log, q.auth, fetch, q.db.RegisterWorkspaceProxy)(ctx, arg)
30763076
}
30773077

3078-
func (q *querier) RemoveUserFromAllGroups(ctx context.Context, userID uuid.UUID) error {
3078+
func (q *querier) RemoveUserFromAllGroups(ctx context.Context, userID database.RemoveUserFromAllGroupsParams) error {
30793079
// This is a system function to clear user groups in group sync.
30803080
if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceSystem); err != nil {
30813081
return err

‎coderd/database/dbmem/dbmem.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7475,7 +7475,7 @@ func (q *FakeQuerier) RegisterWorkspaceProxy(_ context.Context, arg database.Reg
74757475
return database.WorkspaceProxy{}, sql.ErrNoRows
74767476
}
74777477

7478-
func (q *FakeQuerier) RemoveUserFromAllGroups(_ context.Context, userID uuid.UUID) error {
7478+
func (q *FakeQuerier) RemoveUserFromAllGroups(_ context.Context, userID database.RemoveUserFromAllGroupsParams) error {
74797479
q.mutex.Lock()
74807480
defer q.mutex.Unlock()
74817481

‎coderd/database/dbmetrics/dbmetrics.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/models.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/querier.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go

Lines changed: 11 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/groupmembers.sql

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,11 @@ FROM
3333
DELETE FROM
3434
group_members
3535
WHERE
36-
user_id = @user_id;
36+
user_id = @user_id
37+
AND group_id = ANY(
38+
SELECT id FROM groups WHERE organization_id = @organization_id
39+
)
40+
;
3741

3842
-- name: InsertGroupMember :exec
3943
INSERT INTO

0 commit comments

Comments
 (0)