From 2f9d737515b5f6de8c669cd03285a0f0de066063 Mon Sep 17 00:00:00 2001
From: Dan Sosedoff <dan.sosedoff@gmail.com>
Date: Tue, 6 Dec 2022 12:24:21 -0600
Subject: [PATCH] Move request parameters logging into api request logger

---
 pkg/api/logger.go     | 7 +++++++
 pkg/api/middleware.go | 9 ---------
 pkg/api/routes.go     | 4 ----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkg/api/logger.go b/pkg/api/logger.go
index 88d54b6..04a57e1 100644
--- a/pkg/api/logger.go
+++ b/pkg/api/logger.go
@@ -65,6 +65,13 @@ func RequestLogger(logger *logrus.Logger) gin.HandlerFunc {
 		// Additional fields for debugging
 		if debug {
 			fields["raw_query"] = c.Request.URL.RawQuery
+
+			err := c.Request.ParseForm()
+			if err == nil {
+				for k, v := range c.Request.Form {
+					fields["form_"+k] = strings.Join(v, ",")
+				}
+			}
 		}
 
 		entry := logger.WithFields(fields)
diff --git a/pkg/api/middleware.go b/pkg/api/middleware.go
index be79ec1..83a33ad 100644
--- a/pkg/api/middleware.go
+++ b/pkg/api/middleware.go
@@ -1,7 +1,6 @@
 package api
 
 import (
-	"log"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -49,14 +48,6 @@ func dbCheckMiddleware() gin.HandlerFunc {
 	}
 }
 
-// Middleware to print out request parameters and body for debugging
-func requestInspectMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		err := c.Request.ParseForm()
-		log.Println("Request params:", err, c.Request.Form)
-	}
-}
-
 // Middleware to inject CORS headers
 func corsMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
diff --git a/pkg/api/routes.go b/pkg/api/routes.go
index 3f94f5f..9a83314 100644
--- a/pkg/api/routes.go
+++ b/pkg/api/routes.go
@@ -7,10 +7,6 @@ import (
 )
 
 func SetupMiddlewares(group *gin.RouterGroup) {
-	if command.Opts.Debug {
-		group.Use(requestInspectMiddleware())
-	}
-
 	if command.Opts.Cors {
 		group.Use(corsMiddleware())
 	}