Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025 · Jul 17, 2025
diff --git a/coderd/coderd.go b/coderd/coderd.go
 })
 r.Get("/appearance", api.userAppearanceSettings)
 r.Put("/appearance", api.putUserAppearanceSettings)
 r.Get("/proxy", api.userProxySettings)
 r.Put("/proxy", api.putUserProxySettings)
 r.Delete("/proxy", api.deleteUserProxySettings)
 r.Route("/password", func(r chi.Router) {
 r.Use(httpmw.RateLimit(options.LoginRateLimit, time.Minute))
 r.Put("/", api.putUserPassword)
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
 return q.db.UpdateUserThemePreference(ctx, arg)
 }

 func (q *querier) GetUserPreferredProxy(ctx context.Context, userID uuid.UUID) (string, error) {
 u, err := q.db.GetUserByID(ctx, userID)
 if err != nil {
 return "", err
 }
 if err := q.authorizeContext(ctx, policy.ActionRead, u); err != nil {
 return "", err
 }
 return q.db.GetUserPreferredProxy(ctx, userID)
 }

 func (q *querier) UpdateUserPreferredProxy(ctx context.Context, arg database.UpdateUserPreferredProxyParams) (database.UserConfig, error) {
 u, err := q.db.GetUserByID(ctx, arg.UserID)
 if err != nil {
 return database.UserConfig{}, err
 }
 if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
 return database.UserConfig{}, err
 }
 return q.db.UpdateUserPreferredProxy(ctx, arg)
 }

 func (q *querier) DeleteUserPreferredProxy(ctx context.Context, userID uuid.UUID) error {
 u, err := q.db.GetUserByID(ctx, userID)
 if err != nil {
 return err
 }
 if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
 return err
 }
 return q.db.DeleteUserPreferredProxy(ctx, userID)
 }

 func (q *querier) UpdateVolumeResourceMonitor(ctx context.Context, arg database.UpdateVolumeResourceMonitorParams) error {
 if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
 return err
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
 }).Asserts(rbac.ResourceNotificationPreference.WithOwner(user.ID.String()), policy.ActionUpdate)
 }))

 s.Run("GetUserPreferredProxy", s.Subtest(func(db database.Store, check *expects) {
 user := dbgen.User(s.T(), db, database.User{})
 check.Args(user.ID).
 Asserts(rbac.ResourceUser.WithOwner(user.ID.String()), policy.ActionReadPersonal)
 }))
 s.Run("UpdateUserPreferredProxy", s.Subtest(func(db database.Store, check *expects) {
 user := dbgen.User(s.T(), db, database.User{})
 check.Args(database.UpdateUserPreferredProxyParams{
 UserID:         user.ID,
 PreferredProxy: "proxy1",
 }).Asserts(rbac.ResourceUser.WithOwner(user.ID.String()), policy.ActionUpdatePersonal)
 }))
 s.Run("DeleteUserPreferredProxy", s.Subtest(func(db database.Store, check *expects) {
 user := dbgen.User(s.T(), db, database.User{})
 check.Args(user.ID).
 Asserts(rbac.ResourceUser.WithOwner(user.ID.String()), policy.ActionUpdatePersonal)
 }))

 s.Run("GetInboxNotificationsByUserID", s.Subtest(func(db database.Store, check *expects) {
 u := dbgen.User(s.T(), db, database.User{})

diff --git a/coderd/database/dbmetrics/querymetrics.go b/coderd/database/dbmetrics/querymetrics.go
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.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
 AND user_configs.key = 'terminal_font'
 RETURNING *;

 -- name: GetUserPreferredProxy :one
 SELECT
 value as preferred_proxy
 FROM
 user_configs
 WHERE
 user_id = @user_id
 AND key = 'preferred_proxy';

 -- name: UpdateUserPreferredProxy :one
 INSERT INTO
 user_configs (user_id, key, value)
 VALUES
 (@user_id, 'preferred_proxy', @preferred_proxy)
 ON CONFLICT
 ON CONSTRAINT user_configs_pkey
 DO UPDATE
 SET
 value = @preferred_proxy
 WHERE user_configs.user_id = @user_id
 AND user_configs.key = 'preferred_proxy'
 RETURNING *;

 -- name: DeleteUserPreferredProxy :exec
 DELETE FROM user_configs
 WHERE user_id = @user_id
 AND key = 'preferred_proxy';

 -- name: UpdateUserRoles :one
 UPDATE
 users
diff --git a/coderd/users.go b/coderd/users.go
 })
 }

 // @Summary Get user proxy settings
 // @ID get-user-proxy-settings
 // @Security CoderSessionToken
 // @Produce json
 // @Tags Users
 // @Param user path string true "User ID, name, or me"
 // @Success 200 {object} codersdk.UserProxySettings
 // @Router /users/{user}/proxy [get]
 func (api *API) userProxySettings(rw http.ResponseWriter, r *http.Request) {
 var (
 ctx  = r.Context()
 user = httpmw.UserParam(r)
 )

 preferredProxy, err := api.Database.GetUserPreferredProxy(ctx, user.ID)
 if err != nil {
 if errors.Is(err, sql.ErrNoRows) {
 httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
 Message: "User proxy settings not found.",
 })
 return
 }

 httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 Message: "Error reading user proxy settings.",
 Detail:  err.Error(),
 })
 return
 }

 httpapi.Write(ctx, rw, http.StatusOK, codersdk.UserProxySettings{
 PreferredProxy: preferredProxy,
 })
 }

 // @Summary Update user proxy settings
 // @ID update-user-proxy-settings
 // @Security CoderSessionToken
 // @Accept json
 // @Produce json
 // @Tags Users
 // @Param user path string true "User ID, name, or me"
 // @Param request body codersdk.UpdateUserProxySettingsRequest true "New proxy settings"
 // @Success 200 {object} codersdk.UserProxySettings
 // @Router /users/{user}/proxy [put]
 func (api *API) putUserProxySettings(rw http.ResponseWriter, r *http.Request) {
 var (
 ctx  = r.Context()
 user = httpmw.UserParam(r)
 )

 var params codersdk.UpdateUserProxySettingsRequest
 if !httpapi.Read(ctx, rw, r, &params) {
 return
 }

 updatedPreferredProxy, err := api.Database.UpdateUserPreferredProxy(ctx, database.UpdateUserPreferredProxyParams{
 UserID:         user.ID,
 PreferredProxy: params.PreferredProxy,
 })
 if err != nil {
 httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 Message: "Internal error updating user proxy preference.",
 Detail:  err.Error(),
 })
 return
 }

 httpapi.Write(ctx, rw, http.StatusOK, codersdk.UserProxySettings{
 PreferredProxy: updatedPreferredProxy.Value,
 })
 }

 // @Summary Delete user proxy settings
 // @ID delete-user-proxy-settings
 // @Security CoderSessionToken
 // @Tags Users
 // @Param user path string true "User ID, name, or me"
 // @Success 204
 // @Router /users/{user}/proxy [delete]
 func (api *API) deleteUserProxySettings(rw http.ResponseWriter, r *http.Request) {
 var (
 ctx  = r.Context()
 user = httpmw.UserParam(r)
 )

 err := api.Database.DeleteUserPreferredProxy(ctx, user.ID)
 if err != nil {
 httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 Message: "Internal error deleting user proxy preference.",
 Detail:  err.Error(),
 })
 return
 }

 rw.WriteHeader(http.StatusNoContent)
 }

 func isValidFontName(font codersdk.TerminalFontName) bool {
 return slices.Contains(codersdk.TerminalFontNames, font)
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1267,6 +1267,9 @@ func New(options Options) API {
		})
		r.Get("/appearance", api.userAppearanceSettings)
		r.Put("/appearance", api.putUserAppearanceSettings)
		r.Get("/proxy", api.userProxySettings)
		r.Put("/proxy", api.putUserProxySettings)
		r.Delete("/proxy", api.deleteUserProxySettings)
		r.Route("/password", func(r chi.Router) {
		r.Use(httpmw.RateLimit(options.LoginRateLimit, time.Minute))
		r.Put("/", api.putUserPassword)
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4884,6 +4884,39 @@ func (q *querier) UpdateUserThemePreference(ctx context.Context, arg database.Up
		return q.db.UpdateUserThemePreference(ctx, arg)
		}

		func (q *querier) GetUserPreferredProxy(ctx context.Context, userID uuid.UUID) (string, error) {
		u, err := q.db.GetUserByID(ctx, userID)
		if err != nil {
		return "", err
		}
		if err := q.authorizeContext(ctx, policy.ActionRead, u); err != nil {
		return "", err
		}
		return q.db.GetUserPreferredProxy(ctx, userID)
		}

		func (q *querier) UpdateUserPreferredProxy(ctx context.Context, arg database.UpdateUserPreferredProxyParams) (database.UserConfig, error) {
		u, err := q.db.GetUserByID(ctx, arg.UserID)
		if err != nil {
		return database.UserConfig{}, err
		}
		if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
		return database.UserConfig{}, err
		}
		return q.db.UpdateUserPreferredProxy(ctx, arg)
		}

		func (q *querier) DeleteUserPreferredProxy(ctx context.Context, userID uuid.UUID) error {
		u, err := q.db.GetUserByID(ctx, userID)
		if err != nil {
		return err
		}
		if err := q.authorizeContext(ctx, policy.ActionUpdatePersonal, u); err != nil {
		return err
		}
		return q.db.DeleteUserPreferredProxy(ctx, userID)
		}

		func (q *querier) UpdateVolumeResourceMonitor(ctx context.Context, arg database.UpdateVolumeResourceMonitorParams) error {
		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceWorkspaceAgentResourceMonitor); err != nil {
		return err
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4896,6 +4896,24 @@ func (s *MethodTestSuite) TestNotifications() {
		}).Asserts(rbac.ResourceNotificationPreference.WithOwner(user.ID.String()), policy.ActionUpdate)
		}))

		s.Run("GetUserPreferredProxy", s.Subtest(func(db database.Store, check *expects) {
		user := dbgen.User(s.T(), db, database.User{})
		check.Args(user.ID).
		Asserts(rbac.ResourceUser.WithOwner(user.ID.String()), policy.ActionReadPersonal)
		}))
		s.Run("UpdateUserPreferredProxy", s.Subtest(func(db database.Store, check *expects) {
		user := dbgen.User(s.T(), db, database.User{})
		check.Args(database.UpdateUserPreferredProxyParams{
		UserID: user.ID,
		PreferredProxy: "proxy1",
		}).Asserts(rbac.ResourceUser.WithOwner(user.ID.String()), policy.ActionUpdatePersonal)
		}))
		s.Run("DeleteUserPreferredProxy", s.Subtest(func(db database.Store, check *expects) {
		user := dbgen.User(s.T(), db, database.User{})
		check.Args(user.ID).
		Asserts(rbac.ResourceUser.WithOwner(user.ID.String()), policy.ActionUpdatePersonal)
		}))

		s.Run("GetInboxNotificationsByUserID", s.Subtest(func(db database.Store, check *expects) {
		u := dbgen.User(s.T(), db, database.User{})

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -148,6 +148,34 @@ WHERE user_configs.user_id = @user_id
		AND user_configs.key = 'terminal_font'
		RETURNING *;

		-- name: GetUserPreferredProxy :one
		SELECT
		value as preferred_proxy
		FROM
		user_configs
		WHERE
		user_id = @user_id
		AND key = 'preferred_proxy';

		-- name: UpdateUserPreferredProxy :one
		INSERT INTO
		user_configs (user_id, key, value)
		VALUES
		(@user_id, 'preferred_proxy', @preferred_proxy)
		ON CONFLICT
		ON CONSTRAINT user_configs_pkey
		DO UPDATE
		SET
		value = @preferred_proxy
		WHERE user_configs.user_id = @user_id
		AND user_configs.key = 'preferred_proxy'
		RETURNING *;

		-- name: DeleteUserPreferredProxy :exec
		DELETE FROM user_configs
		WHERE user_id = @user_id
		AND key = 'preferred_proxy';

		-- name: UpdateUserRoles :one
		UPDATE
		users
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1066,6 +1066,104 @@ func (api API) putUserAppearanceSettings(rw http.ResponseWriter, r http.Reques
		})
		}

		// @Summary Get user proxy settings
		// @ID get-user-proxy-settings
		// @Security CoderSessionToken
		// @Produce json
		// @Tags Users
		// @Param user path string true "User ID, name, or me"
		// @Success 200 {object} codersdk.UserProxySettings
		// @Router /users/{user}/proxy [get]
		func (api API) userProxySettings(rw http.ResponseWriter, r http.Request) {
		var (
		ctx = r.Context()
		user = httpmw.UserParam(r)
		)

		preferredProxy, err := api.Database.GetUserPreferredProxy(ctx, user.ID)
		if err != nil {
		if errors.Is(err, sql.ErrNoRows) {
		httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
		Message: "User proxy settings not found.",
		})
		return
		}

		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
		Message: "Error reading user proxy settings.",
		Detail: err.Error(),
		})
		return
		}

		httpapi.Write(ctx, rw, http.StatusOK, codersdk.UserProxySettings{
		PreferredProxy: preferredProxy,
		})
		}

		// @Summary Update user proxy settings
		// @ID update-user-proxy-settings
		// @Security CoderSessionToken
		// @Accept json
		// @Produce json
		// @Tags Users
		// @Param user path string true "User ID, name, or me"
		// @Param request body codersdk.UpdateUserProxySettingsRequest true "New proxy settings"
		// @Success 200 {object} codersdk.UserProxySettings
		// @Router /users/{user}/proxy [put]
		func (api API) putUserProxySettings(rw http.ResponseWriter, r http.Request) {
		var (
		ctx = r.Context()
		user = httpmw.UserParam(r)
		)

		var params codersdk.UpdateUserProxySettingsRequest
		if !httpapi.Read(ctx, rw, r, &params) {
		return
		}

		updatedPreferredProxy, err := api.Database.UpdateUserPreferredProxy(ctx, database.UpdateUserPreferredProxyParams{
		UserID: user.ID,
		PreferredProxy: params.PreferredProxy,
		})
		if err != nil {
		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
		Message: "Internal error updating user proxy preference.",
		Detail: err.Error(),
		})
		return
		}

		httpapi.Write(ctx, rw, http.StatusOK, codersdk.UserProxySettings{
		PreferredProxy: updatedPreferredProxy.Value,
		})
		}

		// @Summary Delete user proxy settings
		// @ID delete-user-proxy-settings
		// @Security CoderSessionToken
		// @Tags Users
		// @Param user path string true "User ID, name, or me"
		// @Success 204
		// @Router /users/{user}/proxy [delete]
		func (api API) deleteUserProxySettings(rw http.ResponseWriter, r http.Request) {
		var (
		ctx = r.Context()
		user = httpmw.UserParam(r)
		)

		err := api.Database.DeleteUserPreferredProxy(ctx, user.ID)
		if err != nil {
		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
		Message: "Internal error deleting user proxy preference.",
		Detail: err.Error(),
		})
		return
		}

		rw.WriteHeader(http.StatusNoContent)
		}

		func isValidFontName(font codersdk.TerminalFontName) bool {
		return slices.Contains(codersdk.TerminalFontNames, font)
		}
Expand Down