More alarm testing

2 files changed, 5 insertions, 6 deletions

diff --git a/src/api/middlewares/authMiddleware.js b/src/api/middlewares/authMiddleware.js

index d67c567..b91449f 100644
--- a/src/api/middlewares/authMiddleware.js
+++ b/src/api/middlewares/authMiddleware.js
@@ -36,11 +36,13 @@ export async function useAuthentication(req, res, next) {
     req.user = await getUserById(auth.sub);
     logAuth('User data:', req.user);
 
+    req.device = req.user.devices.find(device => device.id === auth.deviceId);
+
     next();
 }
 
 export async function requireAuth(req, res, next) {
-    if (!req.auth) {
+    if (!req.auth || !req.user || !req.device) {
         logAuth('Unauthorized request to', req.path);
         res.status(401).send(
             new SafeNSoundError({
diff --git a/src/api/routes/alarmRoutes.js b/src/api/routes/alarmRoutes.js

index 939ca97..23b79c1 100644
--- a/src/api/routes/alarmRoutes.js
+++ b/src/api/routes/alarmRoutes.js
@@ -46,14 +46,11 @@ export const alarmListRoute = {
             description: 'Get a list of all alarms for monitored users',
             async method(req, res) {
                 console.log(req.user.monitoredUsers);
-                const alarms = [];
+                const alarms = {};
                 for (const userId of req.user.monitoredUsers) {
                     const user = await getUserById(userId);
                     if (user.alarm) {
-                        alarms.push({
-                            user: userId,
-                            alarm: user.alarm
-                        });
+                        alarms[userId] = user.alarm;
                     }
                 }
                 res.send(alarms);