Skip to content

Commit 88605b9

Browse files
authored
chore: add display name to member role (coder#10239)
* chore: add display name to member role * Do not let member role be assignable * Ignore org member role for assignability atm
1 parent e5198a2 commit 88605b9

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

coderd/rbac/roles.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {
143143

144144
memberRole := Role{
145145
Name: member,
146-
DisplayName: "",
146+
DisplayName: "Member",
147147
Site: Permissions(map[string][]Action{
148148
ResourceRoleAssignment.Type: {ActionRead},
149149
// All users can see the provisioner daemons.

coderd/roles.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ func (api *API) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
5858
func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []codersdk.AssignableRoles {
5959
assignable := make([]codersdk.AssignableRoles, 0)
6060
for _, role := range roles {
61-
if role.DisplayName == "" {
61+
// The member role is implied, and not assignable.
62+
// If there is no display name, then the role is also unassigned.
63+
// This is not the ideal logic, but works for now.
64+
if role.Name == rbac.RoleMember() || (role.DisplayName == "") {
6265
continue
6366
}
6467
assignable = append(assignable, codersdk.AssignableRoles{

0 commit comments

Comments
 (0)