fix: rename config -> env and handle env interface better

server/envstore/store.go

@@ -6,60 +6,97 @@ import (
 	"github.com/authorizerdev/authorizer/server/constants"
 )
 
+// Store data structure
+type Store struct {
+	StringEnv map[string]string   `json:"string_env"`
+	BoolEnv   map[string]bool     `json:"bool_env"`
+	SliceEnv  map[string][]string `json:"slice_env"`
+}
+
 // EnvInMemoryStore struct
 type EnvInMemoryStore struct {
 	mutex sync.Mutex
-	store map[string]interface{}
+	store *Store
 }
 
 // EnvInMemoryStoreObj global variable for EnvInMemoryStore
 var EnvInMemoryStoreObj = &EnvInMemoryStore{
-	store: map[string]interface{}{
-		constants.EnvKeyAdminCookieName:            "authorizer-admin",
-		constants.EnvKeyJwtRoleClaim:               "role",
-		constants.EnvKeyOrganizationName:           "Authorizer",
-		constants.EnvKeyOrganizationLogo:           "https://www.authorizer.io/images/logo.png",
-		constants.EnvKeyDisableBasicAuthentication: false,
-		constants.EnvKeyDisableMagicLinkLogin:      false,
-		constants.EnvKeyDisableEmailVerification:   false,
-		constants.EnvKeyDisableLoginPage:           false,
+	store: &Store{
+		StringEnv: map[string]string{
+			constants.EnvKeyAdminCookieName:  "authorizer-admin",
+			constants.EnvKeyJwtRoleClaim:     "role",
+			constants.EnvKeyOrganizationName: "Authorizer",
+			constants.EnvKeyOrganizationLogo: "https://www.authorizer.io/images/logo.png",
+		},
+		BoolEnv: map[string]bool{
+			constants.EnvKeyDisableBasicAuthentication: false,
+			constants.EnvKeyDisableMagicLinkLogin:      false,
+			constants.EnvKeyDisableEmailVerification:   false,
+			constants.EnvKeyDisableLoginPage:           false,
+		},
+		SliceEnv: map[string][]string{},
 	},
 }
 
 // UpdateEnvStore to update the whole env store object
-func (e *EnvInMemoryStore) UpdateEnvStore(data map[string]interface{}) {
+func (e *EnvInMemoryStore) UpdateEnvStore(store Store) {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 	// just override the keys + new keys
-	for key, value := range data {
-		e.store[key] = value
+
+	for key, value := range store.StringEnv {
+		e.store.StringEnv[key] = value
+	}
+
+	for key, value := range store.BoolEnv {
+		e.store.BoolEnv[key] = value
+	}
+
+	for key, value := range store.SliceEnv {
+		e.store.SliceEnv[key] = value
 	}
 }
 
 // UpdateEnvVariable to update the particular env variable
-func (e *EnvInMemoryStore) UpdateEnvVariable(key string, value interface{}) map[string]interface{} {
+func (e *EnvInMemoryStore) UpdateEnvVariable(storeIdentifier, key string, value interface{}) {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
-	e.store[key] = value
-	return e.store
+	switch storeIdentifier {
+	case constants.StringStoreIdentifier:
+		e.store.StringEnv[key] = value.(string)
+	case constants.BoolStoreIdentifier:
+		e.store.BoolEnv[key] = value.(bool)
+	case constants.SliceStoreIdentifier:
+		e.store.SliceEnv[key] = value.([]string)
+	}
 }
 
-// GetEnvStore to get the env variable from env store object
-func (e *EnvInMemoryStore) GetEnvVariable(key string) interface{} {
+// GetStringStoreEnvVariable to get the env variable from string store object
+func (e *EnvInMemoryStore) GetStringStoreEnvVariable(key string) string {
 	// e.mutex.Lock()
 	// defer e.mutex.Unlock()
-	return e.store[key]
+	return e.store.StringEnv[key]
+}
+
+// GetBoolStoreEnvVariable to get the env variable from bool store object
+func (e *EnvInMemoryStore) GetBoolStoreEnvVariable(key string) bool {
+	// e.mutex.Lock()
+	// defer e.mutex.Unlock()
+	return e.store.BoolEnv[key]
+}
+
+// GetSliceStoreEnvVariable to get the env variable from slice store object
+func (e *EnvInMemoryStore) GetSliceStoreEnvVariable(key string) []string {
+	// e.mutex.Lock()
+	// defer e.mutex.Unlock()
+	return e.store.SliceEnv[key]
 }
 
 // GetEnvStoreClone to get clone of current env store object
-func (e *EnvInMemoryStore) GetEnvStoreClone() map[string]interface{} {
+func (e *EnvInMemoryStore) GetEnvStoreClone() Store {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 
-	result := make(map[string]interface{})
-	for key, value := range e.store {
-		result[key] = value
-	}
-
+	result := *e.store
 	return result
 }