Commit1e1fd68

committed

fix: omit users for allUsersGroup response

1 parent69fce04 commit1e1fd68Copy full SHA for 1e1fd68

File tree

-73

lines changed

-73

lines changed

Lines changed: 0 additions & 1 deletion

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 0 additions & 49 deletions

Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

Lines changed: 0 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,18 +36,6 @@ AND`
`36`	`36`	`AND`
`37`	`37`	`users.deleted='false';`
`38`	`38`
`39`		`--- name: GetAllOrganizationMembers :many`
`40`		`-SELECT`
`41`		`-users.*`
`42`		`-FROM`
`43`		`-users`
`44`		`-JOIN`
`45`		`-organization_members`
`46`		`-ON`
`47`		`-users.id=organization_members.user_id`
`48`		`-WHERE`
`49`		`-organization_members.organization_id= $1;`
`50`		`-`
`51`	`39`	`-- name: GetGroupsByOrganizationID :many`
`52`	`40`	`SELECT`
`53`	`41`	`*`

Lines changed: 5 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -78,16 +78,13 @@ func (api API) templateACL(rw http.ResponseWriter, r http.Request) {`
`78`	`78`	`for_,group:=rangedbGroups {`
`79`	`79`	`varmembers []database.User`
`80`	`80`
`81`		`-ifgroup.Name==database.AllUsersGroup {`
`82`		`-members,err=api.Database.GetAllOrganizationMembers(ctx,group.OrganizationID)`
`83`		`-}else {`
	`81`	`+ifgroup.Name!=database.AllUsersGroup {`
`84`	`82`	`members,err=api.Database.GetGroupMembers(ctx,group.ID)`
	`83`	`+iferr!=nil {`
	`84`	`+httpapi.InternalServerError(rw,err)`
	`85`	`+return`
	`86`	`+}`
`85`	`87`	`}`
`86`		`-iferr!=nil {`
`87`		`-httpapi.InternalServerError(rw,err)`
`88`		`-return`
`89`		`-}`
`90`		`-`
`91`	`88`	`groups=append(groups, codersdk.TemplateGroup{`
`92`	`89`	`Group:convertGroup(group.Group,members),`
`93`	`90`	`Role:convertToTemplateRole(group.Actions),`

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,8 @@ func TestTemplateACL(t *testing.T) {`
`76`	`76`	`},`
`77`	`77`	`})`
`78`	`78`
`79`		`-_,user1:=coderdtest.CreateAnotherUserWithUser(t,client,user.OrganizationID)`
	`79`	`+// Create a user to assert they aren't returned in the response.`
	`80`	`+_,_=coderdtest.CreateAnotherUserWithUser(t,client,user.OrganizationID)`
`80`	`81`	`version:=coderdtest.CreateTemplateVersion(t,client,user.OrganizationID,nil)`
`81`	`82`	`template:=coderdtest.CreateTemplate(t,client,user.OrganizationID,version.ID)`
`82`	`83`
`@@ -87,8 +88,8 @@ func TestTemplateACL(t *testing.T) {`
`87`	`88`	`require.NoError(t,err)`
`88`	`89`
`89`	`90`	`require.Len(t,acl.Groups,1)`
`90`		`-require.Len(t,acl.Groups[0].Members,2)`
`91`		`-require.Contains(t,acl.Groups[0].Members,user1)`
	`91`	`+// We don't return members for the allUsers group.`
	`92`	`+require.Len(t,acl.Groups[0].Members,0)`
`92`	`93`	`require.Len(t,acl.Users,0)`
`93`	`94`	`})`
`94`	`95`

Comments

(0)