Add application root url to redirects

WimJongeneel · WimJongeneel · commit fa9ef6e8bf92 · 2023-08-23T14:00:23.000+02:00
diff --git a/src/DeepLinkModule/javasource/deeplink/implementation/handler/ResponseHandler.java b/src/DeepLinkModule/javasource/deeplink/implementation/handler/ResponseHandler.java
@@ -38,9 +38,7 @@ public static void serveIndex(IMxRuntimeResponse response, String indexpage) {
 			location = INDEXPAGE;
 		}
 
-		if (!location.startsWith("/")) {
-			location = "/" + location;
-		}
+		location = getRootUrl() + ensureStartingSlash(location);
 
 		if (LOG.isTraceEnabled()) {
 			LOG.trace("Redirecting to index location: " + location);
@@ -80,6 +78,8 @@ public static void serveSSOHandler(IMxRuntimeRequest request, IMxRuntimeResponse
 						java.nio.charset.StandardCharsets.UTF_8.toString());
 			}
 
+			redirectLocation = getRootUrl() + ensureStartingSlash(redirectLocation);
+
 			response.setStatus(IMxRuntimeResponse.SEE_OTHER);
 			response.addHeader("location", redirectLocation);
 		} else {
@@ -139,12 +139,11 @@ public static void serveLogin(IMxRuntimeRequest request, IMxRuntimeResponse resp
 		}
 
 		if (!loginLocation.startsWith("http")) {
-			loginLocation = ensureStartingSlash(loginLocation);
+			loginLocation = getRootUrl() + ensureStartingSlash(loginLocation);
 		}
 
 		response.setStatus(IMxRuntimeResponse.SEE_OTHER);
 		response.addHeader("location", loginLocation);
-
 	}
 
 	private static String ensureStartingSlash(String s) {
@@ -169,4 +168,13 @@ private static String ensureNoStartingSlash(String s) {
 		return s;
 	}
 
+	private static String getRootUrl()
+	{
+		String url = Core.getConfiguration().getApplicationRootUrl();
+		String path = ensureStartingSlash(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
`@@ -38,9 +38,7 @@ public static void serveIndex(IMxRuntimeResponse response, String indexpage) {`
`38`	`38`	`location = INDEXPAGE;`
`39`	`39`	`}`
`40`	`40`
`41`		`- if (!location.startsWith("/")) {`
`42`		`- location = "/" + location;`
`43`		`- }`
	`41`	`+ location = getRootUrl() + ensureStartingSlash(location);`
`44`	`42`
`45`	`43`	`if (LOG.isTraceEnabled()) {`
`46`	`44`	`LOG.trace("Redirecting to index location: " + location);`
`@@ -80,6 +78,8 @@ public static void serveSSOHandler(IMxRuntimeRequest request, IMxRuntimeResponse`
`80`	`78`	`java.nio.charset.StandardCharsets.UTF_8.toString());`
`81`	`79`	`}`
`82`	`80`
	`81`	`+ redirectLocation = getRootUrl() + ensureStartingSlash(redirectLocation);`
	`82`	`+`
`83`	`83`	`response.setStatus(IMxRuntimeResponse.SEE_OTHER);`
`84`	`84`	`response.addHeader("location", redirectLocation);`
`85`	`85`	`} else {`
`@@ -139,12 +139,11 @@ public static void serveLogin(IMxRuntimeRequest request, IMxRuntimeResponse resp`
`139`	`139`	`}`
`140`	`140`
`141`	`141`	`if (!loginLocation.startsWith("http")) {`
`142`		`- loginLocation = ensureStartingSlash(loginLocation);`
	`142`	`+ loginLocation = getRootUrl() + ensureStartingSlash(loginLocation);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`response.setStatus(IMxRuntimeResponse.SEE_OTHER);`
`146`	`146`	`response.addHeader("location", loginLocation);`
`147`		`-`
`148`	`147`	`}`
`149`	`148`
`150`	`149`	`private static String ensureStartingSlash(String s) {`
`@@ -169,4 +168,13 @@ private static String ensureNoStartingSlash(String s) {`
`169`	`168`	`return s;`
`170`	`169`	`}`
`171`	`170`
	`171`	`+ private static String getRootUrl()`
	`172`	`+ {`
	`173`	`+ String url = Core.getConfiguration().getApplicationRootUrl();`
	`174`	`+ String path = ensureStartingSlash(URI.create(url).getPath());`
	`175`	`+ if(path.endsWith("/"))`
	`176`	`+ return path.substring(0, path.length() - 1);`
	`177`	`+ return path;`
	`178`	`+ }`
	`179`	`+`
`172`	`180`	`}`