added user and admin buttons - updates to database

TrineMedina · Schmang13 · TrineMedina · commit 5770ae8ce3e1 · 2022-10-11T16:52:41.000-04:00
Co-authored-by: Abigail Gerig &lt;94636591+4estgirl@users.noreply.github.com&gt;

Co-authored-by: Christian Looff &lt;106610236+cmlooff@users.noreply.github.com&gt;

Co-authored-by: Ruli Warner-Rosen &lt;108160097+Ruliwr@users.noreply.github.com&gt;

Co-authored-by: Trine Medina &lt;106996307+TrineMedina@users.noreply.github.com&gt;

Co-authored-by: Matt Dias &lt;105461989+Schmang13@users.noreply.github.com&gt;
diff --git a/server/controllers/userController.js b/server/controllers/userController.js
@@ -25,7 +25,7 @@ userController.createUser = (req, res, next) => {
       .catch((err) => {
         return next({
           log: `Error in userController newUser: ${err}`,
-          message: { err: 'An error occured creating new user in database. See userController.newUser.' },
+          message: { err: 'An error occurred creating new user in database. See userController.newUser.' },
         });
       });
   }
@@ -45,7 +45,7 @@ userController.getAllUsers = (req, res, next) => {
       .catch((err) => {
         return next({
           log: `Error in userController getAllUsers: ${err}`,
-          message: { err: 'An error occured retrieving all users from database. See userController.getAllUsers.' },
+          message: { err: 'An error occurred retrieving all users from database. See userController.getAllUsers.' },
         });
       });
   }
@@ -65,7 +65,7 @@ userController.getOneUser = (req, res, next) => {
     .catch((err) => {
       return next({
         log: `Error in userController getOneUser: ${err}`,
-        message: { err: 'An error occured retrieving user from database. See userController.getOneUser.' },
+        message: { err: 'An error occurred retrieving user from database. See userController.getOneUser.' },
       });
     });
 };
