Merge pull request #18974 from laperlej/fix_cilogon

[24.1] fix CILogon redirect
galaxyproject · Oct 16, 2024 · 5f11830 · 5f11830
2 parents ceef7ca + a776e80
commit 5f11830
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/client/src/utils/redirect.test.ts b/client/src/utils/redirect.test.ts
@@ -10,6 +10,10 @@ test("route prefix changes", async () => {
     expect(withPrefix("http://")).toEqual("http://");
     expect(withPrefix("/")).toEqual("/prefix/");
     expect(withPrefix("/home")).toEqual("/prefix/home");
+    // keep protocols in query parameters intact
+    expect(withPrefix("/authz/cilogon/login?idphint=https://test.com")).toEqual(
+        "/prefix/authz/cilogon/login?idphint=https://test.com"
+    );
     // ensure that it can only be called once
     expect(withPrefix(withPrefix("/home"))).toEqual("/prefix/prefix/home");
     // This doesn't do what it looks like it should do?

diff --git a/client/src/utils/redirect.ts b/client/src/utils/redirect.ts
@@ -10,7 +10,7 @@ export function reloadPage() {
     window.location.reload();
 }
 
-const slashCleanup = /(\/)+/g;
+const slashCleanup = /(?<!:)(\/)+/g;
 /**
  * Prepends the configured app root to given url
  * @param path