coder · BrunoQuaresma · Apr 26, 2022 · Apr 25, 2022 · Apr 25, 2022 · Apr 25, 2022
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -173,6 +173,7 @@ func New(options *Options) (http.Handler, func()) {
 					r.Use(httpmw.ExtractUserParam(options.Database))
 					r.Get("/", api.userByName)
 					r.Put("/profile", api.putUserProfile)
+					r.Put("/suspend", api.putUserSuspend)
 					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
@@ -1118,6 +1118,7 @@ func (q *fakeQuerier) InsertUser(_ context.Context, arg database.InsertUserParam
 		CreatedAt:      arg.CreatedAt,
 		UpdatedAt:      arg.UpdatedAt,
 		Username:       arg.Username,
+		Status:         database.UserStatusTypeActive,
 	}
 	q.users = append(q.users, user)
 	return user, nil
@@ -1139,6 +1140,22 @@ func (q *fakeQuerier) UpdateUserProfile(_ context.Context, arg database.UpdateUs
 	return database.User{}, sql.ErrNoRows
 }
 
+func (q *fakeQuerier) UpdateUserStatus(_ context.Context, arg database.UpdateUserStatusParams) (database.User, error) {
+	q.mutex.Lock()
+	defer q.mutex.Unlock()
+
+	for index, user := range q.users {
+		if user.ID != arg.ID {
+			continue
+		}
+		user.Status = arg.Status
+		user.UpdatedAt = arg.UpdatedAt
+		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/dump.sql b/coderd/database/dump.sql
diff --git a/coderd/database/migrations/000007_user_status.down.sql b/coderd/database/migrations/000007_user_status.down.sql
@@ -0,0 +1,4 @@
+DROP TYPE user_status_type;
+
+ALTER TABLE ONLY users
+    DROP COLUMN IF EXISTS status;
diff --git a/coderd/database/migrations/000007_user_status.up.sql b/coderd/database/migrations/000007_user_status.up.sql
@@ -0,0 +1,4 @@
+CREATE TYPE user_status_type AS ENUM ('active', 'suspended');
+
+ALTER TABLE ONLY users
+    ADD COLUMN IF NOT EXISTS status user_status_type NOT NULL DEFAULT 'active';
diff --git a/coderd/database/models.go b/coderd/database/models.go
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
@@ -90,3 +90,12 @@ ORDER BY
 LIMIT
 	-- A null limit means "no limit", so -1 means return all
 	NULLIF(@limit_opt :: int, -1);
+
+-- name: UpdateUserStatus :one
+UPDATE
+	users
+SET
+	status = $2,
+	updated_at = $3
+WHERE
+	id = $1 RETURNING *;
diff --git a/coderd/users.go b/coderd/users.go
@@ -283,6 +283,25 @@ func (api *api) putUserProfile(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(rw, http.StatusOK, convertUser(updatedUserProfile))
 }
 
+func (api *api) putUserSuspend(rw http.ResponseWriter, r *http.Request) {
+	user := httpmw.UserParam(r)
+
+	suspendedUser, err := api.Database.UpdateUserStatus(r.Context(), database.UpdateUserStatusParams{
+		ID:        user.ID,
+		Status:    database.UserStatusTypeSuspended,
+		UpdatedAt: database.Now(),
+	})
+
+	if err != nil {
+		httpapi.Write(rw, http.StatusInternalServerError, httpapi.Response{
+			Message: fmt.Sprintf("put user suspended: %s", err.Error()),
+		})
+		return
+	}
+
+	httpapi.Write(rw, http.StatusOK, convertUser(suspendedUser))
+}
+
 // Returns organizations the parameterized user has access to.
 func (api *api) organizationsByUser(rw http.ResponseWriter, r *http.Request) {
 	user := httpmw.UserParam(r)
@@ -942,6 +961,7 @@ func convertUser(user database.User) codersdk.User {
 		Email:     user.Email,
 		CreatedAt: user.CreatedAt,
 		Username:  user.Username,
+		Status:    codersdk.UserStatus(user.Status),
 	}
 }
 

diff --git a/coderd/users_test.go b/coderd/users_test.go
@@ -285,6 +285,38 @@ func TestUpdateUserProfile(t *testing.T) {
 	})
 }
 
+func TestPutUserSuspend(t *testing.T) {
+	t.Parallel()
+
+	t.Run("SuspendAnotherUser", func(t *testing.T) {
+		t.Skip()
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		me := coderdtest.CreateFirstUser(t, client)
+		client.User(context.Background(), codersdk.Me)
+		user, err := client.CreateUser(context.Background(), codersdk.CreateUserRequest{
+			Email:          "bruno@coder.com",
+			Username:       "bruno",
+			Password:       "password",
+			OrganizationID: me.OrganizationID,
+		})
+		user, err = client.SuspendUser(context.Background(), user.ID)
+		require.NoError(t, err)
+		require.Equal(t, user.Status, codersdk.UserStatusSuspended)
+	})
+
+	t.Run("SuspendItSelf", func(t *testing.T) {
+		t.Parallel()
+		client := coderdtest.New(t, nil)
+		coderdtest.CreateFirstUser(t, client)
+		client.User(context.Background(), codersdk.Me)
+		suspendedUser, err := client.SuspendUser(context.Background(), codersdk.Me)
+
+		require.NoError(t, err)
+		require.Equal(t, suspendedUser.Status, codersdk.UserStatusSuspended)
+	})
+}
+
 func TestUserByName(t *testing.T) {
 	t.Parallel()
 	client := coderdtest.New(t, nil)

diff --git a/codersdk/users.go b/codersdk/users.go
@@ -28,12 +28,20 @@ type UsersRequest struct {
 	Offset int `json:"offset"`
 }
 
+type UserStatus string
+
+const (
+	UserStatusActive    UserStatus = "active"
+	UserStatusSuspended UserStatus = "suspended"
+)
+
 // User represents a user in Coder.
 type User struct {
-	ID        uuid.UUID `json:"id" validate:"required"`
-	Email     string    `json:"email" validate:"required"`
-	CreatedAt time.Time `json:"created_at" validate:"required"`
-	Username  string    `json:"username" validate:"required"`
+	ID        uuid.UUID  `json:"id" validate:"required"`
+	Email     string     `json:"email" validate:"required"`
+	CreatedAt time.Time  `json:"created_at" validate:"required"`
+	Username  string     `json:"username" validate:"required"`
+	Status    UserStatus `json:"status"`
 }
 
 type CreateFirstUserRequest struct {
@@ -155,6 +163,20 @@ func (c *Client) UpdateUserProfile(ctx context.Context, userID uuid.UUID, req Up
 	return user, json.NewDecoder(res.Body).Decode(&user)
 }
 
+// SuspendUser enables callers to suspend a user
+func (c *Client) SuspendUser(ctx context.Context, userID uuid.UUID) (User, error) {
+	res, err := c.request(ctx, http.MethodPut, fmt.Sprintf("/api/v2/users/%s/suspend", uuidOrMe(userID)), nil)
+	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)