@@ -86,38 +86,55 @@ userController.verifyUser = (req, res, next) => {
     .catch((err) => {
       return next({
         log: `Error in userController checkUserExists: ${err}`,
-        message: { err: 'An error occured while checking if username exists. See userController.checkUserExists.' },
+        message: { err: 'An error occurred while checking if username exists. See userController.checkUserExists.' },
+      });
+    });
+};
+
+// Checks database to ensure at least one person is SysAdmin - there should never be 0 sysAdmins.
+userController.checkSysAdmin = (req, res, next) => {
+// TODO: Add logic to check length of returned data
+  const query = 'SELECT * FROM users WHERE role_id = 1';
+
+  db.query(query)
+    .then((data) => {
+      res.locals.sysAdmins = data.length;
+      return next();
+    })
+    .catch((err) => {
+      return next({
+        log: `Error in userController switchUserRole: ${err}`,
+        message: { err: 'An error occurred while checking number of SysAdmins. See userController.checkSysAdmins.' },
       });
     });
 };
 
 // switches role of user upon designation by system admin
 userController.switchUserRole = (req, res, next) => {
 
-  const roleMap = {
-    sysadmin: 1,
-    admin: 2,
-    user: 3,
+  const roleMap = { // TM
+    1: 'system admin', 
+    2: 'admin',
+    3: 'user'
   };
 
-  const { _id, changeToAdmin } = req.body;
+  const { _id, role_id} = req.body;
 
   const query = 'UPDATE users SET role = $1, role_id = $2 WHERE _id = $3 RETURNING *;';
-
-  // Array destructuring assignment and ternary operator
-  const [ newRole, newRoleId ] = changeToAdmin ? [ 'admin', roleMap.admin ] : [ 'user', roleMap.user ];
-
-  // const newRoleId = changeToAdmin ? roleMap.admin : roleMap.user;
-  const parameters = [ newRole, newRoleId, _id ];
+ 
+  
+  const parameters = [roleMap[role_id], role_id, _id]; // TM
+ 
   db.query(query, parameters)
     .then((data) => {
       res.locals.user = data.rows[0];
+
       return next();
     })
     .catch((err) => {
       return next({
         log: `Error in userController switchUserRole: ${err}`,
-        message: { err: 'An error occured while checking if username exists. See userController.switchUserRole.' },
+        message: { err: 'An error occurred while switching roles. See userController.switchUserRole.' },
       });
     });
 };
@@ -144,7 +161,7 @@ userController.updatePassword = (req, res, next) => {
     .catch((err) => {
       return next({
         log: `Error in userController updatePassword: ${err}`,
-        message: { err: 'An error occured while checking if username exists. See userController.updatePassword.' },
+        message: { err: 'An error occurred while checking if username exists. See userController.updatePassword.' },
       });
     });
 };
@@ -164,7 +181,7 @@ userController.updatePhone = (req, res, next) => {
     .catch((err) => {
       return next({
         log: `Error in userController updatePhone: ${err}`,
-        message: { err: 'An error occured while checking if username exists. See userController.updatePhone.' },
+        message: { err: 'An error occurred while checking if username exists. See userController.updatePhone.' },
       });
     });
 };
@@ -183,7 +200,7 @@ userController.updateEmail = (req, res, next) => {
     .catch((err) => {
       return next({
         log: `Error in userController updateEmail: ${err}`,
-        message: { err: 'An error occured while checking if username exists. See userController.updateEmail.' },
+        message: { err: 'An error occurred while checking if username exists. See userController.updateEmail.' },
       });
     });
 };
@@ -204,7 +221,7 @@ userController.verifySysadmin = (req, res, next) =>{
     .catch((err) => {
       return next({
         log: `Error in userController verifySysadmin: ${err}`,
-        message: { err: 'An error occured while checking if token exists. See userController.verifySysadmin.' },
+        message: { err: 'An error occurred while checking if token exists. See userController.verifySysadmin.' },
       });
     });
 
diff --git a/server/routes/adminRouter.js b/server/routes/adminRouter.js
@@ -22,6 +22,7 @@ router.post('/',
 // Route Handler: Checks if client has sysadmin privilege. Switch user role from 'user' to 'admin' and vice-versa.
 router.post('/switch',
   userController.verifySysadmin,
+  userController.checkSysAdmin,
   userController.switchUserRole, 
   (req, res) => {
     return res.status(200).json(res.locals.user);
diff --git a/src/components/helper/newUserHelper.js b/src/components/helper/newUserHelper.js
@@ -6,7 +6,6 @@ import store from '../../renderer/store';
 import * as actions from '../../actions/actions';
 import { NetworkCellSharp, NextWeek } from '@material-ui/icons';
 import { username } from '../../../security/email';
-// TM - no react-redux imports?
 
 export const handleNewUser = (e) => {
   e.preventDefault();
@@ -136,13 +135,13 @@ export const getUpdatedUserList = () => {
   })
     .then((response) => response.json())
     .then((data) => {
-      updateUserList(data);
+      // updateUserList(data);
     })
     .catch((err) => {
       console.log('error in getUpdatedUserList: ', err);
     });
 };
 
-export const updateUserList = (data) => {  // TM: react-redux is not imported but this is still working... redux is stupid
+export const updateUserList = (data) => {  
   store.dispatch(actions.updateUserList(data));
 };
diff --git a/src/components/tabs/Users.js b/src/components/tabs/Users.js
@@ -39,7 +39,8 @@ const useStyles1 = makeStyles((theme) => ({
   },
 }));
 
-// Function store of all pagination functions, these functions update the count, the current range of pages, etc. Essentially, any action on the pagination bar will be handled by this function store which is passed into the TablePagination component
+// Function store of all pagination functions, these functions update the count, the current range of pages, etc. 
+// Essentially, any action on the pagination bar will be handled by this function store which is passed into the TablePagination component
 function TablePaginationActions(props) {
   const classes = useStyles1();
   const theme = useTheme();
@@ -117,18 +118,29 @@ const UserTable = () => {
   const dispatch = useDispatch();
   const updateUserRole = (data) => dispatch(actions.updateUserRole(data));
 
-  const tempSelected = {};
+  // Create an object for each user-role checkbox - assign true/false based on the roles
+  // from the state array
+  // TODO: Add react useEffect once updated
+  const tempAdminSelected = {};
+  const tempSysAdminSelected = {};
+  const tempUserSelected = {};
   for (let i = 0; i < rows.length; i++) {
-    tempSelected[rows[i]._id] =
-      rows[i].role === 'admin' || rows[i].role === 'sysadmin';
+    tempSysAdminSelected[rows[i]._id] = rows[i].role === 'system admin';
+    tempAdminSelected[rows[i]._id] = rows[i].role === 'admin';
+    tempUserSelected[rows[i]._id] = rows[i].role === 'user';
   }
+  console.log(tempAdminSelected);
 
   // Local state variables for table pagination
   const [page, setPage] = useState(0);
   const [rowsPerPage, setRowsPerPage] = useState(5);
 
-  // Local state variable to keep track of which admin checkboxes are selected
-  const [selected, setSelected] = React.useState(tempSelected);
+  // Local state variable to keep track of which admin, sysadmin or user checkboxes are selected. 
+  const [selectedUser, setSelectedUser] = React.useState(tempUserSelected);
+  const [selectedAdmin, setSelectedAdmin] = React.useState(tempAdminSelected); // tm
+  const [selectedSysAdmin, setSelectedSysAdmin] = React.useState(tempSysAdminSelected);
+
+
 
   // Determine how many empty rows to display on a certain page, e.g. if rowsPerPage = 5, and there are only 3 rows, should display 2 rows
   const emptyRows =
@@ -144,23 +156,57 @@ const UserTable = () => {
     setPage(0);
   };
 
-  const handleCheckboxClick = (event) => {
-    // event persist is required to access target property of event. Without this, a synthetic event object would be used where target is re-assigned to null for performance reasons
-    event.persist();
+  const setSysAdmin = (id) => {
+    const invertPreviousValue = !selectedSysAdmin[`S${id}`];
+    const temp = {
+      ...selectedSysAdmin,
+    };
+    // update key of checkbox id to switched/inverted value
+    temp[id] = invertPreviousValue;
+    // update local state
+    setSelectedSysAdmin(temp);
+    return 1;
+  };
 
-    const id = event.target.getAttribute('id');
-    const invertPreviousValue = !selected[id];
+  const setAdmin = (id) => {
+    const invertPreviousValue = !selectedAdmin[id];
+    // Create a temp copy of the selected object
+    const temp = {
+      ...selectedAdmin,
+    };
+    temp[id] = invertPreviousValue;
+    setSelectedAdmin(temp);
+    return 2;
+  };
 
-    // create temporary copy of selected object
+  const setUser = (id) => {
+    const invertPreviousValue = !selectedUser[`U${id}`];
     const temp = {
-      ...selected,
+      ...selectedUser,
     };
-    // update key of checkbox id to switched/inverted value
     temp[id] = invertPreviousValue;
+    setSelectedUser(temp);
+    return 3;
+  };
 
-    // update local state variable selected
-    setSelected(temp);
+  const handleCheckboxClick = (event) => {
+    // event persist is required to access target property of event. Without this, a synthetic event object would be used where target is re-assigned to null for performance reasons
+    event.persist();
 
+    let id = event.target.getAttribute('id');
+    let role_id;
+ 
+    if(id.charAt(0) === 'S') {
+      id = id.slice(1);
+      role_id = setSysAdmin(id);
+    } else if (id.charAt(0) === 'U'){
+      id = id.slice(1);
+      role_id = setUser(id);
+    }
+    else {
+      role_id = setAdmin(id);
+    }
+        
     // send request to endpoint http://localhost:3000/admin/switch
     fetch('http://localhost:3000/admin/switch', {
       method: 'POST',
@@ -169,7 +215,8 @@ const UserTable = () => {
       },
       body: JSON.stringify({
         _id: id,
-        changeToAdmin: invertPreviousValue,
+        role_id: role_id // TM - Need to add info if role needs to be downgraded
+        // changeToAdmin: invertPreviousValue,
       }),
     })
       .then((response) => {
@@ -215,38 +262,58 @@ const UserTable = () => {
                 <TableCell>Contact Preference</TableCell>
                 <TableCell>Memory Threshold</TableCell>
                 <TableCell>CPU Threshold</TableCell>
+                <TableCell>User</TableCell>
                 <TableCell>Admin</TableCell>
+                <TableCell>SysAdmin</TableCell>
               </TableRow>
             </TableHead>
             <TableBody>
               {renderRows.length > 0
                 ? renderRows.map((row, index) => {
-                    // const isItemSelected = isSelected(row.name);
-                    const labelId = `enhanced-table-checkbox-${index}`;
-                    return (
-                      <TableRow key={row._id} hover>
-                        <TableCell component='th' scope='row'>
-                          {row._id}
-                        </TableCell>
-                        <TableCell>{row.username}</TableCell>
-                        <TableCell>{row.email}</TableCell>
-                        <TableCell>{row.phone}</TableCell>
-                        <TableCell>{row.role}</TableCell>
-                        <TableCell>{row.contact_pref}</TableCell>
-                        <TableCell>{row.mem_threshold}</TableCell>
-                        <TableCell>{row.cpu_threshold}</TableCell>
-                        <TableCell>
-                          <Checkbox
-                            id={`${row._id}`}
-                            userid={`${row._id}`}
-                            checked={selected[row._id]}
-                            inputProps={{ 'aria-labelledby': labelId }}
-                            onChange={handleCheckboxClick}
-                          />
-                        </TableCell>
-                      </TableRow>
-                    );
-                  })
+                  // const isItemSelected = isSelected(row.name);
+                  const labelId = `enhanced-table-checkbox-${index}`;
+                  return (
+                    <TableRow key={row._id} hover>
+                      <TableCell component='th' scope='row'>
+                        {row._id}
+                      </TableCell>
+                      <TableCell>{row.username}</TableCell>
+                      <TableCell>{row.email}</TableCell>
+                      <TableCell>{row.phone}</TableCell>
+                      <TableCell>{row.role}</TableCell>
+                      <TableCell>{row.contact_pref}</TableCell>
+                      <TableCell>{row.mem_threshold}</TableCell>
+                      <TableCell>{row.cpu_threshold}</TableCell>
+                      <TableCell>
+                        <Checkbox
+                          id={`U${row._id}`}  
+                          userid={`${row._id}`}
+                          checked={selectedUser[`U${row._id}`]}
+                          inputProps={{ 'aria-labelledby': labelId }}
+                          onChange={handleCheckboxClick}
+                        />
+                      </TableCell>
+                      <TableCell>
+                        <Checkbox
+                          id={`${row._id}`}
+                          userid={`${row._id}`}
+                          checked={selectedAdmin[row._id]}
+                          inputProps={{ 'aria-labelledby': labelId }}
+                          onChange={handleCheckboxClick}
+                        />
+                      </TableCell>
+                      <TableCell>
+                        <Checkbox
+                          id={`S${row._id}`}  // Edit these details so it links to sysadmin
+                          userid={`${row._id}`}
+                          checked={selectedSysAdmin[`S${row._id}`]}
+                          inputProps={{ 'aria-labelledby': labelId }}
+                          onChange={handleCheckboxClick}
+                        />
+                      </TableCell>
+                    </TableRow>
+                  );
+                })
                 : ''}
             </TableBody>
             <TableFooter>
diff --git a/src/reducers/sessionReducer.js b/src/reducers/sessionReducer.js
@@ -17,10 +17,12 @@ const initialState = {
 };
 
 export default function (state = initialState, action){
+
   switch(action.type) {
 
     // Change isLoggedIn state variable depending on previous value
     case types.UPDATE_SESSION: {
+
       return { 
         ...state, 
         isLoggedIn : (!state.isLoggedIn) 
@@ -29,6 +31,7 @@ export default function (state = initialState, action){
     
     // Upon successful sign-up or login, update session state with all user info
     case types.UPDATE_USER: {
+
       const {
         _id,
         username,
