Merge pull request #2 from SEPIA-Framework/dev

added privacy policy integration for server

Author: fquirin

Xtensions/teach.custom.properties

@@ -10,4 +10,5 @@ cluster_key=KantbyW3YLh8jTQPs5uzt2SzbmXZyphW
 allow_internal_calls=false
 use_db_log=false
 server_local_name=sepia-teach-server
-server_local_secret=123456
+server_local_secret=123456
+privacy_policy=https\://my-server.example.org/sepia/privacy-policy.html

Xtensions/teach.properties

@@ -10,4 +10,5 @@ cluster_key=KantbyW3YLh8jTQPs5uzt2SzbmXZyphW
 allow_internal_calls=false
 use_db_log=false
 server_local_name=sepia-teach-server
-server_local_secret=123456
+server_local_secret=123456
+privacy_policy=https\://my-server.example.org/sepia/privacy-policy.html

Xtensions/teach.test.properties

@@ -10,4 +10,5 @@ cluster_key=KantbyW3YLh8jTQPs5uzt2SzbmXZyphW
 allow_internal_calls=false
 use_db_log=false
 server_local_name=sepia-teach-server
-server_local_secret=123456
+server_local_secret=123456
+privacy_policy=https\://my-server.example.org/sepia/privacy-policy.html

src/main/java/net/b07z/sepia/server/teach/server/Config.java

@@ -21,6 +21,7 @@ public final class Config {
 	public static String localName = "sepia-teach-server";			//**user defined local server name
 	public static String localSecret = "123456";					//**user defined secret to validate local server
 	public static final String apiVersion = "v2.0.0";				//API version
+	public static String privacyPolicyLink = "";					//Link to privacy policy
 
 	//helper for dynamic class creation
 	public static final String parentPackage = Config.class.getPackage().getName().substring(0, Config.class.getPackage().getName().lastIndexOf('.'));
@@ -85,6 +86,8 @@ public static void loadSettings(String confFile){
 			localName = settings.getProperty("server_local_name");
 			localSecret = settings.getProperty("server_local_secret");
 			clusterKey = settings.getProperty("cluster_key");
+			//policies
+			privacyPolicyLink =  settings.getProperty("privacy_policy");
 			//databases
 			defaultRegion = settings.getProperty("db_default_region", "eu");
 			ConfigElasticSearch.endpoint_custom = settings.getProperty("db_elastic_endpoint_custom", "");

src/main/java/net/b07z/sepia/server/teach/server/Start.java

@@ -115,14 +115,15 @@ public static void main(String[] args) {
 		coreToolsConfig = JSON.make(
 				"defaultAssistAPI", Config.assistAPI,
 				"defaultTeachAPI", Config.endpointUrl,
-				"clusterKey", Config.clusterKey
+				"clusterKey", Config.clusterKey,
+				"privacyPolicy", Config.privacyPolicyLink
 		);
 		ConfigDefaults.setupCoreTools(coreToolsConfig);
 		//part 2
 		long clusterTic = Timer.tic();
 		JSONObject assistApiClusterData = ConfigDefaults.getAssistantClusterData();
 		if (assistApiClusterData == null){
-			new RuntimeException("Core-tools are NOT set properly! AssistAPI could not be reached!");
+			throw new RuntimeException("Core-tools are NOT set properly! AssistAPI could not be reached!");
 		}else{
 			log.info("Received cluster-data from AssistAPI after " + Timer.toc(clusterTic) + "ms");
 		}
@@ -135,7 +136,7 @@ public static void main(String[] args) {
 
 		//Check core-tools settings
 		if (!ConfigDefaults.areCoreToolsSet()){
-			new RuntimeException("Core-tools are NOT set properly!");
+			throw new RuntimeException("Core-tools are NOT set properly!");
 		}
 
 		Debugger.println("Starting Teach-API server " + Config.apiVersion + " (" + serverType + ")", 3);