External-Mirrors/keycloak
2
0
Fork 0
mirror of https://github.com/keycloak/keycloak.git synced 2026-01-09 23:12:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

revert part of change (#31055) (#33237)

Browse Source 
fixes: #31038

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
(cherry picked from commit ffbfb7450f72602425c12df344aabb74c8f901fe)

Co-authored-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Jon Koops 2024-09-24 12:42:37 +02:00 committed by GitHub
parent 9b2bf7dd58
commit 5390367b06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats 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")) {