coder · aslilac · Jul 16, 2024 · Jul 8, 2024 · Jul 8, 2024 · Jul 8, 2024
diff --git a/cli/organizationmembers.go b/cli/organizationmembers.go
@@ -137,7 +137,7 @@ func (r *RootCmd) assignOrganizationRoles(orgContext *OrganizationContext) *serp
 
 func (r *RootCmd) listOrganizationMembers(orgContext *OrganizationContext) *serpent.Command {
 	formatter := cliui.NewOutputFormatter(
-		cliui.TableFormat([]codersdk.OrganizationMemberWithName{}, []string{"username", "organization_roles"}),
+		cliui.TableFormat([]codersdk.OrganizationMemberWithUserData{}, []string{"username", "organization_roles"}),
 		cliui.JSONFormat(),
 	)
 

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/db2sdk/db2sdk.go b/coderd/database/db2sdk/db2sdk.go
@@ -166,25 +166,7 @@ func User(user database.User, organizationIDs []uuid.UUID) codersdk.User {
 	convertedUser := codersdk.User{
 		ReducedUser:     ReducedUser(user),
 		OrganizationIDs: organizationIDs,
-		Roles:           make([]codersdk.SlimRole, 0, len(user.RBACRoles)),
-	}
-
-	for _, roleName := range user.RBACRoles {
-		// TODO: Currently the api only returns site wide roles.
-		// 	Should it return organization roles?
-		rbacRole, err := rbac.RoleByName(rbac.RoleIdentifier{
-			Name:           roleName,
-			OrganizationID: uuid.Nil,
-		})
-		if err == nil {
-			convertedUser.Roles = append(convertedUser.Roles, SlimRole(rbacRole))
-		} else {
-			// TODO: Fix this for custom roles to display the actual display_name
-			//		Requires plumbing either a cached role value, or the db.
-			convertedUser.Roles = append(convertedUser.Roles, codersdk.SlimRole{
-				Name: roleName,
-			})
-		}
+		Roles:           SlimRolesFromNames(user.RBACRoles),
 	}
 
 	return convertedUser
@@ -537,6 +519,27 @@ func SlimRole(role rbac.Role) codersdk.SlimRole {
 	}
 }
 
+func SlimRolesFromNames(names []string) []codersdk.SlimRole {
+	convertedRoles := make([]codersdk.SlimRole, 0, len(names))
+
+	for _, name := range names {
+		convertedRoles = append(convertedRoles, SlimRoleFromName(name))
+	}
+
+	return convertedRoles
+}
+
+func SlimRoleFromName(name string) codersdk.SlimRole {
+	rbacRole, err := rbac.RoleByName(rbac.RoleIdentifier{Name: name})
+	var convertedRole codersdk.SlimRole
+	if err == nil {
+		convertedRole = SlimRole(rbacRole)
+	} else {
+		convertedRole = codersdk.SlimRole{Name: name}
+	}
+	return convertedRole
+}
+
 func RBACRole(role rbac.Role) codersdk.Role {
 	slim := SlimRole(role)
 

diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/organizationmembers.sql b/coderd/database/queries/organizationmembers.sql
@@ -5,7 +5,7 @@
 --  - Use both to get a specific org member row
 SELECT
 	sqlc.embed(organization_members),
-	users.username
+	users.username, users.avatar_url, users.name, users.rbac_roles as "global_roles"
 FROM
 	organization_members
 		INNER JOIN

diff --git a/coderd/members.go b/coderd/members.go
@@ -83,15 +83,15 @@ func (api *API) postOrganizationMember(rw http.ResponseWriter, r *http.Request)
 // @Summary Remove organization member
 // @ID remove-organization-member
 // @Security CoderSessionToken
-// @Produce json
 // @Tags Members
 // @Param organization path string true "Organization ID"
 // @Param user path string true "User ID, name, or me"
-// @Success 200 {object} codersdk.OrganizationMember
+// @Success 204
 // @Router /organizations/{organization}/members/{user} [delete]
 func (api *API) deleteOrganizationMember(rw http.ResponseWriter, r *http.Request) {
 	var (
 		ctx               = r.Context()
+		apiKey            = httpmw.APIKey(r)
 		organization      = httpmw.OrganizationParam(r)
 		member            = httpmw.OrganizationMemberParam(r)
 		auditor           = api.Auditor.Load()
@@ -106,6 +106,11 @@ func (api *API) deleteOrganizationMember(rw http.ResponseWriter, r *http.Request
 	aReq.Old = member.OrganizationMember.Auditable(member.Username)
 	defer commitAudit()
 
+	if member.UserID == apiKey.UserID {
+		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{Message: "cannot remove self from an organization"})
+		return
+	}
+
 	err := api.Database.DeleteOrganizationMember(ctx, database.DeleteOrganizationMemberParams{
 		OrganizationID: organization.ID,
 		UserID:         member.UserID,
@@ -120,7 +125,7 @@ func (api *API) deleteOrganizationMember(rw http.ResponseWriter, r *http.Request
 	}
 
 	aReq.New = database.AuditableOrganizationMember{}
-	httpapi.Write(ctx, rw, http.StatusOK, "organization member removed")
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // @Summary List organization members
@@ -129,7 +134,7 @@ func (api *API) deleteOrganizationMember(rw http.ResponseWriter, r *http.Request
 // @Produce json
 // @Tags Members
 // @Param organization path string true "Organization ID"
-// @Success 200 {object} []codersdk.OrganizationMemberWithName
+// @Success 200 {object} []codersdk.OrganizationMemberWithUserData
 // @Router /organizations/{organization}/members [get]
 func (api *API) listMembers(rw http.ResponseWriter, r *http.Request) {
 	var (
@@ -150,7 +155,7 @@ func (api *API) listMembers(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	resp, err := convertOrganizationMemberRows(ctx, api.Database, members)
+	resp, err := convertOrganizationMembersWithUserData(ctx, api.Database, members)
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
 		return
@@ -294,7 +299,7 @@ func convertOrganizationMembers(ctx context.Context, db database.Store, mems []d
 	return converted, nil
 }
 
-func convertOrganizationMemberRows(ctx context.Context, db database.Store, rows []database.OrganizationMembersRow) ([]codersdk.OrganizationMemberWithName, error) {
+func convertOrganizationMembersWithUserData(ctx context.Context, db database.Store, rows []database.OrganizationMembersRow) ([]codersdk.OrganizationMemberWithUserData, error) {
 	members := make([]database.OrganizationMember, 0)
 	for _, row := range rows {
 		members = append(members, row.OrganizationMember)
@@ -308,10 +313,13 @@ func convertOrganizationMemberRows(ctx context.Context, db database.Store, rows
 		return nil, xerrors.Errorf("conversion failed, mismatch slice lengths")
 	}
 
-	converted := make([]codersdk.OrganizationMemberWithName, 0)
+	converted := make([]codersdk.OrganizationMemberWithUserData, 0)
 	for i := range convertedMembers {
-		converted = append(converted, codersdk.OrganizationMemberWithName{
+		converted = append(converted, codersdk.OrganizationMemberWithUserData{
 			Username:           rows[i].Username,
+			AvatarURL:          rows[i].AvatarURL,
+			Name:               rows[i].Name,
+			GlobalRoles:        db2sdk.SlimRolesFromNames(rows[i].GlobalRoles),
 			OrganizationMember: convertedMembers[i],
 		})
 	}

diff --git a/coderd/members_test.go b/coderd/members_test.go
@@ -185,6 +185,6 @@ func TestRemoveMember(t *testing.T) {
 	})
 }
 
-func onlyIDs(u codersdk.OrganizationMemberWithName) uuid.UUID {
+func onlyIDs(u codersdk.OrganizationMemberWithUserData) uuid.UUID {
 	return u.UserID
 }
diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -66,8 +66,11 @@ type OrganizationMember struct {
 	Roles          []SlimRole `table:"organization_roles" json:"roles"`
 }
 
-type OrganizationMemberWithName struct {
-	Username           string `table:"username,default_sort" json:"username"`
+type OrganizationMemberWithUserData struct {
+	Username           string     `table:"username,default_sort" json:"username"`
+	Name               string     `table:"name" json:"name"`
+	AvatarURL          string     `json:"avatar_url"`
+	GlobalRoles        []SlimRole `json:"global_roles"`
 	OrganizationMember `table:"m,recursive_inline"`
 }
 

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -402,14 +402,14 @@ func (c *Client) DeleteOrganizationMember(ctx context.Context, organizationID uu
 		return err
 	}
 	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
+	if res.StatusCode != http.StatusNoContent {
 		return ReadBodyAsError(res)
 	}
 	return nil
 }
 
 // OrganizationMembers lists all members in an organization
-func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMemberWithName, error) {
+func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UUID) ([]OrganizationMemberWithUserData, error) {
 	res, err := c.Request(ctx, http.MethodGet, fmt.Sprintf("/api/v2/organizations/%s/members/", organizationID), nil)
 	if err != nil {
 		return nil, err
@@ -418,7 +418,7 @@ func (c *Client) OrganizationMembers(ctx context.Context, organizationID uuid.UU
 	if res.StatusCode != http.StatusOK {
 		return nil, ReadBodyAsError(res)
 	}
-	var members []OrganizationMemberWithName
+	var members []OrganizationMemberWithUserData
 	return members, json.NewDecoder(res.Body).Decode(&members)
 }