fix

Author: CodeShellDev

internals/proxy/middlewares/template.go

@@ -108,15 +108,15 @@ func (data TemplateMiddleware) Use() http.Handler {
 	})
 }
 
-func normalizeData(prefix string, data map[string]any) (map[string]any, error) {
+func normalizeData(fromPrefix, toPrefix string, data map[string]any) (map[string]any, error) {
 	jsonStr := jsonutils.ToJson(data)
 
 	if jsonStr != "" {
-		toVar, err := templating.TransformTemplateKeys(jsonStr, prefix, func(re *regexp.Regexp, match string) string {
+		toVar, err := templating.TransformTemplateKeys(jsonStr, fromPrefix, func(re *regexp.Regexp, match string) string {
 			return re.ReplaceAllStringFunc(match, func(varMatch string) string {
 				varName := re.ReplaceAllString(varMatch, "$1")
 
-				return "." + prefix + varName
+				return "." + toPrefix + varName
 			})
 		})
 
@@ -149,26 +149,26 @@ func prefixData(prefix string, data map[string]any) (map[string]any) {
 func TemplateBody(bodyData map[string]any, headerData map[string]any, VARIABLES map[string]any) (map[string]any, bool, error) {
 	var modified bool
 
-	// Normalize #Var and @Var to .HEADER_KEY_Var and .BODY_KEY_Var
-	bodyData, err := normalizeData("BODY_KEY_", bodyData)
+	// Normalize #Var and @Var to .header_key_Var and .body_key_Var
+	bodyData, err := normalizeData("@", "body_key_", bodyData)
 
 	log.Dev("Normalized:\n", jsonutils.ToJson(bodyData))
 
 	if err != nil {
 		return bodyData, false, err
 	}
 
-	headerData, err = normalizeData("HEADER_KEY_", headerData)
+	headerData, err = normalizeData("#", "header_key_", headerData)
 
 	if err != nil {
 		return bodyData, false, err
 	}
 
-	// Prefix Body Data with @
-	bodyData = prefixData("BODY_KEY_", bodyData)
+	// Prefix Body Data with body_key_
+	bodyData = prefixData("body_key_", bodyData)
 
-	// Prefix Header Data with #
-	headerData = prefixData("HEADER_KEY_", headerData)
+	// Prefix Header Data with header_key_
+	headerData = prefixData("header_key_", headerData)
 
 	variables := VARIABLES
 

utils/templating/templating.go

@@ -28,7 +28,7 @@ func normalize(value any) string {
 }
 
 func AddTemplateFunc(tmplStr string, funcName string) (string, error) {
-	return TransformTemplateKeys(tmplStr, '.', func(re *regexp.Regexp, match string) string {
+	return TransformTemplateKeys(tmplStr, `\.`, func(re *regexp.Regexp, match string) string {
 		reSimple, _ := regexp.Compile(`{{\s*\.[a-zA-Z0-9_.]+\s*}}`)
 
 		if !reSimple.MatchString(match) {
@@ -43,14 +43,14 @@ func AddTemplateFunc(tmplStr string, funcName string) (string, error) {
 	})
 }
 
-func TransformTemplateKeys(tmplStr string, tmplKey rune, transform func(varRegex *regexp.Regexp, m string) string) (string, error) {
+func TransformTemplateKeys(tmplStr string, prefix string, transform func(varRegex *regexp.Regexp, m string) string) (string, error) {
 	re, err := regexp.Compile(`{{[^}]+}}`)
 
 	if err != nil {
 		return tmplStr, err
 	}
 
-	varRe, err := regexp.Compile(`\` + string(tmplKey) + `([a-zA-Z0-9_.]+)`)
+	varRe, err := regexp.Compile(string(prefix) + `([a-zA-Z0-9_.]+)`)
 
 	if err != nil {
 		return tmplStr, err