Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Backport: changed to use adminUrl instead (#30441) #30997

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
edewit merged 1 commit into from
Jul 2, 2024
Merged

Backport: changed to use adminUrl instead (#30441) #30997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions js/apps/admin-ui/src/clients/ClientsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type ClientRepresentation from "@keycloak/keycloak-admin-client/lib/defs/clientRepresentation";
import type { ClientQuery } from "@keycloak/keycloak-admin-client/lib/resources/clients";
import { useEnvironment } from "@keycloak/keycloak-ui-shared";
import {
AlertVariant,
Badge,
Expand Down Expand Up @@ -29,6 +30,7 @@ import {
import { ViewHeader } from "../components/view-header/ViewHeader";
import { useAccess } from "../context/access/Access";
import { useRealm } from "../context/realm-context/RealmContext";
import { Environment } from "../environment";
import helpUrls from "../help-urls";
import { emptyFormatter, exportClient } from "../util";
import { convertClientToUrl } from "../utils/client-url";
Expand Down Expand Up @@ -73,8 +75,8 @@ const ClientDescription = (client: ClientRepresentation) => (
);

const ClientHomeLink = (client: ClientRepresentation) => {
const { adminClient } = useAdminClient();
const href = convertClientToUrl(client, adminClient.baseUrl);
const { environment } = useEnvironment<Environment>();
const href = convertClientToUrl(client, environment);

if (!href) {
return "—";
Expand Down
50 changes: 30 additions & 20 deletions js/apps/admin-ui/src/utils/client-url.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ describe("convertClientToUrl", () => {
const baseUrl = "http://something";

//when
const result = convertClientToUrl({ baseUrl }, "");
//@ts-ignore
const result = convertClientToUrl({ baseUrl }, { serverBaseUrl: "" });

//then
expect(result).toBe(baseUrl);
Expand All @@ -16,13 +17,17 @@ describe("convertClientToUrl", () => {
it("when root url constrains ${authAdminUrl}", () => {
//given
const rootUrl = "${authAdminUrl}";
const baseUrl = "/else";
const adminUrl = "/else";

//when
const result = convertClientToUrl({ rootUrl, baseUrl }, "/admin");
const result = convertClientToUrl(
{ rootUrl, adminUrl },
//@ts-ignore
{ adminBaseUrl: "/admin" },
);

//then
expect(result).toBe("/admin/else");
expect(result).toBe("/admin");
});

it("when root url constrains ${authBaseUrl}", () => {
Expand All @@ -31,18 +36,26 @@ describe("convertClientToUrl", () => {
const baseUrl = "/something";

//when
const result = convertClientToUrl({ rootUrl, baseUrl }, "/admin");
const result = convertClientToUrl(
{ rootUrl, baseUrl },
//@ts-ignore
{ serverBaseUrl: "/admin" },
);

//then
expect(result).toBe("/admin/something");
expect(result).toBe("/admin");
});

it("when baseUrl when rootUrl is not set", () => {
//given
const baseUrl = "/another";

//when
const result = convertClientToUrl({ rootUrl: undefined, baseUrl }, "");
const result = convertClientToUrl(
{ rootUrl: undefined, baseUrl },
//@ts-ignore
{ serverBaseUrl: "" },
);

//then
expect(result).toBe("/another");
Expand All @@ -54,7 +67,11 @@ describe("convertClientToUrl", () => {
const rootUrl = "http://test.nl";

//when
const result = convertClientToUrl({ rootUrl, baseUrl }, "");
const result = convertClientToUrl(
{ rootUrl, baseUrl },
//@ts-ignore
{ serverBaseUrl: "" },
);

//then
expect(result).toBe("http://test.nl/another");
Expand All @@ -65,20 +82,13 @@ describe("convertClientToUrl", () => {
const rootUrl = "http://test.nl";

//when
const result = convertClientToUrl({ rootUrl, baseUrl: undefined }, "");
const result = convertClientToUrl(
{ rootUrl, baseUrl: undefined },
//@ts-ignore
{ serverBaseUrl: "" },
);

//then
expect(result).toBe("http://test.nl");
});

it("should it return ${authBaseUrl} when baseUrl is not set?", () => {
//given
const rootUrl = "${authBaseUrl}";

//when
const result = convertClientToUrl({ rootUrl, baseUrl: undefined }, "");

//then
expect(result).toBeUndefined();
});
});
17 changes: 8 additions & 9 deletions js/apps/admin-ui/src/utils/client-url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
import ClientRepresentation from "@keycloak/keycloak-admin-client/lib/defs/clientRepresentation";
import type { Environment } from "../environment";
import { joinPath } from "./joinPath";

export const convertClientToUrl = (
{ rootUrl, baseUrl }: ClientRepresentation,
adminClientBaseUrl: string,
environment: Environment,
) => {
// absolute base url configured, use base url is
if (baseUrl?.startsWith("http")) {
return baseUrl;
}

if (
(rootUrl === "${authBaseUrl}" || rootUrl === "${authAdminUrl}") &&
baseUrl
) {
return rootUrl.replace(
/\$\{(authAdminUrl|authBaseUrl)\}/,
joinPath(adminClientBaseUrl, baseUrl),
);
if (rootUrl === "${authAdminUrl}") {
return rootUrl.replace(/\$\{(authAdminUrl)\}/, environment.adminBaseUrl);
}

if (rootUrl === "${authBaseUrl}") {
return rootUrl.replace(/\$\{(authBaseUrl)\}/, environment.serverBaseUrl);
}

if (rootUrl?.startsWith("http")) {
Expand Down