added MESSAGE_ALIASES to ENV

Author: CodeShellDev

internals/proxy/middlewares/log.go

@@ -14,7 +14,7 @@ func (data LogMiddleware) Use() http.Handler {
 	next := data.Next
 
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		log.Info("Request:", req.Method, req.URL.Path)
+		log.Info(req.Method, req.URL.Path, "?", req.URL.RawQuery)
 
 		next.ServeHTTP(w, req)
 	})

main.go

@@ -28,44 +28,7 @@ func main() {
 
 	body_m4 := BodyMiddleware{
 		Next: initHandler,
-		MessageAliases: []MessageAlias{
-			{
-				Alias:    "msg",
-				Priority: 100,
-			},
-			{
-				Alias:    "content",
-				Priority: 99,
-			},
-			{
-				Alias:    "description",
-				Priority: 98,
-			},
-			{
-				Alias:    "text",
-				Priority: 20,
-			},
-			{
-				Alias:    "body",
-				Priority: 15,
-			},
-			{
-				Alias:    "summary",
-				Priority: 10,
-			},
-			{
-				Alias:    "details",
-				Priority: 9,
-			},
-			{
-				Alias:    "payload",
-				Priority: 2,
-			},
-			{
-				Alias:    "data",
-				Priority: 1,
-			},
-		},
+		MessageAliases: ENV.MESSAGE_ALIASES,
 	}
 
 	temp_m3 := TemplateMiddleware{

utils/env/env.go

@@ -4,15 +4,17 @@ import (
 	"encoding/json"
 	"os"
 
+	middlewares "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 )
 
 type ENV_ struct {
-	PORT string
-	API_URL string
-	API_TOKEN string
-	BLOCKED_ENDPOINTS []string
-	VARIABLES map[string]any
+	PORT 				string
+	API_URL 			string
+	API_TOKEN 			string
+	BLOCKED_ENDPOINTS 	[]string
+	VARIABLES 			map[string]any
+	MESSAGE_ALIASES 	[]middlewares.MessageAlias
 }
 
 var ENV ENV_ = ENV_{
@@ -30,6 +32,44 @@ var ENV ENV_ = ENV_{
 		"RECIPIENTS": []string{},
 		"NUMBER": os.Getenv("SENDER"),
 	},
+	MESSAGE_ALIASES: []middlewares.MessageAlias{
+		{
+			Alias:    "msg",
+			Priority: 100,
+		},
+		{
+			Alias:    "content",
+			Priority: 99,
+		},
+		{
+			Alias:    "description",
+			Priority: 98,
+		},
+		{
+			Alias:    "text",
+			Priority: 20,
+		},
+		{
+			Alias:    "body",
+			Priority: 15,
+		},
+		{
+			Alias:    "summary",
+			Priority: 10,
+		},
+		{
+			Alias:    "details",
+			Priority: 9,
+		},
+		{
+			Alias:    "payload",
+			Priority: 2,
+		},
+		{
+			Alias:    "data",
+			Priority: 1,
+		},
+	},
 }
 
 func Load() {
@@ -40,6 +80,7 @@ func Load() {
 
 	blockedEndpointJSON := os.Getenv("BLOCKED_ENDPOINTS")
 	recipientsJSON := os.Getenv("DEFAULT_RECIPIENTS")
+	messageAliasesJSON := os.Getenv("MESSAGE_ALIASES")
 	variablesJSON := os.Getenv("VARIABLES")
 
 	log.Info("Loaded Environment Variables")
@@ -64,6 +105,18 @@ func Load() {
 		ENV.BLOCKED_ENDPOINTS = blockedEndpoints
 	}
 
+	if messageAliasesJSON != "" {
+		var msgAliases []middlewares.MessageAlias
+
+		err := json.Unmarshal([]byte(messageAliasesJSON), &msgAliases)
+
+		if err != nil {
+			log.Error("Could not decode Message Aliases ", variablesJSON)
+		}
+
+		ENV.MESSAGE_ALIASES = msgAliases
+	}
+
 	if variablesJSON != "" {
 		var variables map[string]interface{}