diff --git a/apps/login/src/app/(login)/logout/page.tsx b/apps/login/src/app/(login)/logout/page.tsx index d15ead76a1..5fcf5511da 100644 --- a/apps/login/src/app/(login)/logout/page.tsx +++ b/apps/login/src/app/(login)/logout/page.tsx @@ -33,8 +33,8 @@ export default async function Page(props: { const locale = getLocale(); const t = await getTranslations({ locale, namespace: "logout" }); - const requestId = searchParams?.requestId; const organization = searchParams?.organization; + const postLogoutRedirectUri = searchParams?.post_logout_redirect_uri; const _headers = await headers(); const { serviceUrl } = getServiceUrlFromHeaders(_headers); @@ -58,10 +58,6 @@ export default async function Page(props: { const params = new URLSearchParams(); - if (requestId) { - params.append("requestId", requestId); - } - if (organization) { params.append("organization", organization); } @@ -73,7 +69,10 @@ export default async function Page(props: {

{t("description")}

- +
diff --git a/apps/login/src/components/session-clear-item.tsx b/apps/login/src/components/session-clear-item.tsx index aff303d65f..226d861ec7 100644 --- a/apps/login/src/components/session-clear-item.tsx +++ b/apps/login/src/components/session-clear-item.tsx @@ -13,11 +13,9 @@ import { isSessionValid } from "./session-item"; export function SessionClearItem({ session, reload, - requestId, }: { session: Session; reload: () => void; - requestId?: string; }) { const t = useTranslations("logout"); diff --git a/apps/login/src/components/sessions-clear-list.tsx b/apps/login/src/components/sessions-clear-list.tsx index 61288d9bd3..0875ef7022 100644 --- a/apps/login/src/components/sessions-clear-list.tsx +++ b/apps/login/src/components/sessions-clear-list.tsx @@ -3,18 +3,21 @@ import { timestampDate } from "@zitadel/client"; import { Session } from "@zitadel/proto/zitadel/session/v2/session_pb"; import { useTranslations } from "next-intl"; +import { useRouter } from "next/navigation"; import { useState } from "react"; import { Alert, AlertType } from "./alert"; import { SessionClearItem } from "./session-clear-item"; type Props = { sessions: Session[]; - requestId?: string; + postLogoutRedirectUri?: string; }; -export function SessionsClearList({ sessions, requestId }: Props) { +export function SessionsClearList({ sessions, postLogoutRedirectUri }: Props) { const t = useTranslations("logout"); const [list, setList] = useState(sessions); + const router = useRouter(); + return sessions ? (
{list @@ -34,9 +37,11 @@ export function SessionsClearList({ sessions, requestId }: Props) { return ( { setList(list.filter((s) => s.id !== session.id)); + if (postLogoutRedirectUri) { + router.push(postLogoutRedirectUri); + } }} key={"session-" + index} />