Server uri auto determined

OPSILab · Jul 19, 2018 · e00bb8f · e00bb8f
1 parent 2e51968
commit e00bb8f
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 25 deletions.
diff --git a/IdraPortal/src/main/java/it/eng/idraportal/utils/LoadConfigs.java b/IdraPortal/src/main/java/it/eng/idraportal/utils/LoadConfigs.java
@@ -78,27 +78,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
 
 		json=new JSONObject(prop);
 
-		/*
-		 * Problem with reverse proxy
-		 * TODO: check this answer 
-		 * https://stackoverflow.com/questions/25911469/request-getscheme-is-returning-http-instead-of-returning-https-in-java
-		 * */
-//		String serverUri = request.getScheme() + "://" + 
-//	             request.getServerName() +   
-//	             ("".equalsIgnoreCase(request.getServerPort()+"")?"":":" + request.getServerPort());
-//		
-//		System.out.println("\n\n\n");
-//		System.out.println(serverUri);
-//		System.out.println("\n\n\n");
-//		String adminURL = json.getString("ADMIN_SERVICES_BASE_URL");
-//		if(!adminURL.startsWith("http")) {
-//			json.put("ADMIN_SERVICES_BASE_URL", serverUri+(adminURL.startsWith("/")?"":"/")+adminURL);
-//		}
-//		String clientURL = json.getString("CLIENT_SERVICES_BASE_URL");
-//		if(!clientURL.startsWith("http")) {
-//			json.put("CLIENT_SERVICES_BASE_URL", serverUri+(clientURL.startsWith("/")?"":"/")+clientURL);
-//		}
-
 		out.write(json.toString());
 
 	}

diff --git a/IdraPortal/src/main/resources/configuration.properties b/IdraPortal/src/main/resources/configuration.properties
@@ -18,11 +18,10 @@
 ### PLATFORM APIs PATH ###############################################
 
 # If not specified in ADMIN_SERVICES_BASE_URL and in CLIENT_SERVICES_BASE_URL 
-# the server uri will be automatically set by the portal (LoadConfigs servlet) 
-# Not working yet
+# the server uri will be automatically set by the portal
 
-ADMIN_SERVICES_BASE_URL = http://localhost:8080/Idra/api/v1/administration
-CLIENT_SERVICES_BASE_URL = http://localhost:8080/Idra/api/v1/client
+ADMIN_SERVICES_BASE_URL = Idra/api/v1/administration
+CLIENT_SERVICES_BASE_URL = Idra/api/v1/client
 
 #### ADMINISTRATION APIs ########################
 ## NODES #### 

diff --git a/IdraPortal/src/main/webapp/app.js b/IdraPortal/src/main/webapp/app.js
@@ -43,6 +43,17 @@
 //		ODMSNodesAPI.buildCache();
 //	}]);
 
+	app.run(['config','$location',function(config,$location) {
+		var adminURL = config.ADMIN_SERVICES_BASE_URL;
+		if(!adminURL.startsWith('http')){
+			config.ADMIN_SERVICES_BASE_URL=$location.protocol() + "://" + $location.host() + ":" + $location.port()+(adminURL.startsWith("/")?"":"/")+adminURL;
+		}
+		var clientURL = config.CLIENT_SERVICES_BASE_URL;
+		if(!config.CLIENT_SERVICES_BASE_URL.startsWith('http')){
+			config.CLIENT_SERVICES_BASE_URL=$location.protocol() + "://" + $location.host() + ":" + $location.port()+(clientURL.startsWith("/")?"":"/")+clientURL;
+		}
+	}]);
+
 	app.config(['uiZeroclipConfigProvider', function(uiZeroclipConfigProvider) {
 		uiZeroclipConfigProvider.setZcConf({
 			swfPath: "bower_components/zeroclipboard/dist/ZeroClipboard.swf"