Commit4780564

authored

fix: allow user admins to manage groups (#4498)

1 parent2a1bfb3 commit4780564Copy full SHA for 4780564

File tree

+11

-1

lines changed

+11

-1

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,6 +127,7 @@ var (`
`127`	`127`	`ResourceUser.Type: {ActionCreate,ActionRead,ActionUpdate,ActionDelete},`
`128`	`128`	`// Full perms to manage org members`
`129`	`129`	`ResourceOrganizationMember.Type: {ActionCreate,ActionRead,ActionUpdate,ActionDelete},`
	`130`	`+ResourceGroup.Type: {ActionCreate,ActionRead,ActionUpdate,ActionDelete},`
`130`	`131`	`}),`
`131`	`132`	`}`
`132`	`133`	`},`

Lines changed: 9 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,15 @@ func TestRolePermissions(t *testing.T) {`
`369`	`369`	`false: {memberMe,otherOrgAdmin,otherOrgMember,userAdmin},`
`370`	`370`	`},`
`371`	`371`	`},`
	`372`	`+{`
	`373`	`+Name:"Groups",`
	`374`	`+Actions: []rbac.Action{rbac.ActionRead},`
	`375`	`+Resource:rbac.ResourceGroup.InOrg(orgID),`
	`376`	`+AuthorizeMap:map[bool][]authSubject{`
	`377`	`+true: {owner,orgAdmin,userAdmin,orgMemberMe},`
	`378`	`+false: {memberMe,otherOrgAdmin,otherOrgMember,templateAdmin},`
	`379`	`+},`
	`380`	`+},`
`372`	`381`	`}`
`373`	`382`
`374`	`383`	`for_,c:=rangetestCases {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ Coder offers these user roles in the community edition:`
`9`	`9`	`\|\| User Admin\| Template Admin\| Owner\|`
`10`	`10`	`\| ------------------------------------------\| ----------\| --------------\| -----\|`
`11`	`11`	`\| Add and remove Users\| ✅\|\| ✅\|`
`12`		`-\| Manage groups (enterprise)\|\|\|\|`
	`12`	`+\| Manage groups (enterprise)\|✅\|\|✅\|`
`13`	`13`	`\| Change User roles\|\|\| ✅\|`
`14`	`14`	`\| ManageALL Templates\|\| ✅\| ✅\|`
`15`	`15`	`\| View, update and deleteALL Workspaces\|\| ✅\| ✅\|`

Comments

(0)