fix tests and edgecases

hpi-schul-cloud · Jan 30, 2025 · b720c6d · b720c6d
1 parent 115152d
commit b720c6d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/config/global.js b/config/global.js
@@ -23,7 +23,7 @@ const {
 	FEATURE_EXTENSIONS_ENABLED,
 	SHOW_VERSION,
 	SW_ENABLED,
-	HOST,
+	HOST = 'http://localhost',
 	PORT = '3100',
 	FEATURE_ENTERTHECLOUD,
 	FEATURE_JWT_EXTENDED_TIMEOUT_ENABLED,

diff --git a/helpers/redirect.js b/helpers/redirect.js
@@ -6,7 +6,7 @@ const global = require('../config/global');
  * @param {string} redirectUrl URL to which the user should be redirected
  * @returns {string} URL without multiple leading slashes
  */
-const collapseLeadingSlashes = (redirectUrl) => redirectUrl.replace(/^\/*/, '/');
+const collapseLeadingSlashes = (redirectUrl) => redirectUrl.replace(/^\/+/, '/');
 
 /**
  * Transform given URL to valid (sanitized and relative) redirect URL
@@ -17,12 +17,12 @@ const getValidRedirect = (redirectUrl) => {
 	if (!redirectUrl) return '/';
 	const sanitizedUrl = sanitizeHtml(redirectUrl);
 	let relativeUrl = '/';
-	const parsedUrl = URL.parse(sanitizedUrl, global.HOST);
+	const parsedUrl = URL.parse(collapseLeadingSlashes(sanitizedUrl), global.HOST);
 	if (parsedUrl) {
 		relativeUrl = parsedUrl.pathname + parsedUrl.search + parsedUrl.hash;
 	}
 
-	return collapseLeadingSlashes(relativeUrl);
+	return relativeUrl;
 };
 
 const joinPathWithQuery = (path, paramsString) => (paramsString ? `${path}?${paramsString}` : path);