synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-09 11:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: add display name to member role (#10239)

Browse Source 
* chore: add display name to member role
* Do not let member role be assignable
* Ignore org member role for assignability atm
This commit is contained in:
Steven Masley
2023-10-12 10:52:32 -05:00
committed by GitHub
parent e5198a25a6
commit 88605b9d01
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coderd/rbac/roles.go
View File

@ -143,7 +143,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
memberRole := Role{ memberRole := Role{
Name: member, Name: member,
DisplayName: "", DisplayName: "Member",
Site: Permissions(map[string][]Action{ Site: Permissions(map[string][]Action{
ResourceRoleAssignment.Type: {ActionRead}, ResourceRoleAssignment.Type: {ActionRead},
// All users can see the provisioner daemons. // All users can see the provisioner daemons.

5
coderd/roles.go
View File

@ -58,7 +58,10 @@ func (api *API) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []codersdk.AssignableRoles { func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []codersdk.AssignableRoles {
assignable := make([]codersdk.AssignableRoles, 0) assignable := make([]codersdk.AssignableRoles, 0)
for _, role := range roles { for _, role := range roles {
if role.DisplayName == "" { // The member role is implied, and not assignable.
// If there is no display name, then the role is also unassigned.
// This is not the ideal logic, but works for now.
if role.Name == rbac.RoleMember() || (role.DisplayName == "") {
continue continue
} }
assignable = append(assignable, codersdk.AssignableRoles{ assignable = append(assignable, codersdk.AssignableRoles{