diff --git a/apps/login/locales/en.json b/apps/login/locales/en.json
index 1b52353c87..c604615152 100644
--- a/apps/login/locales/en.json
+++ b/apps/login/locales/en.json
@@ -194,7 +194,7 @@
"submit": "Continue"
},
"request": {
- "title": "would like to connect:",
+ "title": "{appName} would like to connect:",
"description": "By clicking Allow, you allow this app and Zitadel to use your information in accordance with their respective terms of service and privacy policies. You can revoke this access at any time.",
"submit": "Allow"
},
diff --git a/apps/login/src/app/(login)/device/consent/page.tsx b/apps/login/src/app/(login)/device/consent/page.tsx
index 1c33d6c831..283d46d155 100644
--- a/apps/login/src/app/(login)/device/consent/page.tsx
+++ b/apps/login/src/app/(login)/device/consent/page.tsx
@@ -66,8 +66,10 @@ export default async function Page(props: {
appName={deviceAuthorizationRequest?.appName}
>
-
{t("usercode.title")}
-
{t("usercode.description")}
+
+ {t("request.title", { appName: deviceAuthorizationRequest?.appName })}
+
+
{
+ if (response?.session) {
+ return response.session;
+ }
+ });
+}
+
export default async function Page(props: { searchParams: Promise }) {
const searchParams = await props.searchParams;
const locale = getLocale();
@@ -96,12 +117,15 @@ export default async function Page(props: { searchParams: Promise }) {
const _headers = await headers();
const { serviceUrl } = getServiceUrlFromHeaders(_headers);
- const { loginName, requestId, organization } = searchParams;
+ const { loginName, requestId, organization, sessionId } = searchParams;
// const sessionFactors = await loadSession(serviceUrl, loginName, requestId);
const sessionFactors = sessionId
? await loadSessionById(serviceUrl, sessionId, organization)
- : await loadSessionByLoginname(serviceUrl, loginName, organization);
+ : await loadMostRecentSession({
+ serviceUrl,
+ sessionParams: { loginName, organization },
+ });
const branding = await getBrandingSettings({
serviceUrl,
diff --git a/apps/login/src/components/consent.tsx b/apps/login/src/components/consent.tsx
index 5bf3747f73..7422b657d6 100644
--- a/apps/login/src/components/consent.tsx
+++ b/apps/login/src/components/consent.tsx
@@ -12,7 +12,7 @@ export function ConsentScreen({
const t = useTranslations();
return (
-