Skip to content

chore: add display name to member role #10239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 12, 2023
Merged

chore: add display name to member role #10239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2caf5d
chore: add display name to member role
Emyrk Oct 12, 2023
bd53734
Do not let member role be assignable
Emyrk Oct 12, 2023
6a547ed
Ignore org member role for assignability atm
Emyrk Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion coderd/rbac/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ func ReloadBuiltinRoles(opts *RoleOptions) {

memberRole := Role{
Name: member,
DisplayName: "",
DisplayName: "Member",
Site: Permissions(map[string][]Action{
ResourceRoleAssignment.Type: {ActionRead},
// All users can see the provisioner daemons.
Expand Down
5 changes: 4 additions & 1 deletion coderd/roles.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ func (api *API) assignableOrgRoles(rw http.ResponseWriter, r *http.Request) {
func assignableRoles(actorRoles rbac.ExpandableRoles, roles []rbac.Role) []codersdk.AssignableRoles {
assignable := make([]codersdk.AssignableRoles, 0)
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
}
assignable = append(assignable, codersdk.AssignableRoles{
Expand Down