Get the root URL of the request instead of from the config

WimJongeneel · WimJongeneel · commit bc660c850bc2 · 2023-08-28T11:25:53.000+02:00
diff --git a/src/DeepLinkModule/javasource/deeplink/implementation/handler/DeeplinkHandler.java b/src/DeepLinkModule/javasource/deeplink/implementation/handler/DeeplinkHandler.java
@@ -100,7 +100,7 @@ else if(DeeplinkHandler.SSOHandler != null) {
 							ResponseHandler.serve404(response);
 						}
 						else {
-							ResponseHandler.serveIndex(response, deepLinkConfigurationObject.getIndexPage());
+							ResponseHandler.serveIndex(request, response, deepLinkConfigurationObject.getIndexPage());
 						}
 					}
 				}
diff --git a/src/DeepLinkModule/javasource/deeplink/implementation/handler/ResponseHandler.java b/src/DeepLinkModule/javasource/deeplink/implementation/handler/ResponseHandler.java
@@ -25,7 +25,7 @@ public static void serve404(IMxRuntimeResponse response) throws IOException {
 		response.setStatus(IMxRuntimeResponse.NOT_FOUND);
 	}
 
-	public static void serveIndex(IMxRuntimeResponse response, String indexpage) {
+	public static void serveIndex(IMxRuntimeRequest request, IMxRuntimeResponse response, String indexpage) {
 		response.setStatus(IMxRuntimeResponse.SEE_OTHER);
 
 		String location = null;
@@ -38,7 +38,7 @@ public static void serveIndex(IMxRuntimeResponse response, String indexpage) {
 			location = INDEXPAGE;
 		}
 
-		location = getRootUrl() + ensureStartingSlash(location);
+		location = getRootUrl(request) + ensureStartingSlash(location);
 
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("Redirecting to index location: " + location);
@@ -78,7 +78,7 @@ public static void serveSSOHandler(IMxRuntimeRequest request, IMxRuntimeResponse
 						java.nio.charset.StandardCharsets.UTF_8.toString());
 			}
 
-			redirectLocation = getRootUrl() + ensureStartingSlash(redirectLocation);
+			redirectLocation = getRootUrl(request) + ensureStartingSlash(redirectLocation);
 
 			response.setStatus(IMxRuntimeResponse.SEE_OTHER);
 			response.addHeader("location", redirectLocation);
@@ -135,11 +135,11 @@ public static void serveLogin(IMxRuntimeRequest request, IMxRuntimeResponse resp
 
 			if (continuationURL != null && continuationURL.length() > 0) {
 				loginLocation += URLEncoder.encode(continuationURL, java.nio.charset.StandardCharsets.UTF_8.toString());
-			}
+			}	
 		}
 
 		if (!loginLocation.startsWith("http")) {
-			loginLocation = getRootUrl() + ensureStartingSlash(loginLocation);
+			loginLocation = getRootUrl(request) + ensureStartingSlash(loginLocation);
 		}
 
 		response.setStatus(IMxRuntimeResponse.SEE_OTHER);
@@ -168,10 +168,10 @@ private static String ensureNoStartingSlash(String s) {
 		return s;
 	}
 
-	private static String getRootUrl()
+	private static String getRootUrl(IMxRuntimeRequest request)
 	{
-		String url = Core.getConfiguration().getApplicationRootUrl();
-		String path = ensureStartingSlash(URI.create(url).getPath());
+		String url = request.getRootUrl();
+		String path = ensureStartingSlash(java.net.URI.create(url).getPath());
 		if(path.endsWith("/"))
 			return path.substring(0, path.length() - 1);
 		return path;

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ else if(DeeplinkHandler.SSOHandler != null) {`
`100`	`100`	`ResponseHandler.serve404(response);`
`101`	`101`	`}`
`102`	`102`	`else {`
`103`		`- ResponseHandler.serveIndex(response, deepLinkConfigurationObject.getIndexPage());`
	`103`	`+ ResponseHandler.serveIndex(request, response, deepLinkConfigurationObject.getIndexPage());`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`	`}`