Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions internals/proxy/middlewares/message.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,4 @@ func main() {
<-stop

docker.Shutdown(server)
}

// TESTING
}
15 changes: 0 additions & 15 deletions utils/templating/templating.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -131,33 +128,25 @@ 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(`"<<(.*?)>>"`)

Expand All @@ -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
}
Expand Down