🐛 Handle expired jwt

apps/web/src/auth/edge/with-auth.ts

@@ -5,6 +5,7 @@ import NextAuth from "next-auth";
 import { nextAuthConfig } from "@/next-auth.config";
 
 import {
+  deleteLegacyCookie,
   getLegacySession,
   migrateLegacyJWT,
 } from "../legacy/next-auth-cookie-migration";
@@ -24,6 +25,7 @@ export const withAuth = (
     }
 
     let isLegacySession = false;
+    let isExpiredLegacySession = false;
 
     if (!session) {
       try {
@@ -32,7 +34,7 @@ export const withAuth = (
           isLegacySession = true;
         }
       } catch (e) {
-        console.error(e);
+        isExpiredLegacySession = true;
       }
     }
 
@@ -54,6 +56,7 @@ export const withAuth = (
     const middlewareRes = await middleware(request);
 
     if (isLegacySession) {
+      console.warn("Found legacy session, migrating…");
       try {
         await migrateLegacyJWT(middlewareRes);
       } catch (e) {
@@ -61,6 +64,11 @@ export const withAuth = (
       }
     }
 
+    if (isExpiredLegacySession) {
+      console.warn("Found expired legacy session, deleting…");
+      deleteLegacyCookie(middlewareRes);
+    }
+
     return middlewareRes;
   };
 };

apps/web/src/auth/legacy/helpers/jwt.ts

@@ -9,15 +9,11 @@ export async function decodeLegacyJWT(token: string): Promise<JWT | null> {
     process.env.SECRET_PASSWORD,
     "",
   );
-  try {
+  const { payload } = await jwtDecrypt(token, encryptionSecret, {
-    const { payload } = await jwtDecrypt(token, encryptionSecret, {
+    clockTolerance: 15,
-      clockTolerance: 15,
+  });
-    });
+
-    return payload;
+  return payload;
-  } catch (e) {
-    console.error(e);
-    return null;
-  }
 }
 
 async function getDerivedEncryptionKey(

apps/web/src/auth/legacy/next-auth-cookie-migration.ts

@@ -46,7 +46,7 @@ async function getLegacyJWT() {
   return null;
 }
 
-function deleteLegacyCookie(res: NextResponse) {
+export function deleteLegacyCookie(res: NextResponse) {
   const cookieStore = cookies();
   const oldCookie = cookieStore.get(oldCookieName);
   if (oldCookie) {

apps/web/src/next-auth.ts

@@ -195,12 +195,20 @@ const {
 });
 
 const auth = cache(async () => {
-  const session = await originalAuth();
+  try {
-  if (session) {
+    const session = await originalAuth();
-    return session;
+    if (session) {
+      return session;
+    }
+  } catch (e) {
+    console.error("FAILED TO GET SESSION");
   }
 
-  return getLegacySession();
+  try {
+    return await getLegacySession();
+  } catch (e) {
+    console.error("FAILED TO GET LEGACY SESSION");
+  }
 });
 
 const requireUser = async () => {