FINISHED

src/pages/api/auth/login.ts

@@ -1,33 +1,37 @@
-import type { APIRoute } from 'astro';
-import { db } from '../../../db';
-import { users } from '../../../db/schema';
-import { verifyPassword, createSession } from '../../../lib/auth';
-import { eq } from 'drizzle-orm';
+import type { APIRoute } from "astro";
+import { db } from "../../../db";
+import { users } from "../../../db/schema";
+import { verifyPassword, createSession } from "../../../lib/auth";
+import { eq } from "drizzle-orm";
 
 export const POST: APIRoute = async ({ request, cookies, redirect }) => {
   const formData = await request.formData();
-  const email = formData.get('email')?.toString();
-  const password = formData.get('password')?.toString();
+  const email = formData.get("email")?.toString();
+  const password = formData.get("password")?.toString();
 
   if (!email || !password) {
-    return new Response('Missing fields', { status: 400 });
+    return redirect("/login?error=missing_fields");
   }
 
-  const user = await db.select().from(users).where(eq(users.email, email)).get();
+  const user = await db
+    .select()
+    .from(users)
+    .where(eq(users.email, email))
+    .get();
 
   if (!user || !(await verifyPassword(password, user.passwordHash))) {
-    return new Response('Invalid email or password', { status: 400 });
+    return redirect("/login?error=invalid_credentials");
   }
 
   const { sessionId, expiresAt } = await createSession(user.id);
 
-  cookies.set('session_id', sessionId, {
-    path: '/',
+  cookies.set("session_id", sessionId, {
+    path: "/",
     httpOnly: true,
     secure: import.meta.env.PROD,
-    sameSite: 'lax',
+    sameSite: "lax",
     expires: expiresAt,
   });
 
-  return redirect('/dashboard');
+  return redirect("/dashboard");
 };

src/pages/api/auth/signup.ts

@@ -1,39 +1,49 @@
-import type { APIRoute } from 'astro';
-import { db } from '../../../db';
-import { users, organizations, members, siteSettings } from '../../../db/schema';
-import { hashPassword, createSession } from '../../../lib/auth';
-import { eq, count, sql } from 'drizzle-orm';
-import { nanoid } from 'nanoid';
+import type { APIRoute } from "astro";
+import { db } from "../../../db";
+import {
+  users,
+  organizations,
+  members,
+  siteSettings,
+} from "../../../db/schema";
+import { hashPassword, createSession } from "../../../lib/auth";
+import { eq, count, sql } from "drizzle-orm";
+import { nanoid } from "nanoid";
 
 export const POST: APIRoute = async ({ request, cookies, redirect }) => {
   const userCountResult = await db.select({ count: count() }).from(users).get();
   const isFirstUser = userCountResult ? userCountResult.count === 0 : true;
 
   if (!isFirstUser) {
-    const registrationSetting = await db.select()
+    const registrationSetting = await db
+      .select()
       .from(siteSettings)
-      .where(eq(siteSettings.key, 'registration_enabled'))
+      .where(eq(siteSettings.key, "registration_enabled"))
       .get();
 
-    const registrationEnabled = registrationSetting?.value === 'true';
-    
+    const registrationEnabled = registrationSetting?.value === "true";
+
     if (!registrationEnabled) {
-      return new Response('Registration is currently disabled', { status: 403 });
+      return redirect("/signup?error=registration_disabled");
     }
   }
 
   const formData = await request.formData();
-  const name = formData.get('name')?.toString();
-  const email = formData.get('email')?.toString();
-  const password = formData.get('password')?.toString();
+  const name = formData.get("name")?.toString();
+  const email = formData.get("email")?.toString();
+  const password = formData.get("password")?.toString();
 
   if (!name || !email || !password) {
-    return new Response('Missing fields', { status: 400 });
+    return redirect("/signup?error=missing_fields");
   }
 
-  const existingUser = await db.select().from(users).where(eq(users.email, email)).get();
+  const existingUser = await db
+    .select()
+    .from(users)
+    .where(eq(users.email, email))
+    .get();
   if (existingUser) {
-    return new Response('User already exists', { status: 400 });
+    return redirect("/signup?error=user_exists");
   }
 
   const passwordHash = await hashPassword(password);
@@ -56,18 +66,18 @@ export const POST: APIRoute = async ({ request, cookies, redirect }) => {
   await db.insert(members).values({
     userId,
     organizationId: orgId,
-    role: 'owner',
+    role: "owner",
   });
 
   const { sessionId, expiresAt } = await createSession(userId);
 
-  cookies.set('session_id', sessionId, {
-    path: '/',
+  cookies.set("session_id", sessionId, {
+    path: "/",
     httpOnly: true,
     secure: import.meta.env.PROD,
-    sameSite: 'lax',
+    sameSite: "lax",
     expires: expiresAt,
   });
 
-  return redirect('/dashboard');
+  return redirect("/dashboard");
 };