add my-device and force login

src/app/auth/login/device/page.tsx

@@ -5,13 +5,32 @@ import { cache } from "react";
 
 export const dynamic = "force-dynamic";
 
-export default async function DeviceLoginPage() {
-    const getUser = cache(verifySession);
-    const user = await getUser();
+type Props = {
+    searchParams: Promise<{ code?: string }>;
+};
+
+export default async function DeviceLoginPage({ searchParams }: Props) {
+    const user = await verifySession({ forceLogin: true });
+
+    const params = await searchParams;
+    const code = params.code || "";
+
+    console.log("user", user);
 
     if (!user) {
-        redirect("/auth/login?redirect=/auth/login/device");
+        const redirectDestination = code
+            ? `/auth/login/device?code=${encodeURIComponent(code)}`
+            : "/auth/login/device";
+        redirect(`/auth/login?forceLogin=true&redirect=${encodeURIComponent(redirectDestination)}`);
     }
 
-    return <DeviceLoginForm userEmail={user?.email || ""} />;
+    const userName = user?.name || user?.username || "";
+
+    return (
+        <DeviceLoginForm
+            userEmail={user?.email || ""}
+            userName={userName}
+            initialCode={code}
+        />
+    );
 }

src/app/auth/login/page.tsx

@@ -25,12 +25,14 @@ export default async function Page(props: {
     const user = await getUser({ skipCheckVerifyEmail: true });
 
     const isInvite = searchParams?.redirect?.includes("/invite");
+    const forceLoginParam = searchParams?.forceLogin;
+    const forceLogin = forceLoginParam === "true";
 
     const env = pullEnv();
 
     const signUpDisabled = env.flags.disableSignupWithoutInvite;
 
-    if (user) {
+    if (user && !forceLogin) {
         redirect("/");
     }
 
@@ -96,7 +98,7 @@ export default async function Page(props: {
                 </div>
             )}
 
-            <DashboardLoginForm redirect={redirectUrl} idps={loginIdps} />
+            <DashboardLoginForm redirect={redirectUrl} idps={loginIdps} forceLogin={forceLogin} />
 
             {(!signUpDisabled || isInvite) && (
                 <p className="text-center text-muted-foreground mt-4">