Please...

src/middleware.ts

@@ -1,5 +1,5 @@
 import { defineMiddleware } from "astro/middleware";
-import { validateSession } from "./lib/auth";
+import { getUserFromToken } from "./lib/auth";
 import { validateApiToken } from "./lib/api-auth";
 
 const PUBLIC_ROUTES = ["/", "/login", "/signup"];
@@ -14,32 +14,20 @@ export const onRequest = defineMiddleware(async (context, next) => {
 
     if (result) {
       context.locals.user = result.user;
-      context.locals.session = null;
       context.locals.scopes = result.scopes;
       return next();
     }
   }
 
-  const sessionId = context.cookies.get("session_id")?.value;
+  const token = context.cookies.get("auth_token")?.value;
 
-  if (sessionId) {
-    const result = await validateSession(sessionId);
-
-    if (result) {
-      context.locals.user = result.user;
-      context.locals.session = result.session;
-      context.locals.scopes = null;
-    } else {
-      context.locals.user = null;
-      context.locals.session = null;
-      context.locals.scopes = null;
-      context.cookies.delete("session_id", { path: "/" });
-    }
+  if (token) {
+    const user = await getUserFromToken(token);
+    context.locals.user = user;
   } else {
     context.locals.user = null;
-    context.locals.session = null;
-    context.locals.scopes = null;
   }
+  context.locals.scopes = null;
 
   const isPublic =
     PUBLIC_ROUTES.includes(pathname) || pathname.startsWith("/api/");