fix: env saving

server/env/env.go

@@ -78,6 +78,7 @@ func InitAllEnv() error {
 	osDisableMagicLinkLogin := os.Getenv(constants.EnvKeyDisableMagicLinkLogin)
 	osDisableLoginPage := os.Getenv(constants.EnvKeyDisableLoginPage)
 	osDisableSignUp := os.Getenv(constants.EnvKeyDisableSignUp)
+	osDisableRedisForEnv := os.Getenv(constants.EnvKeyDisableRedisForEnv)
 
 	// os slice vars
 	osAllowedOrigins := os.Getenv(constants.EnvKeyAllowedOrigins)
@@ -430,6 +431,19 @@ func InitAllEnv() error {
 		}
 	}
 
+	if _, ok := envData[constants.EnvKeyDisableRedisForEnv]; !ok {
+		envData[constants.EnvKeyDisableRedisForEnv] = osDisableRedisForEnv == "true"
+	}
+	if osDisableRedisForEnv != "" {
+		boolValue, err := strconv.ParseBool(osDisableRedisForEnv)
+		if err != nil {
+			return err
+		}
+		if boolValue != envData[constants.EnvKeyDisableRedisForEnv].(bool) {
+			envData[constants.EnvKeyDisableRedisForEnv] = boolValue
+		}
+	}
+
 	// no need to add nil check as its already done above
 	if envData[constants.EnvKeySmtpHost] == "" || envData[constants.EnvKeySmtpUsername] == "" || envData[constants.EnvKeySmtpPassword] == "" || envData[constants.EnvKeySenderEmail] == "" && envData[constants.EnvKeySmtpPort] == "" {
 		envData[constants.EnvKeyDisableEmailVerification] = true
@@ -450,7 +464,6 @@ func InitAllEnv() error {
 		envData[constants.EnvKeyAllowedOrigins] = osAllowedOrigins
 	}
 
-	////// Roles /////
 	if val, ok := envData[constants.EnvKeyRoles]; !ok || val == "" {
 		envData[constants.EnvKeyRoles] = osRoles
 		if envData[constants.EnvKeyRoles] == "" {
@@ -461,9 +474,7 @@ func InitAllEnv() error {
 		envData[constants.EnvKeyRoles] = osRoles
 	}
 	roles := strings.Split(envData[constants.EnvKeyRoles].(string), ",")
-	////// Roles /////
 
-	////// Default Role /////
 	if val, ok := envData[constants.EnvKeyDefaultRoles]; !ok || val == "" {
 		envData[constants.EnvKeyDefaultRoles] = osDefaultRoles
 		if envData[constants.EnvKeyDefaultRoles] == "" {
@@ -483,19 +494,13 @@ func InitAllEnv() error {
 			return fmt.Errorf("Default role %s is not defined in roles", role)
 		}
 	}
-	////// Default Role /////
 
-	////// Roles /////
 	if val, ok := envData[constants.EnvKeyProtectedRoles]; !ok || val == "" {
 		envData[constants.EnvKeyProtectedRoles] = osProtectedRoles
-		if envData[constants.EnvKeyProtectedRoles] == "" {
-			envData[constants.EnvKeyProtectedRoles] = "user"
-		}
 	}
 	if osProtectedRoles != "" && envData[constants.EnvKeyProtectedRoles] != osProtectedRoles {
 		envData[constants.EnvKeyProtectedRoles] = osProtectedRoles
 	}
-	////// Roles /////
 
 	err = memorystore.Provider.UpdateEnvStore(envData)
 	if err != nil {

server/env/persist_env.go

@@ -3,6 +3,7 @@ package env
 import (
 	"encoding/json"
 	"os"
+	"reflect"
 	"strconv"
 	"strings"
 
@@ -14,8 +15,46 @@ import (
 	"github.com/authorizerdev/authorizer/server/db"
 	"github.com/authorizerdev/authorizer/server/db/models"
 	"github.com/authorizerdev/authorizer/server/memorystore"
+	"github.com/authorizerdev/authorizer/server/utils"
 )
 
+func fixBackwardCompatibility(data map[string]interface{}) (bool, map[string]interface{}) {
+	result := data
+	// check if env data is stored in older format
+	hasOlderFormat := false
+	if _, ok := result["bool_env"]; ok {
+		for key, value := range result["bool_env"].(map[string]interface{}) {
+			result[key] = value
+		}
+		hasOlderFormat = true
+		delete(result, "bool_env")
+	}
+
+	if _, ok := result["string_env"]; ok {
+		for key, value := range result["string_env"].(map[string]interface{}) {
+			result[key] = value
+		}
+		hasOlderFormat = true
+		delete(result, "string_env")
+	}
+
+	if _, ok := result["slice_env"]; ok {
+		for key, value := range result["slice_env"].(map[string]interface{}) {
+			typeOfValue := reflect.TypeOf(value)
+			if strings.Contains(typeOfValue.String(), "[]string") {
+				result[key] = strings.Join(value.([]string), ",")
+			}
+			if strings.Contains(typeOfValue.String(), "[]interface") {
+				result[key] = strings.Join(utils.ConvertInterfaceToStringSlice(value), ",")
+			}
+		}
+		hasOlderFormat = true
+		delete(result, "slice_env")
+	}
+
+	return hasOlderFormat, result
+}
+
 // GetEnvData returns the env data from database
 func GetEnvData() (map[string]interface{}, error) {
 	var result map[string]interface{}
@@ -53,41 +92,16 @@ func GetEnvData() (map[string]interface{}, error) {
 		return result, err
 	}
 
-	///////// start backward compatibility ///////////
-	// check if env data is stored in older format
-	hasOlderFormat := false
-	if _, ok := result["bool_env"]; ok {
-		for key, value := range result["bool_env"].(map[string]interface{}) {
-			result[key] = value
-		}
-		hasOlderFormat = true
-		delete(result, "bool_env")
-	}
-
-	if _, ok := result["string_env"]; ok {
-		for key, value := range result["string_env"].(map[string]interface{}) {
-			result[key] = value
-		}
-		hasOlderFormat = true
-		delete(result, "string_env")
-	}
-
-	if _, ok := result["slice_env"]; ok {
-		for key, value := range result["slice_env"].(map[string]interface{}) {
-			result[key] = strings.Join(value.([]string), ",")
-		}
-		hasOlderFormat = true
-		delete(result, "slice_env")
-	}
+	hasOlderFormat, result := fixBackwardCompatibility(result)
 
 	if hasOlderFormat {
-		err := memorystore.Provider.UpdateEnvStore(result)
+		err = memorystore.Provider.UpdateEnvStore(result)
 		if err != nil {
-			log.Fatal("Error while updating env store: ", err)
+			log.Debug("Error while updating env store: ", err)
 			return result, err
 		}
+
 	}
-	///////// end backward compatibility ///////////
 
 	return result, err
 }
@@ -99,7 +113,11 @@ func PersistEnv() error {
 	if err != nil {
 		// AES encryption needs 32 bit key only, so we chop off last 4 characters from 36 bit uuid
 		hash := uuid.New().String()[:36-4]
-		memorystore.Provider.UpdateEnvVariable(constants.EnvKeyEncryptionKey, hash)
+		err := memorystore.Provider.UpdateEnvVariable(constants.EnvKeyEncryptionKey, hash)
+		if err != nil {
+			log.Debug("Error while updating encryption env variable: ", err)
+			return err
+		}
 		encodedHash := crypto.EncryptB64(hash)
 
 		res, err := memorystore.Provider.GetEnvStore()
@@ -157,6 +175,16 @@ func PersistEnv() error {
 			return err
 		}
 
+		hasOlderFormat, result := fixBackwardCompatibility(storeData)
+		if hasOlderFormat {
+			err = memorystore.Provider.UpdateEnvStore(result)
+			if err != nil {
+				log.Debug("Error while updating env store: ", err)
+				return err
+			}
+
+		}
+
 		// if env is changed via env file or OS env
 		// give that higher preference and update db, but we don't recommend it