coder · BrunoQuaresma · Apr 18, 2022 · Apr 15, 2022 · Apr 15, 2022 · Apr 18, 2022
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -145,6 +145,7 @@ func New(options *Options) (http.Handler, func()) {
 			r.Group(func(r chi.Router) {
 				r.Use(httpmw.ExtractAPIKey(options.Database, nil))
 				r.Post("/", api.postUsers)
+				r.Get("/", api.getUsers)
 				r.Route("/{user}", func(r chi.Router) {
 					r.Use(httpmw.ExtractUserParam(options.Database))
 					r.Get("/", api.userByName)

diff --git a/coderd/database/databasefake/databasefake.go b/coderd/database/databasefake/databasefake.go
@@ -164,6 +164,13 @@ func (q *fakeQuerier) GetUserCount(_ context.Context) (int64, error) {
 	return int64(len(q.users)), nil
 }
 
+func (q *fakeQuerier) GetUsers(_ context.Context) ([]database.User, error) {
+	q.mutex.RLock()
+	defer q.mutex.RUnlock()
+
+	return q.users, nil
+}
+
 func (q *fakeQuerier) GetWorkspacesByTemplateID(_ context.Context, arg database.GetWorkspacesByTemplateIDParams) ([]database.Workspace, error) {
 	q.mutex.RLock()
 	defer q.mutex.RUnlock()

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
@@ -51,3 +51,9 @@ SET
 	updated_at = $5
 WHERE
 	id = $1 RETURNING *;
+
+-- name: GetUsers :many
+SELECT
+	*
+FROM
+	users;
diff --git a/coderd/users.go b/coderd/users.go
@@ -23,6 +23,25 @@ import (
 	"github.com/coder/coder/cryptorand"
 )
 
+// Lists all the users
+func (api *api) getUsers(rw http.ResponseWriter, r *http.Request) {
+	users, err := api.Database.GetUsers(r.Context())
+
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: fmt.Sprintf("get users: %s", err.Error()),
+		})
+		return
+	}
+
+	var res []codersdk.User
+	for _, user := range users {
+		res = append(res, convertUser(user))
+	}
+
+	httpapi.Write(rw, http.StatusOK, res)
+}
+
 // Returns whether the initial user has been created or not.
 func (api *api) firstUser(rw http.ResponseWriter, r *http.Request) {
 	userCount, err := api.Database.GetUserCount(r.Context())

diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -313,6 +313,21 @@ func TestUserByName(t *testing.T) {
 	require.NoError(t, err)
 }
 
+func TestGetUsers(t *testing.T) {
+	t.Parallel()
+	client := coderdtest.New(t, nil)
+	user := coderdtest.CreateFirstUser(t, client)
+	client.CreateUser(context.Background(), codersdk.CreateUserRequest{
+		Email:          "[email protected]",
+		Username:       "bruno",
+		Password:       "password",
+		OrganizationID: user.OrganizationID,
+	})
+	users, err := client.GetUsers(context.Background())
+	require.NoError(t, err)
+	require.Len(t, users, 2)
+}
+
 func TestOrganizationsByUser(t *testing.T) {
 	t.Parallel()
 	client := coderdtest.New(t, nil)

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -136,6 +136,19 @@ func (c *Client) UpdateUserProfile(ctx context.Context, userID uuid.UUID, req Up
 	return user, json.NewDecoder(res.Body).Decode(&user)
 }
 
+func (c *Client) GetUsers(ctx context.Context) ([]User, error) {
+	res, err := c.request(ctx, http.MethodGet, "/api/v2/users", nil)
+	if err != nil {
+		return []User{}, err
+	}
+	defer res.Body.Close()
+	if res.StatusCode != http.StatusOK {
+		return []User{}, readBodyAsError(res)
+	}
+	var users []User
+	return users, json.NewDecoder(res.Body).Decode(&users)
+}
+
 // 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)

diff --git a/peerbroker/proto/peerbroker.pb.go b/peerbroker/proto/peerbroker.pb.go
diff --git a/provisionerd/proto/provisionerd.pb.go b/provisionerd/proto/provisionerd.pb.go
diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go