401 error

Author: codemist

src/app/api/v1/admin/notifications/[notificationId]/route.ts

@@ -20,19 +20,18 @@ export async function GET(
   const params = await props.params;
   const session = await getServerSession();
 
-  if (isAdmin(session?.user?.email || "")) {
-    // Signed in
-    const notificationId = params.notificationId;
-    try {
-      const notificationItem =
-        await getNotificationByNotificationId(notificationId);
-      return NextResponse.json(notificationItem);
-    } catch (e) {
-      logger.error(e);
-      return NextResponse.json({ success: false }, { status: 500 });
-    }
-  } else {
-    return NextResponse.json({ success: false }, { status: 401 });
+  if (!isAdmin(session?.user?.email || "")) {
+    return NextResponse.json({ error: "Not an admin user" }, { status: 401 });
+  }
+
+  const notificationId = params.notificationId;
+  try {
+    const notificationItem =
+      await getNotificationByNotificationId(notificationId);
+    return NextResponse.json(notificationItem);
+  } catch (e) {
+    logger.error(e);
+    return NextResponse.json({ success: false }, { status: 500 });
   }
 }
 
@@ -44,18 +43,17 @@ export async function DELETE(
 ) {
   const params = await props.params;
   const session = await getServerSession();
-  if (isAdmin(session?.user?.email || "")) {
-    // Signed in
-    const notificationId = params.notificationId;
-    try {
-      const notificationItem = await deleteNotification(notificationId);
-      return NextResponse.json(notificationItem);
-    } catch (e) {
-      logger.error(e);
-      return NextResponse.json({ success: false }, { status: 500 });
-    }
-  } else {
-    return NextResponse.json({ success: false }, { status: 401 });
+  if (!isAdmin(session?.user?.email || "")) {
+    return NextResponse.json({ error: "Not an admin user" }, { status: 401 });
+  }
+
+  const notificationId = params.notificationId;
+  try {
+    const notificationItem = await deleteNotification(notificationId);
+    return NextResponse.json(notificationItem);
+  } catch (e) {
+    logger.error(e);
+    return NextResponse.json({ success: false }, { status: 500 });
   }
 }
 
@@ -66,24 +64,22 @@ export async function PUT(
   const params = await props.params;
   const { notificationId } = params;
   const session = await getServerSession();
+  if (!isAdmin(session?.user?.email || "")) {
+    return NextResponse.json({ error: "Not an admin user" }, { status: 401 });
+  }
+  try {
+    const updatedData: NotificationRow = await req.json();
+    const updatedNotification = await updateNotification(
+      notificationId,
+      updatedData,
+    );
 
-  if (isAdmin(session?.user?.email || "")) {
-    try {
-      const updatedData: NotificationRow = await req.json();
-      const updatedNotification = await updateNotification(
-        notificationId,
-        updatedData,
-      );
-
-      return NextResponse.json(updatedNotification, { status: 200 });
-    } catch (error) {
-      console.error("Error updating notification:", error);
-      return NextResponse.json(
-        { error: "Internal Server Error" },
-        { status: 500 },
-      );
-    }
-  } else {
-    return NextResponse.json({ success: false }, { status: 401 });
+    return NextResponse.json(updatedNotification, { status: 200 });
+  } catch (error) {
+    console.error("Error updating notification:", error);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 },
+    );
   }
 }

src/app/api/v1/admin/notifications/route.ts

@@ -8,7 +8,6 @@ import createDbConnection from "../../../../../db/connect";
 import { getAllNotifications } from "../../../../../db/tables/notifications";
 import { getServerSession } from "../../../../functions/server/getServerSession";
 import { isAdmin } from "../../../utils/auth";
-import { logger } from "../../../../functions/server/logging";
 
 const knex = createDbConnection();
 
@@ -17,7 +16,7 @@ export async function GET() {
   console.log("session from default route: ", session);
 
   if (!isAdmin(session?.user?.email || "")) {
-    logger.error("Not an admin user");
+    return NextResponse.json({ error: "Not an admin user" }, { status: 401 });
   }
 
   try {
@@ -34,28 +33,30 @@ export async function GET() {
 
 export async function POST(req: NextRequest) {
   const session = await getServerSession();
-  if (isAdmin(session?.user?.email || "")) {
-    try {
-      const newNotification: NotificationRow = await req.json();
-
-      const [addedNotification] = await knex("notifications")
-        .insert(newNotification)
-        .returning("*");
-
-      if (!addedNotification) {
-        return NextResponse.json(
-          { error: "Failed to insert notification" },
-          { status: 400 },
-        );
-      }
-
-      return NextResponse.json(addedNotification, { status: 201 });
-    } catch (error) {
-      console.error("Error adding notification:", error);
+  if (!isAdmin(session?.user?.email || "")) {
+    return NextResponse.json({ error: "Not an admin user" }, { status: 401 });
+  }
+
+  try {
+    const newNotification: NotificationRow = await req.json();
+
+    const [addedNotification] = await knex("notifications")
+      .insert(newNotification)
+      .returning("*");
+
+    if (!addedNotification) {
       return NextResponse.json(
-        { error: "Internal Server Error" },
-        { status: 500 },
+        { error: "Failed to insert notification" },
+        { status: 400 },
       );
     }
+
+    return NextResponse.json(addedNotification, { status: 201 });
+  } catch (error) {
+    console.error("Error adding notification:", error);
+    return NextResponse.json(
+      { error: "Internal Server Error" },
+      { status: 500 },
+    );
   }
 }