From 08d44b1d5f3b0c8e97ffcb8b32f6b353171a511a Mon Sep 17 00:00:00 2001
From: braginini <bangvalo@gmail.com>
Date: Sat, 7 Aug 2021 13:35:52 +0200
Subject: [PATCH] refactor: move LetsEncryptDomain to HttpServer config

---
 infrastructure_files/config.json           | 13 +++++++++++--
 management/cmd/management.go               |  6 +++---
 management/server/config.go                | 15 ++++++++-------
 management/server/testdata/management.json | 10 +++++++++-
 4 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/infrastructure_files/config.json b/infrastructure_files/config.json
index 473bc8d54..b10e06aca 100644
--- a/infrastructure_files/config.json
+++ b/infrastructure_files/config.json
@@ -11,8 +11,8 @@
         {
             "Proto": "udp",
             "URI": "turn:stun.wiretrustee.com:3468",
-            "Username": "some_turn_user",
-            "Password": "some_turn_passwd"
+            "Username": "some_user",
+            "Password": "c29tZV9wYXNzd29yZA=="
         }
     ],
     "Signal": {
@@ -20,5 +20,14 @@
         "URI": "signal.wiretrustee.com:10000",
         "Username": "",
         "Password": null
+    },
+    "Datadir": "",
+    "HttpConfig": {
+        "LetsEncryptDomain": "",
+        "Address": "0.0.0.0:3000",
+        "AuthDomain": "<PASTE YOUR AUTH0 DOMAIN HERE>",
+        "AuthClientId": "<PASTE YOUR AUTH0 CLIENT ID HERE>",
+        "AuthClientSecret": "<PASTE YOUR AUTH0 SECRET>",
+        "AuthCallback": "http://localhost:3000/callback"
     }
 }
\ No newline at end of file
diff --git a/management/cmd/management.go b/management/cmd/management.go
index 2132495d7..faa509fdf 100644
--- a/management/cmd/management.go
+++ b/management/cmd/management.go
@@ -59,8 +59,8 @@ var (
 			var opts []grpc.ServerOption
 
 			var httpServer *http_server.Server
-			if config.LetsEncryptDomain != "" {
-				certManager := encryption.CreateCertManager(config.Datadir, config.LetsEncryptDomain)
+			if config.HttpConfig.LetsEncryptDomain != "" {
+				certManager := encryption.CreateCertManager(config.Datadir, config.HttpConfig.LetsEncryptDomain)
 				transportCredentials := credentials.NewTLS(certManager.TLSConfig())
 				opts = append(opts, grpc.Creds(transportCredentials))
 
@@ -119,7 +119,7 @@ func loadConfig() (*server.Config, error) {
 		return nil, err
 	}
 	if mgmtLetsencryptDomain != "" {
-		config.LetsEncryptDomain = mgmtLetsencryptDomain
+		config.HttpConfig.LetsEncryptDomain = mgmtLetsencryptDomain
 	}
 	if mgmtDataDir != "" {
 		config.Datadir = mgmtDataDir
diff --git a/management/server/config.go b/management/server/config.go
index c11b2c92b..34042aef9 100644
--- a/management/server/config.go
+++ b/management/server/config.go
@@ -16,18 +16,19 @@ type Config struct {
 	Turns  []*Host
 	Signal *Host
 
-	Datadir           string
-	LetsEncryptDomain string
+	Datadir string
 
 	HttpConfig *HttpServerConfig
 }
 
+// HttpServerConfig is a config of the HTTP Management service server
 type HttpServerConfig struct {
-	Address          string
-	AuthDomain       string
-	AuthClientId     string
-	AuthClientSecret string
-	AuthCallback     string
+	LetsEncryptDomain string
+	Address           string
+	AuthDomain        string
+	AuthClientId      string
+	AuthClientSecret  string
+	AuthCallback      string
 }
 
 // Host represents a Wiretrustee host (e.g. STUN, TURN, Signal)
diff --git a/management/server/testdata/management.json b/management/server/testdata/management.json
index 8cb4acf10..8282a7756 100644
--- a/management/server/testdata/management.json
+++ b/management/server/testdata/management.json
@@ -21,5 +21,13 @@
         "Username": "",
         "Password": null
     },
-    "DataDir": ""
+    "DataDir": "",
+    "HttpConfig": {
+        "LetsEncryptDomain": "",
+        "Address": "0.0.0.0:3000",
+        "AuthDomain": "<PASTE YOUR AUTH0 DOMAIN HERE>",
+        "AuthClientId": "<PASTE YOUR AUTH0 CLIENT ID HERE>",
+        "AuthClientSecret": "<PASTE YOUR AUTH0 SECRET>",
+        "AuthCallback": "http://localhost:3000/callback"
+    }
 }
\ No newline at end of file