rename UserWithGroupAndOrgID to GroupMemberRBACHelper

hugodutka · hugodutka · commit 5fcc21841384 · 2024-08-12T19:34:18.000Z
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -1401,17 +1401,17 @@ func (q *querier) GetGroupMembersByGroupID(ctx context.Context, id uuid.UUID) ([
 	if err != nil { // AuthZ check
 		return nil, err
 	}
-	// The UserWithGroupAndOrgID type is used to do the authz check. It ensures
+	// The GroupMemberRBACHelper type is used to do the authz check. It ensures
 	// that group members can see themselves. Unless they have Group read permissions,
 	// they cannot see other members.
-	fetch := func(ctx context.Context, _ any) ([]database.UserWithGroupAndOrgID, error) {
+	fetch := func(ctx context.Context, _ any) ([]database.GroupMemberRBACHelper, error) {
 		users, err := q.db.GetGroupMembersByGroupID(ctx, id)
 		if err != nil {
 			return nil, err
 		}
-		groupMembers := make([]database.UserWithGroupAndOrgID, len(users))
+		groupMembers := make([]database.GroupMemberRBACHelper, len(users))
 		for i, user := range users {
-			groupMembers[i] = database.UserWithGroupAndOrgID{
+			groupMembers[i] = database.GroupMemberRBACHelper{
 				User:           user,
 				GroupID:        group.ID,
 				OrganizationID: group.OrganizationID,
diff --git a/coderd/database/modelmethods.go b/coderd/database/modelmethods.go
@@ -183,13 +183,13 @@ func (g Group) RBACObject() rbac.Object {
 		})
 }
 
-type UserWithGroupAndOrgID struct {
+type GroupMemberRBACHelper struct {
 	User           User
 	GroupID        uuid.UUID
 	OrganizationID uuid.UUID
 }
 
-func (gm UserWithGroupAndOrgID) RBACObject() rbac.Object {
+func (gm GroupMemberRBACHelper) RBACObject() rbac.Object {
 	return rbac.ResourceGroup.WithID(gm.GroupID).InOrg(gm.OrganizationID).
 		// Group member can see they are in the group.
 		WithACLUserList(map[string][]policy.Action{

Original file line number	Diff line number	Diff line change
`@@ -183,13 +183,13 @@ func (g Group) RBACObject() rbac.Object {`
`183`	`183`	`})`
`184`	`184`	`}`
`185`	`185`
`186`		`-type UserWithGroupAndOrgID struct {`
	`186`	`+type GroupMemberRBACHelper struct {`
`187`	`187`	`User User`
`188`	`188`	`GroupID uuid.UUID`
`189`	`189`	`OrganizationID uuid.UUID`
`190`	`190`	`}`
`191`	`191`
`192`		`-func (gm UserWithGroupAndOrgID) RBACObject() rbac.Object {`
	`192`	`+func (gm GroupMemberRBACHelper) RBACObject() rbac.Object {`
`193`	`193`	`return rbac.ResourceGroup.WithID(gm.GroupID).InOrg(gm.OrganizationID).`
`194`	`194`	`// Group member can see they are in the group.`
`195`	`195`	`WithACLUserList(map[string][]policy.Action{`