test

Author: CodeShellDev

internals/proxy/middlewares/template.go

@@ -107,8 +107,6 @@ func (data TemplateMiddleware) Use() http.Handler {
 func TemplateBody(data map[string]any, VARIABLES any) (map[string]any, bool, error) {
 	var modified bool
 
-	log.Dev(utils.ToJson(data))
-
 	templatedData, err := templating.RenderJSONTemplate("body", data, VARIABLES)
 
 	if err != nil {

utils/config/config.go

@@ -17,7 +17,6 @@ import (
 
 var defaultsLayer = koanf.New(".")
 var userLayer = koanf.New(".")
-var tokensLayer = koanf.New(".")
 
 var config *koanf.Koanf
 
@@ -48,11 +47,11 @@ func LoadFile(path string, config *koanf.Koanf, parser koanf.Parser) (koanf.Prov
 	return f, err
 }
 
-func LoadDir(path string, dir string, config *koanf.Koanf, parser koanf.Parser) error {
+func LoadDir(dir string, parser koanf.Parser) []map[string]any {
     files, err := filepath.Glob(filepath.Join(dir, "*.yml"))
 
     if err != nil {
-        return err
+        return nil
     }
 
 	data := []map[string]any{}
@@ -63,15 +62,13 @@ func LoadDir(path string, dir string, config *koanf.Koanf, parser koanf.Parser)
         _, err := LoadFile(file, tmp, parser)
 
 		if err != nil {
-			return err
+			return nil
 		}
 
 		data = append(data, tmp.All())
     }
 
-	config.Set(path, data)
-
-    return nil
+    return data
 }
 
 func LoadEnv(config *koanf.Koanf) (koanf.Provider, error) {

utils/config/token-config.go

@@ -3,34 +3,28 @@ package config
 import (
 	"strconv"
 
+	middlewareTypes "github.com/codeshelldev/secured-signal-api/internals/proxy/middlewares/types"
 	"github.com/codeshelldev/secured-signal-api/utils"
 	log "github.com/codeshelldev/secured-signal-api/utils/logger"
 	"github.com/knadh/koanf/parsers/yaml"
 )
 
-type TOKEN_CONFIG_ struct {
-	TOKENS		[]string 	`koanf:"tokens"`
-	OVERRIDES 	SETTING_	`koanf:"overrides"`
-}
+var tokens []map[string]any
 
 func LoadTokens() {
 	log.Debug("Loading Configs ", ENV.TOKENS_DIR)
 
-	LoadDir("tokenConfigs", ENV.TOKENS_DIR, tokensLayer, yaml.Parser())
+	LoadDir(ENV.TOKENS_DIR, yaml.Parser())
 
-	log.Dev(utils.ToJson(tokensLayer.All()))
+	log.Dev(utils.ToJson(tokens))
 }
 
 func InitTokens() {
 	apiTokens := config.Strings("api.tokens")
 
-	tokenConfigs := []TOKEN_CONFIG_{}
-
-	tokensLayer.Unmarshal("tokenConfigs", &tokenConfigs)
-
-	log.Dev(utils.ToJson(tokenConfigs))
+	log.Dev(utils.ToJson(tokens))
 
-	overrides := ParseTokenConfigs(tokenConfigs)
+	overrides := ParseTokenConfigs(tokens)
 
 	for token, override := range overrides {
 		apiTokens = append(apiTokens, token)
@@ -57,12 +51,16 @@ func InitTokens() {
 	}
 }
 
-func ParseTokenConfigs(configs []TOKEN_CONFIG_) (map[string]SETTING_) {
+func ParseTokenConfigs(configs []map[string]any) (map[string]SETTING_) {
 	settings := map[string]SETTING_{}
 
 	for _, config := range configs {
-		for _, token := range config.TOKENS {
-			settings[token] = config.OVERRIDES
+		for _, token := range config["tokens"].([]string) {
+			settings[token] = SETTING_{
+				BLOCKED_ENDPOINTS: config["override.blockedendpoints"].([]string),
+				VARIABLES: config["overrides.variables"].(map[string]any),
+				MESSAGE_ALIASES: config["overrides.messagealiases"].([]middlewareTypes.MessageAlias),
+			}
 		}
 	}