From bcf1e3aa71d6ac0c24171051984517d4db9cf780 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Mon, 5 May 2025 10:12:48 +0200
Subject: [PATCH] show hint on success page

---
 apps/login/src/app/(login)/signedin/page.tsx | 14 ++++++++++----
 apps/login/src/lib/device.ts                 |  2 ++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/login/src/app/(login)/signedin/page.tsx b/apps/login/src/app/(login)/signedin/page.tsx
index cb2efae754..4fbaf9b937 100644
--- a/apps/login/src/app/(login)/signedin/page.tsx
+++ b/apps/login/src/app/(login)/signedin/page.tsx
@@ -1,6 +1,6 @@
+import { Alert, AlertType } from "@/components/alert";
 import { Button, ButtonVariants } from "@/components/button";
 import { DynamicTheme } from "@/components/dynamic-theme";
-import { SelfServiceMenu } from "@/components/self-service-menu";
 import { UserAvatar } from "@/components/user-avatar";
 import {
   getMostRecentCookieWithLoginname,
@@ -118,7 +118,6 @@ export default async function Page(props: { searchParams: Promise<any> }) {
   const { serviceUrl } = getServiceUrlFromHeaders(_headers);
 
   const { loginName, requestId, organization, sessionId } = searchParams;
-  // const sessionFactors = await loadSession(serviceUrl, loginName, requestId);
 
   const sessionFactors = sessionId
     ? await loadSessionById(serviceUrl, sessionId, organization)
@@ -148,6 +147,13 @@ export default async function Page(props: { searchParams: Promise<any> }) {
         </h1>
         <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
           loginName={loginName ?? sessionFactors?.factors?.user?.loginName}
           displayName={sessionFactors?.factors?.user?.displayName}
@@ -155,9 +161,9 @@ export default async function Page(props: { searchParams: Promise<any> }) {
           searchParams={searchParams}
         />
 
-        {sessionFactors?.id && (
+        {/* {sessionFactors?.id && (
           <SelfServiceMenu sessionId={sessionFactors?.id} />
-        )}
+        )} */}
 
         {loginSettings?.defaultRedirectUri && (
           <div className="mt-8 flex w-full flex-row items-center">
diff --git a/apps/login/src/lib/device.ts b/apps/login/src/lib/device.ts
index cc42c6cafa..36074803b9 100644
--- a/apps/login/src/lib/device.ts
+++ b/apps/login/src/lib/device.ts
@@ -101,6 +101,8 @@ export async function loginWithDeviceAndSession({
 
           const signedinUrl = constructUrl(request, "/signedin");
 
+          signedinUrl.searchParams.set("requestId", `device_${deviceRequest}`);
+
           if (selectedSession.factors?.user?.loginName) {
             signedinUrl.searchParams.set(
               "loginName",