load reva gateway and token manager from common config

2022-04-27 13:58:59 +02:00
parent 48a6978e24
commit 9095b11d6c
86 changed files with 1209 additions and 250 deletions
@@ -31,9 +31,10 @@ func DefaultConfig() *config.Config {
 			Name: "user",
 		},
 		UsersCacheExpiration: 5,
-		GatewayEndpoint:      "127.0.0.1:9142",
-		JWTSecret:            "Pive-Fumkiu4",
-		Driver:               "ldap",
+		Reva: &config.Reva{
+			Address: "127.0.0.1:9142",
+		},
+		Driver: "ldap",
 		Drivers: config.Drivers{
 			LDAP: config.LDAPDriver{
 				URI:              "ldaps://localhost:9126",
@@ -106,6 +107,22 @@ func EnsureDefaults(cfg *config.Config) {
 	} else if cfg.Tracing == nil {
 		cfg.Tracing = &config.Tracing{}
 	}
+
+	if cfg.Reva == nil && cfg.Commons != nil && cfg.Commons.Reva != nil {
+		cfg.Reva = &config.Reva{
+			Address: cfg.Commons.Reva.Address,
+		}
+	} else if cfg.Reva == nil {
+		cfg.Reva = &config.Reva{}
+	}
+
+	if cfg.TokenManager == nil && cfg.Commons != nil && cfg.Commons.TokenManager != nil {
+		cfg.TokenManager = &config.TokenManager{
+			JWTSecret: cfg.Commons.TokenManager.JWTSecret,
+		}
+	} else if cfg.TokenManager == nil {
+		cfg.TokenManager = &config.TokenManager{}
+	}
 }

 func Sanitize(cfg *config.Config) {