Merge pull request #58 from CodeShellDev/feat/message-templates

fix: message alias overwrite

Author: CodeShellDev

internals/proxy/middlewares/aliases.go

@@ -107,7 +107,7 @@ func getData(key string, aliases []middlewareTypes.DataAlias, data map[string]an
 				value = aliasValue
 			}
 
-			data[alias.Alias] = nil
+			delete(data, alias.Alias)
 		}
 	}
 

internals/proxy/middlewares/message.go

@@ -82,13 +82,19 @@ func (data MessageMiddleware) Use() http.Handler {
 }
 
 func TemplateMessage(template string, data map[string]any, VARIABLES map[string]any) (map[string]any, error) {
-	data["message"] = template
+	log.Dev(template)
+
+	data["message_template"] = template
 
 	data, ok, err := TemplateBody(data, VARIABLES)
 
 	if err != nil || !ok || data == nil {
 		return data, err
 	}
 
+	data["message"] = data["message_template"]
+
+	delete(data, "message_template")
+
 	return data, nil
 }

utils/templating/templating.go

@@ -7,6 +7,9 @@ import (
 	"regexp"
 	"strings"
 	"text/template"
+
+	"github.com/codeshelldev/secured-signal-api/utils/jsonutils"
+	"github.com/codeshelldev/secured-signal-api/utils/logger"
 )
 
 func normalize(value any) string {
@@ -128,25 +131,33 @@ func RenderJSONTemplate(name string, data map[string]any, variables map[string]a
 
 	tmplStr := string(jsonBytes)
 
+	logger.Dev("1\n", tmplStr)
+
 	re, err := regexp.Compile(`{{\s*\.([a-zA-Z0-9_.]+)\s*}}`)
 
 	// Add normalize() to be able to remove Quotes from Arrays
 	if err == nil {
     	tmplStr = re.ReplaceAllString(tmplStr, "{{normalize .$1}}")
 	}
 
+	logger.Dev("2\n", tmplStr)
+
 	templt := CreateTemplateWithFunc(name, template.FuncMap{
         "normalize": normalizeJSON,
     })
 
 	jsonStr, err := ParseTemplate(templt, tmplStr, variables)
 
+	logger.Dev("3\n", tmplStr)
+
 	if err != nil {
 		return nil, err
 	}
 
 	jsonStr = cleanQuotedPairsJSON(jsonStr)
 
+	logger.Dev("4\n", tmplStr)
+
 	// Remove the Quotes around "<<[item1,item2]>>"
 	re, err = regexp.Compile(`"<<(.*?)>>"`)
 
@@ -156,8 +167,12 @@ func RenderJSONTemplate(name string, data map[string]any, variables map[string]a
 
 	jsonStr = re.ReplaceAllString(jsonStr, "$1")
 
+	logger.Dev("5\n", tmplStr)
+
 	err = json.Unmarshal([]byte(jsonStr), &data)
 
+	logger.Dev("6\n", jsonutils.ToJson(data))
+
 	if err != nil {
 		return nil, err
 	}