show hint on success page

This commit is contained in:
Max Peintner
2025-05-05 10:12:48 +02:00
parent 781462d9f1
commit bcf1e3aa71
2 changed files with 12 additions and 4 deletions

View File

@@ -1,6 +1,6 @@
import { Alert, AlertType } from "@/components/alert";
import { Button, ButtonVariants } from "@/components/button"; import { Button, ButtonVariants } from "@/components/button";
import { DynamicTheme } from "@/components/dynamic-theme"; import { DynamicTheme } from "@/components/dynamic-theme";
import { SelfServiceMenu } from "@/components/self-service-menu";
import { UserAvatar } from "@/components/user-avatar"; import { UserAvatar } from "@/components/user-avatar";
import { import {
getMostRecentCookieWithLoginname, getMostRecentCookieWithLoginname,
@@ -118,7 +118,6 @@ export default async function Page(props: { searchParams: Promise<any> }) {
const { serviceUrl } = getServiceUrlFromHeaders(_headers); const { serviceUrl } = getServiceUrlFromHeaders(_headers);
const { loginName, requestId, organization, sessionId } = searchParams; const { loginName, requestId, organization, sessionId } = searchParams;
// const sessionFactors = await loadSession(serviceUrl, loginName, requestId);
const sessionFactors = sessionId const sessionFactors = sessionId
? await loadSessionById(serviceUrl, sessionId, organization) ? await loadSessionById(serviceUrl, sessionId, organization)
@@ -148,6 +147,13 @@ export default async function Page(props: { searchParams: Promise<any> }) {
</h1> </h1>
<p className="ztdl-p mb-6 block">{t("description")}</p> <p className="ztdl-p mb-6 block">{t("description")}</p>
{requestId && requestId.startsWith("device_") && (
<Alert type={AlertType.INFO}>
You can now close this window and return to the device where you
started the authorization process to continue.
</Alert>
)}
<UserAvatar <UserAvatar
loginName={loginName ?? sessionFactors?.factors?.user?.loginName} loginName={loginName ?? sessionFactors?.factors?.user?.loginName}
displayName={sessionFactors?.factors?.user?.displayName} displayName={sessionFactors?.factors?.user?.displayName}
@@ -155,9 +161,9 @@ export default async function Page(props: { searchParams: Promise<any> }) {
searchParams={searchParams} searchParams={searchParams}
/> />
{sessionFactors?.id && ( {/* {sessionFactors?.id && (
<SelfServiceMenu sessionId={sessionFactors?.id} /> <SelfServiceMenu sessionId={sessionFactors?.id} />
)} )} */}
{loginSettings?.defaultRedirectUri && ( {loginSettings?.defaultRedirectUri && (
<div className="mt-8 flex w-full flex-row items-center"> <div className="mt-8 flex w-full flex-row items-center">

View File

@@ -101,6 +101,8 @@ export async function loginWithDeviceAndSession({
const signedinUrl = constructUrl(request, "/signedin"); const signedinUrl = constructUrl(request, "/signedin");
signedinUrl.searchParams.set("requestId", `device_${deviceRequest}`);
if (selectedSession.factors?.user?.loginName) { if (selectedSession.factors?.user?.loginName) {
signedinUrl.searchParams.set( signedinUrl.searchParams.set(
"loginName", "loginName",