fix bugs in ApplyStandardMiddleware

Author: johnwarden

request_test.go

@@ -59,17 +59,29 @@ func TestPanic(t *testing.T) {
 func TestApplyStandardMiddleware(t *testing.T) {
 	{
 		h := httperror.ApplyStandardMiddleware(okHandler, myMiddleware)
-		s, m := testRequest(h, "/")
+		s, _ := testRequest(h, "/")
 		assert.Equal(t, 200, s)
-		assert.Equal(t, "OK\nDid Middleware\n", m, "got middleware output")
 	}
 
 	{
 		h := httperror.ApplyStandardMiddleware(notFoundHandler, myMiddleware)
 		s, m := testRequest(h, "/")
 		assert.Equal(t, 404, s)
-		assert.Equal(t, "404 Not Found\nDid Middleware\n", m, "got middleware output")
+		assert.Equal(t, "404 Not Found\n", m, "got correct response status")
+	}
+
+	{
+		inner := httperror.XApplyStandardMiddleware[string](nameHandler, myMiddleware)
+
+		h := httperror.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
+			return inner(w, r, "Bill")
+		})
+
+		s, m := testRequest(h, "/")
+		assert.Equal(t, 200, s)
+		assert.Equal(t, "Hello, Bill\n", m, "got middleware output")
 	}
+
 }
 
 var getMeOuttaHere = httperror.HandlerFunc(func(w http.ResponseWriter, r *http.Request) error {
@@ -94,6 +106,14 @@ var notFoundHandler = httperror.HandlerFunc(func(w http.ResponseWriter, _ *http.
 	return httperror.NotFound
 })
 
+var nameHandler = httperror.XHandlerFunc[string](func(w http.ResponseWriter, r *http.Request, name string) error {
+	w.Header().Set("Content-Type", "text/plain")
+
+	fmt.Fprintf(w, "Hello, %s\n", name)
+
+	return nil
+})
+
 func helloHandler(w http.ResponseWriter, r *http.Request) error {
 	w.Header().Set("Content-Type", "text/plain")
 
@@ -128,7 +148,7 @@ func customErrorHandler(w http.ResponseWriter, err error) {
 
 func myMiddleware(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Foo", "Bar")
 		h.ServeHTTP(w, r)
-		w.Write([]byte("Did Middleware\n"))
 	})
 }

standardmiddleware.go

@@ -28,7 +28,7 @@ func XApplyStandardMiddleware[P any](h XHandler[P], m StandardMiddleware) XHandl
 		*errPtr = err
 	})
 
-	handler = m(h)
+	handler = m(handler)
 
 	return func(w http.ResponseWriter, r *http.Request, p P) error {
 		var err error
@@ -45,7 +45,6 @@ func XApplyStandardMiddleware[P any](h XHandler[P], m StandardMiddleware) XHandl
 // ApplyStandardMiddleware applies middleware written for a standard [http.Handler] to an [httperror.XHandler].
 // It works by passing parameters and returning errors through the context.
 func ApplyStandardMiddleware(h Handler, m StandardMiddleware) HandlerFunc {
-	errPtrKey := contextKey("errPtr")
 
 	var handler http.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
@@ -56,12 +55,13 @@ func ApplyStandardMiddleware(h Handler, m StandardMiddleware) HandlerFunc {
 		*errPtr = err
 	})
 
-	handler = m(h)
+	handler = m(handler)
 
 	return func(w http.ResponseWriter, r *http.Request) error {
 		var err error
 		c := r.Context()
 		c = context.WithValue(c, errPtrKey, &err)
+		c = context.WithValue(c, paramsKey, "no params")
 
 		handler.ServeHTTP(w, r.WithContext(c))