Updates

server/api/members/directory.get.js

@@ -1,23 +1,9 @@
-import jwt from "jsonwebtoken";
 import Member from "../../models/member.js";
 import Tag from "../../models/tag.js";
-import { connectDB } from "../../utils/mongoose.js";
+import { requireAuth } from "../../utils/auth.js";
 
 export default defineEventHandler(async (event) => {
-  await connectDB();
-
-  // Check if user is authenticated
-  const token = getCookie(event, "auth-token");
-  let isAuthenticated = false;
-
-  if (token) {
-    try {
-      jwt.verify(token, useRuntimeConfig().jwtSecret);
-      isAuthenticated = true;
-    } catch (err) {
-      isAuthenticated = false;
-    }
-  }
+  await requireAuth(event);
 
   const query = getQuery(event);
   const search = query.search || "";
@@ -56,42 +42,28 @@ export default defineEventHandler(async (event) => {
   try {
     const members = await Member.find(dbQuery)
       .select(
-        "name pronouns timeZone avatar studio bio location socialLinks privacy circle craftTags board createdAt",
+        "name pronouns timeZone avatar studio bio location socialLinks circle craftTags board createdAt",
       )
       .sort({ createdAt: -1 })
       .lean();
 
-    const filteredMembers = members.map((member) => {
-      const privacy = member.privacy || {};
-      const filtered = {
-        _id: member._id,
-        name: member.name,
-        circle: member.circle,
-        createdAt: member.createdAt,
-      };
-
-      const isVisible = (field) => {
-        const privacySetting = privacy[field] || "members";
-        if (privacySetting === "public") return true;
-        if (privacySetting === "members" && isAuthenticated) return true;
-        return false;
-      };
-
-      if (isVisible("avatar")) filtered.avatar = member.avatar;
-      if (isVisible("pronouns")) filtered.pronouns = member.pronouns;
-      if (isVisible("timeZone")) filtered.timeZone = member.timeZone;
-      if (isVisible("studio")) filtered.studio = member.studio;
-      if (isVisible("bio")) filtered.bio = member.bio;
-      if (isVisible("location")) filtered.location = member.location;
-      if (isVisible("socialLinks")) filtered.socialLinks = member.socialLinks;
-      if (isVisible("craftTags")) filtered.craftTags = member.craftTags;
-
-      filtered.board = {
+    const filteredMembers = members.map((member) => ({
+      _id: member._id,
+      name: member.name,
+      circle: member.circle,
+      createdAt: member.createdAt,
+      avatar: member.avatar,
+      pronouns: member.pronouns,
+      timeZone: member.timeZone,
+      studio: member.studio,
+      bio: member.bio,
+      location: member.location,
+      socialLinks: member.socialLinks,
+      craftTags: member.craftTags,
+      board: {
         slackHandle: member.board?.slackHandle,
-      };
-
-      return filtered;
-    });
+      },
+    }));
 
     const [craftTags, cooperativeTags] = await Promise.all([
       Tag.find({ pool: "craft", active: true }).sort({ label: 1 }).lean(),
@@ -110,6 +82,7 @@ export default defineEventHandler(async (event) => {
       },
     };
   } catch (error) {
+    if (error.statusCode) throw error;
     console.error("Directory fetch error:", error);
     throw createError({
       statusCode: 500,