fixing normilization

Author: CodeShellDev

utils/config/loader.go

@@ -79,12 +79,12 @@ func Load() {
 
 	config = mergeLayers()
 
-	InitTokens()
-
 	normalizeKeys(config)
 
 	templateConfig(config)
 
+	InitTokens()
+
 	InitEnv()
 
 	log.Info("Finished Loading Configuration")

utils/config/token-config.go

@@ -17,14 +17,18 @@ func LoadTokens() {
 	log.Debug("Loading Configs ", ENV.TOKENS_DIR)
 
 	LoadDir("tokenConfigs", ENV.TOKENS_DIR, tokensLayer, yaml.Parser())
+
+	normalizeKeys(tokensLayer)
+
+	templateConfig(tokensLayer)
 }
 
 func InitTokens() {
 	apiTokens := config.Strings("api.tokens")
 
 	var tokenConfigs []TOKEN_CONFIG_
 
-	transformChildrenUnderArray(config, "tokenConfigs", "override.variables", func(key string, value any) (string, any) {
+	transformChildrenUnderArray(tokensLayer, "tokenConfigs", "override.variables", func(key string, value any) (string, any) {
 		return strings.ToUpper(key), value
 	})