whatever I have so far

coder · aslilac · Jul 16, 2024 · Jul 8, 2024 · Jul 8, 2024 · Jul 8, 2024
commit c09f530e8a24456a49892d3ccea9126b7d8f2e65
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/apikey.go b/coderd/apikey.go
@@ -333,7 +333,7 @@ func (api *API) deleteAPIKey(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // @Summary Get token config

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
 FROM
 	organization_members
 		INNER JOIN

diff --git a/coderd/debug.go b/coderd/debug.go
@@ -235,7 +235,7 @@ func (api *API) putDeploymentHealthSettings(rw http.ResponseWriter, r *http.Requ
 
 	if bytes.Equal(settingsJSON, []byte(currentSettingsJSON)) {
 		// See: https://www.rfc-editor.org/rfc/rfc7231#section-6.3.5
-		httpapi.Write(r.Context(), rw, http.StatusNoContent, nil)
+		rw.WriteHeader(http.StatusNoContent)
 		return
 	}
 

diff --git a/coderd/externalauth.go b/coderd/externalauth.go
@@ -197,7 +197,7 @@ func (api *API) postExternalAuthDeviceByID(rw http.ResponseWriter, r *http.Reque
 			return
 		}
 	}
-	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // @Summary Get external auth device by ID.

diff --git a/coderd/identityprovider/revoke.go b/coderd/identityprovider/revoke.go
@@ -39,6 +39,6 @@ func RevokeApp(db database.Store) http.HandlerFunc {
 			httpapi.InternalServerError(rw, err)
 			return
 		}
-		httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+		rw.WriteHeader(http.StatusNoContent)
 	}
 }
diff --git a/coderd/members.go b/coderd/members.go
@@ -86,7 +86,7 @@ func (api *API) postOrganizationMember(rw http.ResponseWriter, r *http.Request)
 // @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 (
@@ -118,7 +118,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
@@ -127,7 +127,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 (
@@ -148,7 +148,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
@@ -292,7 +292,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)
@@ -306,10 +306,12 @@ 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,
 			OrganizationMember: convertedMembers[i],
 		})
 	}

diff --git a/coderd/oauth2.go b/coderd/oauth2.go
@@ -207,7 +207,7 @@ func (api *API) deleteOAuth2ProviderApp(rw http.ResponseWriter, r *http.Request)
 		})
 		return
 	}
-	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // @Summary Get OAuth2 application secrets.
@@ -324,7 +324,7 @@ func (api *API) deleteOAuth2ProviderAppSecret(rw http.ResponseWriter, r *http.Re
 		})
 		return
 	}
-	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // @Summary OAuth2 authorization request.

diff --git a/coderd/templates.go b/coderd/templates.go
@@ -800,7 +800,7 @@ func (api *API) patchTemplateMeta(rw http.ResponseWriter, r *http.Request) {
 
 	if updated.UpdatedAt.IsZero() {
 		aReq.New = template
-		httpapi.Write(ctx, rw, http.StatusNotModified, nil)
+		rw.WriteHeader(http.StatusNotModified)
 		return
 	}
 	aReq.New = updated

diff --git a/coderd/users.go b/coderd/users.go
@@ -504,7 +504,7 @@ func (api *API) postUser(rw http.ResponseWriter, r *http.Request) {
 // @Produce json
 // @Tags Users
 // @Param user path string true "User ID, name, or me"
-// @Success 200 {object} codersdk.User
+// @Success 204
 // @Router /users/{user} [delete]
 func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
@@ -558,9 +558,7 @@ func (api *API) deleteUser(rw http.ResponseWriter, r *http.Request) {
 	}
 	user.Deleted = true
 	aReq.New = user
-	httpapi.Write(ctx, rw, http.StatusOK, codersdk.Response{
-		Message: "User has been deleted!",
-	})
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // Returns the parameterized user requested. All validation
@@ -1008,7 +1006,7 @@ func (api *API) putUserPassword(rw http.ResponseWriter, r *http.Request) {
 	newUser.HashedPassword = []byte(hashedPassword)
 	aReq.New = newUser
 
-	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+	rw.WriteHeader(http.StatusNoContent)
 }
 
 // @Summary Get user roles

diff --git a/coderd/workspaces.go b/coderd/workspaces.go
@@ -927,9 +927,7 @@ func (api *API) putWorkspaceDormant(rw http.ResponseWriter, r *http.Request) {
 
 	// If the workspace is already in the desired state do nothing!
 	if workspace.DormantAt.Valid == req.Dormant {
-		httpapi.Write(ctx, rw, http.StatusNotModified, codersdk.Response{
-			Message: "Nothing to do!",
-		})
+		rw.WriteHeader(http.StatusNotModified)
 		return
 	}
 

diff --git a/codersdk/organizations.go b/codersdk/organizations.go
@@ -65,8 +65,10 @@ type OrganizationMember struct {
 	Roles          []SlimRole `table:"organization_roles" json:"roles"`
 }
 
-type OrganizationMemberWithName struct {
+type OrganizationMemberWithUserData struct {
 	Username           string `table:"username,default_sort" json:"username"`
+	Name               string `table:"name" json:"name"`
+	AvatarURL          string `json:"avatar_url"`
 	OrganizationMember `table:"m,recursive_inline"`
 }
 

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -409,7 +409,7 @@ func (c *Client) DeleteOrganizationMember(ctx context.Context, organizationID uu
 }
 
 // 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)
 }
 

diff --git a/docs/api/members.md b/docs/api/members.md
diff --git a/docs/api/users.md b/docs/api/users.md
@@ -541,6 +541,22 @@ class ApiMethods {
     return response.data;
   };
 
+  getOrganizationMembers = async (organizationId: string) => {
+    const response = await this.axios.get<
+      TypesGen.OrganizationMemberWithName[]
+    >(`/api/v2/organizations/${organizationId}/members`);
+
+    return response.data;
+  };
+
+  addOrganizationMember = async (organizationId: string, userId: string) => {
+    const response = await this.axios.post<TypesGen.OrganizationMember>(
+      `/api/v2/organizations/${organizationId}/members/${userId}`,
+    );
+
+    return response.data;
+  };
+
   getOrganizations = async (): Promise<TypesGen.Organization[]> => {
     const response = await this.axios.get<TypesGen.Organization[]>(
       "/api/v2/users/me/organizations",
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
-    	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
+    	rw.WriteHeader(http.StatusNoContent)
     }
     // @Summary Get token config
@@ Expand Down @@