fixed query templating overwriting body

Author: CodeShellDev

internals/proxy/middlewares/template.go

@@ -42,17 +42,17 @@ func (data TemplateMiddleware) Use() http.Handler {
 			bodyData, modified = templateJSON(body.Data, VARIABLES)
 
 			if modified {
-				modifiedBody = true 
+				modifiedBody = true
 			}
 		}
 
 		if req.URL.RawQuery != "" {
 			var modified bool
 
-			req.URL.RawQuery, bodyData, modified = templateQuery(req.URL, VARIABLES)
+			req.URL.RawQuery, bodyData, modified = templateQuery(bodyData, req.URL, VARIABLES)
 
 			if modified {
-				modifiedBody = true 
+				modifiedBody = true
 			}
 		}
 
@@ -171,11 +171,9 @@ func templatePath(reqUrl *url.URL, VARIABLES interface{}) (string, bool) {
 	return reqPath, modified
 }
 
-func templateQuery(reqUrl *url.URL, VARIABLES interface{}) (string, map[string]interface{}, bool) {
+func templateQuery(data map[string]interface{}, reqUrl *url.URL, VARIABLES interface{}) (string, map[string]interface{}, bool) {
 	var modified bool
 
-	data := map[string]interface{}{}
-
 	decodedQuery, _ := url.QueryUnescape(reqUrl.RawQuery)
 
 	log.Debug("Decoded Query: ", decodedQuery)

utils/utils.go

@@ -7,26 +7,25 @@ package utils
 
 import (
 	"encoding/json"
-	"regexp"
 	"strings"
 )
 
 func StringToArray(sliceStr string) []string {
-	if sliceStr == "" {
-		return nil
-	}
-
-	re, err := regexp.Compile(`\s+`)
-
-	if err != nil {
-		return nil
-	}
+    if sliceStr == "" {
+        return nil
+    }
 
-	normalized := re.ReplaceAllString(sliceStr, "")
+    rawItems := strings.Split(sliceStr, ",")
+    items := make([]string, 0, len(rawItems))
 
-	tokens := strings.Split(normalized, ",")
+    for _, item := range rawItems {
+        trimmed := strings.TrimSpace(item)
+        if trimmed != "" {
+            items = append(items, trimmed)
+        }
+    }
 
-	return tokens
+    return items
 }
 
 func GetJsonSafe[T any](jsonStr string) (T, error) {