Please...

src/pages/api/auth/login.ts

@@ -1,7 +1,7 @@
 import type { APIRoute } from "astro";
 import { db } from "../../../db";
 import { users } from "../../../db/schema";
-import { verifyPassword, createSession } from "../../../lib/auth";
+import { verifyPassword, setAuthCookie } from "../../../lib/auth";
 import { eq } from "drizzle-orm";
 
 export const POST: APIRoute = async ({ request, cookies, redirect }) => {
@@ -23,15 +23,7 @@ export const POST: APIRoute = async ({ request, cookies, redirect }) => {
     return redirect("/login?error=invalid_credentials");
   }
 
-  const { sessionId, expiresAt } = await createSession(user.id);
-
-  cookies.set("session_id", sessionId, {
-    path: "/",
-    httpOnly: true,
-    secure: import.meta.env.PROD,
-    sameSite: "lax",
-    expires: expiresAt,
-  });
+  setAuthCookie(cookies, user.id);
 
   return redirect("/dashboard");
 };

src/pages/api/auth/logout.ts

@@ -1,11 +1,7 @@
 import type { APIRoute } from 'astro';
-import { invalidateSession } from '../../../lib/auth';
+import { clearAuthCookie } from '../../../lib/auth';
 
 export const POST: APIRoute = async ({ cookies }) => {
-  const sessionId = cookies.get('session_id')?.value;
-  if (sessionId) {
-    await invalidateSession(sessionId);
-    cookies.delete('session_id', { path: '/' });
-  }
+  clearAuthCookie(cookies);
   return new Response(null, { status: 200 });
 };

src/pages/api/auth/passkey/login/finish.ts

@@ -3,7 +3,7 @@ import { verifyAuthenticationResponse } from "@simplewebauthn/server";
 import { db } from "../../../../../db";
 import { users, passkeys, passkeyChallenges } from "../../../../../db/schema";
 import { eq, and, gt } from "drizzle-orm";
-import { createSession } from "../../../../../lib/auth";
+import { setAuthCookie } from "../../../../../lib/auth";
 
 export const POST: APIRoute = async ({ request, cookies }) => {
   const body = await request.json();
@@ -82,15 +82,7 @@ export const POST: APIRoute = async ({ request, cookies }) => {
       })
       .where(eq(passkeys.id, passkey.id));
 
-    const { sessionId, expiresAt } = await createSession(user.id);
-
-    cookies.set("session_id", sessionId, {
-      path: "/",
-      httpOnly: true,
-      secure: import.meta.env.PROD,
-      sameSite: "lax",
-      expires: expiresAt,
-    });
+    setAuthCookie(cookies, user.id);
 
     await db
       .delete(passkeyChallenges)

src/pages/api/auth/signup.ts

@@ -6,7 +6,7 @@ import {
   members,
   siteSettings,
 } from "../../../db/schema";
-import { hashPassword, createSession } from "../../../lib/auth";
+import { hashPassword, setAuthCookie } from "../../../lib/auth";
 import { isValidEmail, MAX_LENGTHS } from "../../../lib/validation";
 import { eq, count, sql } from "drizzle-orm";
 import { nanoid } from "nanoid";
@@ -86,15 +86,7 @@ export const POST: APIRoute = async ({ request, cookies, redirect }) => {
     role: "owner",
   });
 
-  const { sessionId, expiresAt } = await createSession(userId);
-
-  cookies.set("session_id", sessionId, {
-    path: "/",
-    httpOnly: true,
-    secure: import.meta.env.PROD,
-    sameSite: "lax",
-    expires: expiresAt,
-  });
+  setAuthCookie(cookies, userId);
 
   return redirect("/dashboard");
 };