coder · BrunoQuaresma · Apr 12, 2022 · Apr 7, 2022 · Apr 7, 2022 · Apr 7, 2022
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -135,6 +135,7 @@ func New(options *Options) (http.Handler, func()) {
 				r.Route("/{user}", func(r chi.Router) {
 					r.Use(httpmw.ExtractUserParam(options.Database))
 					r.Get("/", api.userByName)
+					r.Patch("/", api.patchUser)
 					r.Get("/organizations", api.organizationsByUser)
 					r.Post("/organizations", api.postOrganizationsByUser)
 					r.Post("/keys", api.postAPIKey)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -1027,6 +1027,22 @@ func (q *fakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
 	return user, nil
 }
 
+func (q *fakeQuerier) UpdateUser(_ context.Context, arg database.UpdateUserParams) (database.User, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, user := range q.users {
+		if user.ID != arg.ID {
+			continue
+		}
+		user.Email = arg.Email
+		user.Username = arg.Username
+		q.users[index] = user
+		return user, nil
+	}
+	return database.User{}, sql.ErrNoRows
+}
+
 func (q *fakeQuerier) InsertWorkspace(_ context.Context, arg database.InsertWorkspaceParams) (database.Workspace, error) {
 	q.mutex.Lock()
 	defer q.mutex.Unlock()

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/users.sql b/coderd/database/queries/users.sql
@@ -40,3 +40,16 @@ INSERT INTO
 	)
 VALUES
 	($1, $2, $3, $4, FALSE, $5, $6, $7, $8) RETURNING *;
+
+-- name: UpdateUser :one
+UPDATE
+	users
+SET
+	email = $2,
+	"name" = $3,
+	username = $4,
+	updated_at = CURRENT_TIMESTAMP
+WHERE
+	id = $1
+RETURNING *;
+
diff --git a/coderd/users.go b/coderd/users.go
@@ -270,6 +270,32 @@ func (*api) userByName(rw http.ResponseWriter, r *http.Request) {
 	render.JSON(rw, r, convertUser(user))
 }
 
+func (api *api) patchUser(rw http.ResponseWriter, r *http.Request) {
+	user := httpmw.UserParam(r)
+
+	var patchUser codersdk.PatchUserRequest
+	if !httpapi.Read(rw, r, &patchUser) {
+		return
+	}
+
+	updatedUser, err := api.Database.UpdateUser(r.Context(), database.UpdateUserParams{
+		ID:       user.ID,
+		Name:     patchUser.Name,
+		Email:    patchUser.Email,
+		Username: patchUser.Username,
+	})
+
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: fmt.Sprintf("patch user: %s", err.Error()),
+		})
+		return
+	}
+
+	render.Status(r, http.StatusOK)
+	render.JSON(rw, r, convertUser(updatedUser))
+}
+
 // Returns organizations the parameterized user has access to.
 func (api *api) organizationsByUser(rw http.ResponseWriter, r *http.Request) {
 	user := httpmw.UserParam(r)

diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -200,6 +200,19 @@ func TestPostUsers(t *testing.T) {
 	})
 }
 
+func TestPatchUser(t *testing.T) {
+	t.Parallel()
+	client := coderdtest.New(t, nil)
+	coderdtest.CreateFirstUser(t, client)
+	user, err := client.PatchUser(context.Background(), codersdk.Me, codersdk.PatchUserRequest{
+		Username: "newusername",
+		Email:    "newemail@coder.com",
+	})
+	require.NoError(t, err)
+	require.Equal(t, user.Username, "newusername")
+	require.Equal(t, user.Email, "newemail@coder.com")
+}
+
 func TestUserByName(t *testing.T) {
 	t.Parallel()
 	client := coderdtest.New(t, nil)

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -41,6 +41,12 @@ type CreateUserRequest struct {
 	OrganizationID uuid.UUID `json:"organization_id" validate:"required"`
 }
 
+type PatchUserRequest struct {
+	Email    string `json:"email" validate:"required,email"`
+	Username string `json:"username" validate:"required,username"`
+	Name     string `json:"name"`
+}
+
 // LoginWithPasswordRequest enables callers to authenticate with email and password.
 type LoginWithPasswordRequest struct {
 	Email    string `json:"email" validate:"required,email"`
@@ -115,6 +121,20 @@ func (c *Client) CreateUser(ctx context.Context, req CreateUserRequest) (User, e
 	return user, json.NewDecoder(res.Body).Decode(&user)
 }
 
+// Patch User
+func (c *Client) PatchUser(ctx context.Context, userID uuid.UUID, req PatchUserRequest) (User, error) {
+	res, err := c.request(ctx, http.MethodPatch, fmt.Sprintf("/api/v2/users/%s", uuidOrMe(userID)), req)
+	if err != nil {
+		return User{}, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return User{}, readBodyAsError(res)
+	}
+	var user User
+	return user, json.NewDecoder(res.Body).Decode(&user)
+}
+
 // CreateAPIKey generates an API key for the user ID provided.
 func (c *Client) CreateAPIKey(ctx context.Context, userID uuid.UUID) (*GenerateAPIKeyResponse, error) {
 	res, err := c.request(ctx, http.MethodPost, fmt.Sprintf("/api/v2/users/%s/keys", uuidOrMe(userID)), nil)