Def 135

API/users.js

@@ -1,19 +1,16 @@
 const express = require("express")
 const router = express.Router()
 const { User, validateUser } = require("../models/user")
-const jwt = require('jsonwebtoken')
-    // const { server } = require('../server');
-    // const io = require('socket.io')(server);
-    // const auth = require("../middleware/auth");
-    // const admin = require("../middleware/admin");
+const auth = require("../middleware/auth");
+// const admin = require("../middleware/admin");
 
-router.get('/', async(req, res) => {
+router.get('/', auth, async(req, res) => {
     const users = await User.find().sort('lastName')
     res.status(200).send(users)
         //get all users
 })
 
-router.get('/:id', async(req, res) => {
+router.get('/:id', auth, async(req, res) => {
     const user = await User.findOne({ employeeId: req.params.id })
     if (!user) {
         return res.status(404).send({ message: 'employee with searched ID not found' })

server.js

@@ -6,10 +6,10 @@ const server = require('http').createServer(app);
 
 const logger = require("./middleware/logger");
 
-global.GLOBAL_TIMEZONE = "en-US" 
+global.GLOBAL_TIMEZONE = "en-US"
 
-require("./startup/db")().then(()=>{
-  socketSetUp(server);
+require("./startup/db")().then(() => {
+    socketSetUp(server);
 });
 // require("./startup/orderBundles");
 require("./startup/routes")(app);
@@ -19,27 +19,27 @@ require("./startup/config")();
 
 const port = process.env.PORT || config.get("app.port")
 
-server.listen(port, () =>{
-  logger.log("info", "server mode: " + process.env.NODE_ENV);
-  logger.log("info", "listening on port: " + port);
+server.listen(port, () => {
+    logger.log("info", "server mode: " + process.env.NODE_ENV);
+    logger.log("info", "listening on port: " + port);
 });
 
 module.exports = server;
 
-async function socketSetUp (server){
-  const stores = await getStores()
-  require("./socket/router").socketIO(server, stores);
+async function socketSetUp(server) {
+    const stores = await getStores()
+    require("./socket/router").socketIO(server, stores);
 }
 
 const getStores = () => {
-  return new Promise((resolve, rejecet)=>{
-      let storesObj = {}
-      require("./models/store").Store.find()
-      .then(stores=>{
-        stores.forEach(store=>{
-          storesObj[store.storeId] = {users: {}, manager: false}
-        });
-        resolve(storesObj)
-      });
-  })
+    return new Promise((resolve, reject) => {
+        let storesObj = {}
+        require("./models/store").Store.find()
+            .then(stores => {
+                stores.forEach(store => {
+                    storesObj[store.storeId] = { users: {}, manager: false }
+                });
+                resolve(storesObj)
+            });
+    })
 };

socket/endpoints/logIn.js

@@ -1,21 +1,21 @@
-module.exports = function (socket, user, users, rooms, spectators) {
-    
+module.exports = function(socket, user, users, rooms, spectators) {
+
     users[socket.id] = user.id;
 
-    switch(user.role){
+    switch (user.role) {
         case "manager":
 
-            if(storeExists(user.store) === undefined){
+            if (storeExists(user.store) === undefined) {
 
                 io.to(findUserSocket(user.id)).emit("error", "this store does not exist")
-                console.log(`Socket:`, user.id ,`${user.role} tried to join store-${user.store} undefined`)
-                
-            }else if(managerIsActive(user.store) === true){
-                
+                console.log(`Socket:`, user.id, `${user.role} tried to join store-${user.store} undefined`)
+
+            } else if (managerIsActive(user.store) === true) {
+
                 io.to(findUserSocket(user.id)).emit("error", "manager is already in this store");
-                console.log(`Socket:`, user.id , `${user.role} tried to join store-${user.store} with an active manager`);
+                console.log(`Socket:`, user.id, `${user.role} tried to join store-${user.store} with an active manager`);
 
-            }else if(managerIsActive(user.store) === false){
+            } else if (managerIsActive(user.store) === false) {
 
                 socket.join(user.store);
 
@@ -27,48 +27,47 @@ module.exports = function (socket, user, users, rooms, spectators) {
                 console.log(`Socket:`, user.id, `${user.role} connected to room store-${user.store}`);
             };
 
-        break;
+            break;
 
         case "driver":
-            if(storeExists(user.store) === undefined){
+            if (storeExists(user.store) === undefined) {
 
                 io.to(findUserSocket(user.id)).emit("error", "this store does not exist");
-                console.log(`Socket:`, user.id ,`${user.role} tried to join store-${user.store} undefined`);
+                console.log(`Socket:`, user.id, `${user.role} tried to join store-${user.store} undefined`);
+
+            } else if (managerIsActive(user.store) === false) {
 
-            }else if(managerIsActive(user.store) === false){
-
                 io.to(findUserSocket(user.id)).emit("error", "there is no manager in this store");
-                console.log(`Socket:`, user.id , `${user.role} tried to join store-${user.store} without an active manager`);
-                
-            }else if(managerIsActive(user.store) === true){
+                console.log(`Socket:`, user.id, `${user.role} tried to join store-${user.store} without an active manager`);
+
+            } else if (managerIsActive(user.store) === true) {
 
                 socket.join(user.store);
 
                 rooms[user.store].users[user.id] = user.role;
 
                 socket.to(user.store).broadcast.emit("current-users", rooms[user.store]);
-                
+
                 console.log(`Socket:`, user.id, `${user.role} connected to room store-${user.store}`);
             }
-        break;
+            break;
 
         case "spectator":
             console.log("case", 7)
-        break;
+            break;
     }
-    
-    
+
+
 }
 
-function storeExists(userStore){
+function storeExists(userStore) {
     return rooms[userStore];
-  }
-  
-  function managerIsActive(userStore){
+}
+
+function managerIsActive(userStore) {
     return rooms[userStore].manager === true;
-  }
-
-  function findUserSocket(userId){
-    return Object.keys(users).find( socketId =>{return users[socketId] == userId})
-  }
-
+}
+
+function findUserSocket(userId) {
+    return Object.keys(users).find(socketId => { return users[socketId] == userId })
+}