mirror/keycloak
1
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-06 06:49:53 -06:00
Code Issues Packages Projects Releases Wiki Activity

revert part of change (#31055)

Browse Source 
fixes: #31038

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit
2024-07-09 12:18:45 +02:00
committed by GitHub
parent 433377136d
commit ffbfb7450f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/admin-ui/src/utils/client-url.test.ts
View File

@@ -43,7 +43,7 @@ describe("convertClientToUrl", () => {
);
//then
expect(result).toBe("/admin");
expect(result).toBe("/admin/something");
});
it("when baseUrl when rootUrl is not set", () => {

5
js/apps/admin-ui/src/utils/client-url.ts
View File

@@ -16,7 +16,10 @@ export const convertClientToUrl = (
}
if (rootUrl === "${authBaseUrl}") {
return rootUrl.replace(/\$\{(authBaseUrl)\}/, environment.serverBaseUrl);
return joinPath(
rootUrl.replace(/\$\{(authBaseUrl)\}/, environment.serverBaseUrl),
baseUrl || "",
);
}
if (rootUrl?.startsWith("http")) {