Commit4f8f7aa

committed

Fix failing tests for user proxy preferences

- Fix userProxySettings handler to return 404 when no proxy is set- Add database authorization tests for user proxy methods

1 parent0543dc7 commit4f8f7aaCopy full SHA for 4f8f7aa

File tree

+26

-5

lines changed

+26

-5

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4896,6 +4896,24 @@ func (s *MethodTestSuite) TestNotifications() {`
`4896`	`4896`	`}).Asserts(rbac.ResourceNotificationPreference.WithOwner(user.ID.String()),policy.ActionUpdate)`
`4897`	`4897`	`}))`
`4898`	`4898`
	`4899`	`+s.Run("GetUserPreferredProxy",s.Subtest(func(db database.Store,check*expects) {`
	`4900`	`+user:=dbgen.User(s.T(),db, database.User{})`
	`4901`	`+check.Args(user.ID).`
	`4902`	`+Asserts(rbac.ResourceUser.WithOwner(user.ID.String()),policy.ActionReadPersonal)`
	`4903`	`+}))`
	`4904`	`+s.Run("UpdateUserPreferredProxy",s.Subtest(func(db database.Store,check*expects) {`
	`4905`	`+user:=dbgen.User(s.T(),db, database.User{})`
	`4906`	`+check.Args(database.UpdateUserPreferredProxyParams{`
	`4907`	`+UserID:user.ID,`
	`4908`	`+PreferredProxy:"proxy1",`
	`4909`	`+}).Asserts(rbac.ResourceUser.WithOwner(user.ID.String()),policy.ActionUpdatePersonal)`
	`4910`	`+}))`
	`4911`	`+s.Run("DeleteUserPreferredProxy",s.Subtest(func(db database.Store,check*expects) {`
	`4912`	`+user:=dbgen.User(s.T(),db, database.User{})`
	`4913`	`+check.Args(user.ID).`
	`4914`	`+Asserts(rbac.ResourceUser.WithOwner(user.ID.String()),policy.ActionUpdatePersonal)`
	`4915`	`+}))`
	`4916`	`+`
`4899`	`4917`	`s.Run("GetInboxNotificationsByUserID",s.Subtest(func(db database.Store,check*expects) {`
`4900`	`4918`	`u:=dbgen.User(s.T(),db, database.User{})`
`4901`	`4919`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1082,15 +1082,18 @@ func (api API) userProxySettings(rw http.ResponseWriter, r http.Request) {`
`1082`	`1082`
`1083`	`1083`	`preferredProxy,err:=api.Database.GetUserPreferredProxy(ctx,user.ID)`
`1084`	`1084`	`iferr!=nil {`
`1085`		`-if!errors.Is(err,sql.ErrNoRows) {`
`1086`		`-httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`
`1087`		`-Message:"Error reading user proxy settings.",`
`1088`		`-Detail:err.Error(),`
	`1085`	`+iferrors.Is(err,sql.ErrNoRows) {`
	`1086`	`+httpapi.Write(ctx,rw,http.StatusNotFound, codersdk.Response{`
	`1087`	`+Message:"User proxy settings not found.",`
`1089`	`1088`	`})`
`1090`	`1089`	`return`
`1091`	`1090`	`}`
`1092`	`1091`
`1093`		`-preferredProxy=""`
	`1092`	`+httpapi.Write(ctx,rw,http.StatusInternalServerError, codersdk.Response{`
	`1093`	`+Message:"Error reading user proxy settings.",`
	`1094`	`+Detail:err.Error(),`
	`1095`	`+})`
	`1096`	`+return`
`1094`	`1097`	`}`
`1095`	`1098`
`1096`	`1099`	`httpapi.Write(ctx,rw,http.StatusOK, codersdk.UserProxySettings{`

Comments

(0)