Merge pull request #25 from RTradeLtd/api/cors

Allow CORS Configuration Via Config
RTradeLtd · Mar 9, 2019 · b0ee70d · b0ee70d
2 parents 4140b3d + 1b249a5
commit b0ee70d
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/config.go b/config.go
@@ -44,4 +44,7 @@ func (t *TemporalConfig) setDefaults() {
 	if t.LogDir == "" {
 		t.LogDir = "/var/log/temporal/"
 	}
+	if len(t.API.Connection.CORS.AllowedOrigin) == 0 {
+		t.API.Connection.CORS.AllowedOrigin = []string{"temporal.cloud", "backup.temporal.cloud"}
+	}
 }
diff --git a/config.json b/config.json
@@ -10,6 +10,12 @@
 				"ip": "",
 				"port": ""
 			},
+			"cords": {
+				"allowed_origins": [
+					"temporal.cloud",
+					"backup.temporal.cloud"
+				]
+			},
 			"limit": ""
 		},
 		"jwt": {
@@ -40,7 +46,16 @@
 				"cert_path": "",
 				"key_file": ""
 			},
-			"auth_key": ""
+			"auth_key": "",
+			"options": {
+				"engine": {
+					"store_path": "",
+					"queue": {
+						"rate": 0,
+						"batch": 0
+					}
+				}
+			}
 		},
 		"nexus": {
 			"host": "",
@@ -73,6 +88,16 @@
 			"auth_key": "",
 			"log_file": "",
 			"keystore_password": ""
+		},
+		"krab_fallback": {
+			"url": "",
+			"TLS": {
+				"cert_path": "",
+				"key_file": ""
+			},
+			"auth_key": "",
+			"log_file": "",
+			"keystore_password": ""
 		}
 	},
 	"ethereum": {

diff --git a/types.go b/types.go
@@ -31,6 +31,9 @@ type API struct {
 			IP   string `json:"ip"`
 			Port string `json:"port"`
 		} `json:"prometheus"`
+		CORS struct {
+			AllowedOrigin []string `json:"allowed_origins"`
+		} `json:"cords"`
 		// define the maximum number of people allowed to connect to the API
 		Limit string `json:"limit"`
 	} `json:"connection"`