From 1852017a11c8e21f82943dd865fa99ed5accd79b Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 7 May 2025 13:40:30 +0200
Subject: [PATCH 1/4] i18n ns

---
 apps/login/src/app/(login)/device/consent/page.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/login/src/app/(login)/device/consent/page.tsx b/apps/login/src/app/(login)/device/consent/page.tsx
index 8cc9b4556f..c011da5730 100644
--- a/apps/login/src/app/(login)/device/consent/page.tsx
+++ b/apps/login/src/app/(login)/device/consent/page.tsx
@@ -15,7 +15,7 @@ export default async function Page(props: {
 }) {
   const searchParams = await props.searchParams;
   const locale = getLocale();
-  const t = await getTranslations({ locale, namespace: "device" });
+  const t = await getTranslations({ locale });
 
   const userCode = searchParams?.user_code;
   const requestId = searchParams?.requestId;
@@ -66,10 +66,12 @@ export default async function Page(props: {
     <DynamicTheme branding={branding}>
       <div className="flex flex-col items-center space-y-4">
         <h1>
-          {t("request.title", { appName: deviceAuthorizationRequest?.appName })}
+          {t("device.request.title", {
+            appName: deviceAuthorizationRequest?.appName,
+          })}
         </h1>
 
-        <p className="ztdl-p">{t("request.description")}</p>
+        <p className="ztdl-p">{t("device.request.description")}</p>
 
         <ConsentScreen
           deviceAuthorizationRequestId={deviceAuthorizationRequest?.id}

From ba4e8529f956f664556190865448d09437c7a95f Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 7 May 2025 13:54:21 +0200
Subject: [PATCH 2/4] render appname

---
 apps/login/src/app/(login)/device/consent/page.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/login/src/app/(login)/device/consent/page.tsx b/apps/login/src/app/(login)/device/consent/page.tsx
index c011da5730..75676cd7ff 100644
--- a/apps/login/src/app/(login)/device/consent/page.tsx
+++ b/apps/login/src/app/(login)/device/consent/page.tsx
@@ -71,7 +71,11 @@ export default async function Page(props: {
           })}
         </h1>
 
-        <p className="ztdl-p">{t("device.request.description")}</p>
+        <p className="ztdl-p">
+          {t("device.request.description", {
+            appName: deviceAuthorizationRequest?.appName,
+          })}
+        </p>
 
         <ConsentScreen
           deviceAuthorizationRequestId={deviceAuthorizationRequest?.id}

From 602b8ad2f1fe788bbc27c20ebd9ba663382cce72 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 7 May 2025 14:00:17 +0200
Subject: [PATCH 3/4] autocomplete user code

---
 apps/login/src/app/(login)/device/page.tsx | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/login/src/app/(login)/device/page.tsx b/apps/login/src/app/(login)/device/page.tsx
index 4353ef5be4..1b262c41fc 100644
--- a/apps/login/src/app/(login)/device/page.tsx
+++ b/apps/login/src/app/(login)/device/page.tsx
@@ -37,13 +37,9 @@ export default async function Page(props: {
   return (
     <DynamicTheme branding={branding}>
       <div className="flex flex-col items-center space-y-4">
-        {!userCode && (
-          <>
-            <h1>{t("usercode.title")}</h1>
-            <p className="ztdl-p">{t("usercode.description")}</p>
-            <DeviceCodeForm userCode={userCode}></DeviceCodeForm>
-          </>
-        )}
+        <h1>{t("usercode.title")}</h1>
+        <p className="ztdl-p">{t("usercode.description")}</p>
+        <DeviceCodeForm userCode={userCode}></DeviceCodeForm>
       </div>
     </DynamicTheme>
   );

From 9df31eb9d6abc6ab4664a086180adf956c8b4174 Mon Sep 17 00:00:00 2001
From: Max Peintner <peintnerm@gmail.com>
Date: Wed, 7 May 2025 14:03:18 +0200
Subject: [PATCH 4/4] fallback to openid scope

---
 apps/login/src/components/consent.tsx | 39 +++++++++++++++------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/apps/login/src/components/consent.tsx b/apps/login/src/components/consent.tsx
index 30d5b4e407..d3d30b3113 100644
--- a/apps/login/src/components/consent.tsx
+++ b/apps/login/src/components/consent.tsx
@@ -43,28 +43,33 @@ export function ConsentScreen({
     }
   }
 
+  const scopes = scope?.filter((s) => !!s);
+
   return (
     <div className="pt-4 w-full flex flex-col items-center space-y-4">
       <ul className="list-disc space-y-2 w-full">
-        {scope
-          ?.filter((s) => !!s)
-          .map((s) => {
-            const translationKey = `device.scope.${s}`;
-            const description = t(translationKey, null);
+        {scopes?.length === 0 && (
+          <span className="w-full text-sm flex flex-row items-center bg-background-light-400 dark:bg-background-dark-400  border border-divider-light py-2 px-4 rounded-md transition-all">
+            {t("device.scope.openid")}
+          </span>
+        )}
+        {scopes?.map((s) => {
+          const translationKey = `device.scope.${s}`;
+          const description = t(translationKey, null);
 
-            // Check if the key itself is returned and provide a fallback
-            const resolvedDescription =
-              description === translationKey ? "" : description;
+          // Check if the key itself is returned and provide a fallback
+          const resolvedDescription =
+            description === translationKey ? "" : description;
 
-            return (
-              <li
-                key={s}
-                className="w-full text-sm flex flex-row items-center bg-background-light-400 dark:bg-background-dark-400  border border-divider-light py-2 px-4 rounded-md transition-all"
-              >
-                <span>{resolvedDescription}</span>
-              </li>
-            );
-          })}
+          return (
+            <li
+              key={s}
+              className="w-full text-sm flex flex-row items-center bg-background-light-400 dark:bg-background-dark-400  border border-divider-light py-2 px-4 rounded-md transition-all"
+            >
+              <span>{resolvedDescription}</span>
+            </li>
+          );
+        })}
       </ul>
 
       <p className="ztdl-p text-xs text-left">