refactor: status headers

risv1 · May 1, 2024 · 6861df9 · 6861df9
1 parent b08b7c3
commit 6861df9
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 14 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/server/api/login.post.ts b/server/api/login.post.ts
@@ -12,9 +12,9 @@ export default defineEventHandler(async (event) => {
   try {
     const body = await readBody(event);
     if (!body.email || !body.password) {
+      setResponseStatus(event, 400);
       return {
         message: "Please provide all required fields.",
-        statusCode: 400,
       };
     }
 
@@ -23,25 +23,25 @@ export default defineEventHandler(async (event) => {
       .from(users)
       .where(eq(users.email, body.email));
     if (!user) {
+      setResponseStatus(event, 404);
       return {
         message: "User not found.",
-        statusCode: 400,
       };
     }
 
     const isValid = await bcrypt.compare(body.password, user.password);
     if (!isValid) {
+      setResponseStatus(event, 400);
       return {
         message: "Invalid password.",
-        statusCode: 400,
       };
     }
 
     const token = jwt.sign(user, process.env.JWT_SECRET!, { expiresIn: "1h" });
     if (!token) {
+      setResponseStatus(event, 500);
       return {
         message: "Token not created.",
-        statusCode: 400,
       };
     }
 
@@ -50,9 +50,9 @@ export default defineEventHandler(async (event) => {
     return { message: "User logged in successfully.", user: user };
   } catch (e: any) {
     console.error("Error: ", e);
+    setResponseStatus(event, 500);
     return {
       message: "Error: " + e,
-      statusCode: 500,
     };
   }
 });
diff --git a/server/api/logout.post.ts b/server/api/logout.post.ts
@@ -6,16 +6,16 @@ export default defineEventHandler(async (event) => {
     const user = jwt.verify(token, "secret");
     if (user) {
       setCookie(event, "token", "", { expires: new Date(0) });
+      setResponseStatus(event, 200);
       return {
-        statusCode: 200,
         message: "Logged out",
       };
     }
   } catch (e) {
     console.error(e);
+    setResponseStatus(event, 500);
     return {
       message: "Error: " + e,
-      statusCode: 500,
     };
   }
 });
diff --git a/server/api/register.post.ts b/server/api/register.post.ts
@@ -3,6 +3,7 @@ import bcrypt from "bcrypt";
 import { users } from "~/database/schema";
 import { db } from "~/database/db";
 import { User } from "~/models/users";
+import { set } from "zod";
 
 async function hashPassword(password: string) {
   return await bcrypt.hash(password, 10);
@@ -12,9 +13,9 @@ export default defineEventHandler(async (event) => {
   try {
     const body = await readBody(event);
     if (!body.name || !body.email || !body.password) {
+      setResponseStatus(event, 400);
       return {
         message: "Please provide all required fields.",
-        statusCode: 400,
       };
     }
 
@@ -44,15 +45,16 @@ export default defineEventHandler(async (event) => {
 
     if (!user) {
       console.log("User not created");
-      return { message: "User not created.", statusCode: 400 };
+      setResponseStatus(event, 500);
+      return { message: "User not created."};
     }
 
     return { message: "User created successfully.", user: user };
   } catch (e: any) {
     console.error("Error: ", e);
+    setResponseStatus(event, 500);
     return {
       message: "Error: " + e,
-      statusCode: 500,
     };
   }
 });
diff --git a/server/api/session.get.ts b/server/api/session.get.ts
@@ -12,22 +12,26 @@ export default defineEventHandler(async (event) => {
   try {
     const token = getCookie(event, "token") as string;
     if (!token) {
-      return { status: 401, body: "Unauthorized" };
+      setResponseStatus(event, 401);
+      return { body: "Unauthorized" };
     }
 
     const data = jwt.verify(token, process.env.JWT_SECRET!) as UserPayload;
     if (!data) {
-      return { status: 401, body: "Unauthorized" };
+      setResponseStatus(event, 401);
+      return { body: "Unauthorized" };
     }
 
+    setResponseStatus(event, 200);
     return {
-      status: 200,
       user: {
         name: data.name,
         email: data.email,
       },
     };
   } catch (e) {
-    return { status: 500, message: e };
+    console.error("Error: ", e);
+    setResponseStatus(event, 500);
+    return { message: e };
   }
 });