chore: Make member role struct match site roles (#3671)

This commit is contained in:
Steven Masley
2022-08-24 15:58:57 -04:00
committed by GitHub
parent 076c4a0aa8
commit 0b53b06fc6
5 changed files with 46 additions and 15 deletions
+8 -2
View File
@@ -105,11 +105,17 @@ func (api *API) updateOrganizationMemberRoles(ctx context.Context, args database
}
func convertOrganizationMember(mem database.OrganizationMember) codersdk.OrganizationMember {
return codersdk.OrganizationMember{
convertedMember := codersdk.OrganizationMember{
UserID: mem.UserID,
OrganizationID: mem.OrganizationID,
CreatedAt: mem.CreatedAt,
UpdatedAt: mem.UpdatedAt,
Roles: mem.Roles,
Roles: make([]codersdk.Role, 0, len(mem.Roles)),
}
for _, roleName := range mem.Roles {
rbacRole, _ := rbac.RoleByName(roleName)
convertedMember.Roles = append(convertedMember.Roles, convertRole(rbacRole))
}
return convertedMember
}