From 1651faae1456af8c3580a0fa009adafdb2056906 Mon Sep 17 00:00:00 2001
From: Henry <30578846+hjball@users.noreply.github.com>
Date: Thu, 20 Nov 2025 00:01:23 +0000
Subject: [PATCH] fix(cloud): reenable magic login on cloud and extend session
 duration (#248)

* fix(cloud): reenable magic login

* feat: extend session duration
---
 apps/web/src/components/AuthForm.tsx | 36 ++++++++++++++++------------
 packages/auth/src/auth.ts            |  5 ++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/apps/web/src/components/AuthForm.tsx b/apps/web/src/components/AuthForm.tsx
index 784c722c..978c2a00 100644
--- a/apps/web/src/components/AuthForm.tsx
+++ b/apps/web/src/components/AuthForm.tsx
@@ -303,6 +303,10 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
 
   const password = watch("password");
 
+  const isMagicLinkAvailable = useMemo(() => {
+    return isCloudEnv || (isEmailSendingEnabled && !isSignUp);
+  }, [isCloudEnv, isEmailSendingEnabled, isSignUp]);
+
   // Determine if we should operate in magic link mode for current form state (login only)
   const isMagicLinkMode = useMemo(() => {
     // Magic link only viable when email sending enabled AND not sign up.
@@ -390,7 +394,7 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
               )}
             </div>
           )}
-          {isCredentialsEnabled && (
+          {(isCredentialsEnabled || isMagicLinkAvailable) && (
             <>
               <div>
                 <Input
@@ -404,26 +408,28 @@ export function Auth({ setIsMagicLinkSent, isSignUp }: AuthProps) {
                 )}
               </div>
 
-              <div>
-                <Input
-                  type="password"
-                  {...register("password", { required: true })}
-                  placeholder={t`Enter your password`}
-                />
-                {errors.password && (
-                  <p className="mt-2 text-xs text-red-400">
-                    {errors.password.message ??
-                      t`Please enter a valid password`}
-                  </p>
-                )}
-              </div>
+              {isCredentialsEnabled && (
+                <div>
+                  <Input
+                    type="password"
+                    {...register("password", { required: true })}
+                    placeholder={t`Enter your password`}
+                  />
+                  {errors.password && (
+                    <p className="mt-2 text-xs text-red-400">
+                      {errors.password.message ??
+                        t`Please enter a valid password`}
+                    </p>
+                  )}
+                </div>
+              )}
             </>
           )}
           {loginError && (
             <p className="mt-2 text-xs text-red-400">{loginError}</p>
           )}
         </div>
-        {isCredentialsEnabled && (
+        {(isCredentialsEnabled || isMagicLinkAvailable) && (
           <div className="mt-[1.5rem] flex items-center gap-4">
             <Button
               isLoading={isLoginWithEmailPending}
diff --git a/packages/auth/src/auth.ts b/packages/auth/src/auth.ts
index 91dcaa57..32719b9e 100644
--- a/packages/auth/src/auth.ts
+++ b/packages/auth/src/auth.ts
@@ -129,6 +129,11 @@ export const initAuth = (db: dbClient) => {
         user: schema.users,
       },
     }),
+    session: {
+      expiresIn: 60 * 60 * 24 * 30, // 30 days
+      updateAge: 60 * 60 * 24 * 2, // Update session expiry every 48 hours if user is active
+      freshAge: 0,
+    },
     emailAndPassword: {
       enabled: env("NEXT_PUBLIC_ALLOW_CREDENTIALS")?.toLowerCase() === "true",
       disableSignUp: