improved body updates

Author: CodeShellDev

internals/proxy/middlewares/auth.go

@@ -44,8 +44,6 @@ func (data AuthMiddleware) Use() http.Handler {
 			return
 		}
 
-		log.Info("Request:", req.Method, req.URL.Path)
-
 		authHeader := req.Header.Get("Authorization")
 
 		authQuery := req.URL.Query().Get("@authorization")

internals/proxy/middlewares/body.go

@@ -74,18 +74,16 @@ func (data BodyMiddleware) Use() http.Handler {
 					http.Error(w, "Internal Error", http.StatusInternalServerError)
 					return
 				}
-			}
-
-			modifiedBody := string(bodyBytes)
 
-			req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
+				modifiedBody := string(bodyBytes)
 
-			req.ContentLength = int64(len(modifiedBody))
-			req.Header.Set("Content-Length", strconv.Itoa(len(modifiedBody)))
-		} else {
-			req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
+				req.ContentLength = int64(len(modifiedBody))
+				req.Header.Set("Content-Length", strconv.Itoa(len(modifiedBody)))
+			}
 		}
 
+		req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
+
 		next.ServeHTTP(w, req)
 	})
 }

internals/proxy/middlewares/template.go

@@ -127,26 +127,24 @@ func (data TemplateMiddleware) Use() http.Handler {
 				log.Debug("Applied Query Templating: ", templatedQuery)
 			}
 
-			modifiedBodyBytes, err := json.Marshal(modifiedBodyData)
+			bodyBytes, err = json.Marshal(modifiedBodyData)
 
 			if err != nil {
 				log.Error("Could not encode Body: ", err.Error())
 				http.Error(w, "Internal Error", http.StatusInternalServerError)
 				return
 			}
 
-			modifiedBody := string(modifiedBodyBytes)
+			modifiedBody := string(bodyBytes)
 
 			log.Debug("Applied Body Templating: ", modifiedBody)
 
-			req.Body = io.NopCloser(bytes.NewReader(modifiedBodyBytes))
-
 			req.ContentLength = int64(len(modifiedBody))
 			req.Header.Set("Content-Length", strconv.Itoa(len(modifiedBody)))
-		} else {
-			req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
 		}
 
+		req.Body = io.NopCloser(bytes.NewReader(bodyBytes))
+
 		reqPath := req.URL.Path
 		reqPath, _ = url.PathUnescape(reqPath)