Merge pull request #854 from danielgtaylor/partial-revert-850

fix: content type bug introduced in #850

Author: danielgtaylor

huma.go

@@ -490,6 +490,11 @@ func writeResponse(api API, ctx Context, status int, ct string, body any) error
 		ct, err = api.Negotiate(ctx.Header("Accept"))
 		if err != nil {
 			notAccept := NewErrorWithContext(ctx, http.StatusNotAcceptable, "unable to marshal response", err)
+			ct := "application/json"
+			if ctf, ok := notAccept.(ContentTypeFilter); ok {
+				ct = ctf.ContentType(ct)
+			}
+			ctx.SetHeader("Content-Type", ct)
 			if e := transformAndWrite(api, ctx, http.StatusNotAcceptable, "application/json", notAccept); e != nil {
 				return e
 			}
@@ -499,6 +504,8 @@ func writeResponse(api API, ctx Context, status int, ct string, body any) error
 		if ctf, ok := body.(ContentTypeFilter); ok {
 			ct = ctf.ContentType(ct)
 		}
+
+		ctx.SetHeader("Content-Type", ct)
 	}
 
 	if err := transformAndWrite(api, ctx, status, ct, body); err != nil {
@@ -543,8 +550,6 @@ func transformAndWrite(api API, ctx Context, status int, ct string, body any) er
 		}
 	}
 
-	ctx.SetHeader("Content-Type", ct)
-
 	return nil
 }
 

huma_test.go

@@ -2067,7 +2067,7 @@ Content-Type: text/plain
 			URL: "/response-accept",
 			Assert: func(t *testing.T, resp *httptest.ResponseRecorder) {
 				assert.Equal(t, http.StatusNotAcceptable, resp.Code)
-				assert.Equal(t, "application/json", resp.Header().Get("Content-Type"))
+				assert.Equal(t, "application/problem+json", resp.Header().Get("Content-Type"))
 				assert.JSONEq(t, `{"title":"Not Acceptable","status":406,"detail":"unable to marshal response","errors":[{"message":"unknown accept content type"}]}`, resp.Body.String())
 			},
 		},