Merge pull request #280 from MadAppGang/fix-config-validation

Fix FileStorageTypeLocal validation on login web app settings. Removed old static config.
MadAppGang · Dec 17, 2021 · 91e9513 · 91e9513
2 parents f0592ee + 5c5cdcf
commit 91e9513
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 20 deletions.
diff --git a/cmd/config-dynamodb.yaml b/cmd/config-dynamodb.yaml
@@ -31,12 +31,6 @@ keyStorage: # Storage for keys used for signing and verifying JWTs.
   file:
     private_key_path: ./jwt/test_artifacts/private.pem
 
-static:
-  type: local
-  local:
-    folder: ./static
-  serveAdminPanel: true
-
 login: # Supported login ways.
   loginWith:
     phone: true

diff --git a/cmd/config-mem.yaml b/cmd/config-mem.yaml
@@ -32,12 +32,6 @@ keyStorage: # Storage for keys used for signing and verifying JWTs.
   file:
     private_key_path: ./jwt/test_artifacts/private.pem
 
-static:
-  type: local
-  local:
-    folder: ./static
-  serveAdminPanel: true
-
 login: # Supported login ways.
   loginWith:
     phone: true

diff --git a/cmd/config-mongodb.yaml b/cmd/config-mongodb.yaml
@@ -30,12 +30,6 @@ keyStorage: # Storage for keys used for signing and verifying JWTs.
   file:
     private_key_path: ./jwt/test_artifacts/private.pem
 
-static:
-  type: local
-  local:
-    folder: ./static
-  serveAdminPanel: true
-
 login: # Supported login ways.
   loginWith:
     phone: true

diff --git a/model/server_settings_validation.go b/model/server_settings_validation.go
@@ -204,14 +204,13 @@ func (sfs *FileStorageSettings) Validate() error {
 		return fmt.Errorf("Nil %s", subject)
 	}
 
-
 	switch sfs.Type {
 	case FileStorageTypeDefault:
 		return nil
 	case FileStorageTypeNone:
 		return nil
 	case FileStorageTypeLocal:
-		if len(sfs.Local.FolderPath) > 0 {
+		if len(sfs.Local.FolderPath) == 0 {
 			return fmt.Errorf("%s. empty folder", subject)
 		}
 		return nil