Fix failing tests for user proxy preferences

blink-so[bot] · blink-so[bot] · commit 4f8f7aafa0c3 · 2025-07-17T22:57:34.000Z
- Fix userProxySettings handler to return 404 when no proxy is set
- Add database authorization tests for user proxy methods
diff --git a/coderd/database/dbauthz/dbauthz_test.go b/coderd/database/dbauthz/dbauthz_test.go
@@ -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{})
 
diff --git a/coderd/users.go b/coderd/users.go
@@ -1082,15 +1082,18 @@ func (api *API) userProxySettings(rw http.ResponseWriter, r *http.Request) {
 
 	preferredProxy, err := api.Database.GetUserPreferredProxy(ctx, user.ID)
 	if err != nil {
-		if !errors.Is(err, sql.ErrNoRows) {
-			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-				Message: "Error reading user proxy settings.",
-				Detail:  err.Error(),
+		if errors.Is(err, sql.ErrNoRows) {
+			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
+				Message: "User proxy settings not found.",
 			})
 			return
 		}
 
-		preferredProxy = ""
+		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{
