diff --git a/internals/proxy/middlewares/message.go b/internals/proxy/middlewares/message.go index 67b54925..8f63a5d5 100644 --- a/internals/proxy/middlewares/message.go +++ b/internals/proxy/middlewares/message.go @@ -82,8 +82,6 @@ func (data MessageMiddleware) Use() http.Handler { } func TemplateMessage(template string, data map[string]any, VARIABLES map[string]any) (map[string]any, error) { - log.Dev(template) - data["message_template"] = template data, ok, err := TemplateBody(data, VARIABLES) diff --git a/main.go b/main.go index ef8e0a54..82a707dd 100644 --- a/main.go +++ b/main.go @@ -85,6 +85,4 @@ func main() { <-stop docker.Shutdown(server) -} - -// TESTING \ No newline at end of file +} \ No newline at end of file diff --git a/utils/templating/templating.go b/utils/templating/templating.go index bb8b7e09..3f66c90d 100644 --- a/utils/templating/templating.go +++ b/utils/templating/templating.go @@ -7,9 +7,6 @@ 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 { @@ -131,8 +128,6 @@ 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 @@ -140,24 +135,18 @@ func RenderJSONTemplate(name string, data map[string]any, variables map[string]a 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(`"<<(.*?)>>"`) @@ -167,12 +156,8 @@ 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 }