Skip to content

Commit

Permalink
Merge pull request #581 from danielgtaylor/fix-new-error-status-modif…
Browse files Browse the repository at this point in the history
…ication

fix: use status code returned from NewError when writing errors
  • Loading branch information
danielgtaylor authored Sep 19, 2024
2 parents 2c56d8a + 2cff828 commit 69d32c3
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
6 changes: 5 additions & 1 deletion error.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,11 @@ var NewError = func(status int, msg string, errs ...error) StatusError {
// configured error type and with the given status code and message. It is
// marshaled using the API's content negotiation methods.
func WriteErr(api API, ctx Context, status int, msg string, errs ...error) error {
var err any = NewError(status, msg, errs...)
var err = NewError(status, msg, errs...)

// NewError may have modified the status code, so update it here if needed.
// If it was not modified then this is a no-op.
status = err.GetStatus()

ct, negotiateErr := api.Negotiate(ctx.Header("Accept"))
if negotiateErr != nil {
Expand Down
26 changes: 26 additions & 0 deletions huma_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2298,6 +2298,32 @@ func TestResolverCustomTypePrimitive(t *testing.T) {
})
}

func TestCustomValidationErrorStatus(t *testing.T) {
orig := huma.NewError
huma.NewError = func(status int, message string, errs ...error) huma.StatusError {
if status == 422 {
status = 400
}
return orig(status, message, errs...)
}
t.Cleanup(func() {
huma.NewError = orig
})

_, api := humatest.New(t, huma.DefaultConfig("Test API", "1.0.0"))
huma.Post(api, "/test", func(ctx context.Context, input *struct {
Body struct {
Value string `json:"value" minLength:"5"`
}
}) (*struct{}, error) {
return nil, nil
})

resp := api.Post("/test", map[string]any{"value": "foo"})
assert.Equal(t, http.StatusBadRequest, resp.Result().StatusCode)
assert.Contains(t, resp.Body.String(), "Bad Request")
}

// func BenchmarkSecondDecode(b *testing.B) {
// //nolint: musttag
// type MediumSized struct {
Expand Down

0 comments on commit 69d32c3

Please sign in to comment.