cleaned up indirection endpoint

ReflectionsProjections · Sep 17, 2024 · d048119 · d048119
1 parent ff63161
commit d048119
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 49 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -99,6 +99,7 @@ export const DeviceRedirects: Record<string, string> = {
     dev: `${API_BASE}/auth/dev/`,
     mobile: "reflectionsprojections://--/Login",
     admin: "https://admin.reflectionsprojections.org/auth/",
+    // admin: "http://localhost:5173/auth/",
 };
 
 export const ses = new AWS.SES({

diff --git a/src/services/attendee/attendee-router.ts b/src/services/attendee/attendee-router.ts
@@ -251,34 +251,18 @@ attendeeRouter.get(
     }
 );
 
-// Get attendee merch info via email
 attendeeRouter.get(
-    "/email/:EMAIL",
+    "/emails",
     RoleChecker([Role.Enum.STAFF, Role.Enum.ADMIN]),
     async (req, res, next) => {
         try {
-            const email = req.params.EMAIL;
+            const registrations = await Database.ATTENDEE.find();
+            const attendeeData = registrations.map((registration) => ({
+                email: registration.email,
+                userId: registration.userId
+            }));
 
-            const user = await Database.ATTENDEE.findOne({ email });
-
-            if (!user) {
-                return res
-                    .status(StatusCodes.NOT_FOUND)
-                    .json({ error: "UserNotFound" });
-            }
-
-            const merchInfo = {
-                attendeeName: user.name,
-                attendeePoints: user.points,
-                hasButton: user.hasRedeemedMerch!["Button"],
-                hasCap: user.hasRedeemedMerch!["Cap"],
-                hasTote: user.hasRedeemedMerch!["Tote"],
-                eligibleButton: user.isEligibleMerch!["Button"],
-                eligibleCap: user.isEligibleMerch!["Cap"],
-                eligibleTote: user.isEligibleMerch!["Tote"],
-            };
-
-            return res.status(StatusCodes.OK).json(merchInfo);
+            return res.status(StatusCodes.OK).json(attendeeData);
         } catch (error) {
             next(error);
         }
@@ -294,15 +278,8 @@ attendeeRouter.post(
             const userId = payload.userId;
             const merchItem = req.params.ITEM;
 
-            let user;
-
-            // Check if userId or email is provided and query the database accordingly
-            if (userId) {
-                user = await Database.ATTENDEE.findOne({ userId });
-            } else if (req.body.email) {
-                const email = req.body.email; // TODO: use a validator here?
-                user = await Database.ATTENDEE.findOne({ email });
-            }
+            // Check if the user exists in the database
+            const user = await Database.ATTENDEE.findOne({ userId });
 
             if (!user) {
                 return res

diff --git a/src/services/registration/registration-router.ts b/src/services/registration/registration-router.ts
@@ -52,23 +52,6 @@ registrationRouter.post("/save", RoleChecker([]), async (req, res, next) => {
     }
 });
 
-registrationRouter.get(
-    "/emails",
-    RoleChecker([Role.Enum.STAFF, Role.Enum.ADMIN]),
-    async (req, res, next) => {
-        try {
-            const registrations = await Database.REGISTRATION.find();
-            const attendeeEmails = registrations.map(
-                (registration) => registration.email
-            );
-
-            return res.status(StatusCodes.OK).json(attendeeEmails);
-        } catch (error) {
-            next(error);
-        }
-    }
-);
-
 registrationRouter.post("/submit", RoleChecker([]), async (req, res, next) => {
     try {
         const payload = res.locals.payload;