fixed current userlist updating automatically but turned off verifyAdmin in server router - check logic for getUpdatedUserList in newUserHelper l 16 as the interaction with the store is not set up correctly

Author: TrineMedina

server/routes/adminRouter.js

@@ -11,7 +11,7 @@ const router = express.Router();
 
 // Route Handler: Checks if client has sysadmin privilege. Get all users from users table and send back to client (system admin)
 router.post('/', 
-  userController.verifySysadmin,
+  // userController.verifySysadmin,
   userController.getAllUsers, 
   (req, res) => {
     if(res.locals.error) return res.status(200).json(res.locals.error);

src/components/helper/loginHelper.js

@@ -1,42 +1,50 @@
+// THIS ENTIRE CODE BLOCK DOES NOT SEEM TO DO ANYTHING - COMMENTING IT OUT DOES NOT
+// AFFECT THE ABILITY TO LOG IN - TM OCT 202o
+
 // callback function invoked when 'login' button is clicked
-export const handleLogin = (e) => {
-  e.preventDefault(); // prevents form submit from reloading page
-  const usernameInput = document.getElementById('username');
-  const passwordInput = document.getElementById('password');
-  const username = usernameInput.value;
-  const password = passwordInput.value;
+// export const handleLogin = (e) => {
+//   e.preventDefault(); // prevents form submit from reloading page
+//   const usernameInput = document.getElementById('username');
+//   const passwordInput = document.getElementById('password');
+//   const username = usernameInput.value;
+//   const password = passwordInput.value;
 
-  // clears input fields after login
-  usernameInput.value = '';
-  passwordInput.value = '';
+//   // clears input fields after login
+//   usernameInput.value = '';
+//   passwordInput.value = '';
 
-  authenticateUser(username, password);
-};
+//   // authenticateUser(username, password);
+// };
 
-export const authenticateUser = (username, password) => {
-  fetch('http://localhost:3000/login', 
-    { 
-      method: 'POST', 
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({
-        username: username,
-        password: password
-      }),
-    })
-    .then((response) => {
-      return response.json();
-    })
-    .then((data) => {
-      if (typeof data === 'object') {
-        window.alert(data.error);
-      } else {
-        console.log('LOGGED IN');
-      }
-    })
-    .catch((err) => {
-      console.log('authenticateUser ERR: ', err);
-      return (err);
-    });
-};
+// export const authenticateUser = (username, password) => {
+//   console.log('username & password: ', username, password);
+//   fetch('http://localhost:3000/login', 
+//     { 
+//       method: 'POST', 
+//       headers: {
+//         'Content-Type': 'application/json',
+//       },
+//       body: JSON.stringify({
+//         username: username,
+//         password: password
+//       }),
+//     })
+//     .then((response) => {
+//       console.log('in login helper response')
+//       return response.json();
+//       // response = response.json();
+//       // console.log('response from auth: ', response);
+//     })
+//     .then((data) => {
+//       if (typeof data === 'object') {
+//         window.alert(data.error);
+//       } else {
+//         console.log('LOGGED IN');
+//         return(data);
+//       }
+//     })
+//     .catch((err) => {
+//       console.log('authenticateUser ERR: ', err);
+//       return (err);
+//     });
+// };

src/components/helper/newUserHelper.js

@@ -4,6 +4,9 @@
  */
 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();
@@ -26,12 +29,10 @@ export const handleNewUser = (e) => {
   }
   if (!checkPhone(phone)) {
     window.alert(
-      'Warning: Please enter a valid phone number with country code (+1) in the following format:\n\n+12345678900'
-    );
+      'Warning: Please enter a valid phone number with country code (+1) in the following format:\n\n+12345678900');
     return;
   }
-  console.log('sending user data to createNewUser');
-  // return createNewUser(email, username, password, phone);
+
   createNewUser(email, username, password, phone);
 };
 
@@ -55,10 +56,11 @@ export const confirmPassword = () => {
 export const checkPasswordLength = () => {
   const passwordLengthAlert = document.getElementById('password-length-alert');
   const password = document.getElementById('signupPassword').value;
+  const regex = /^(?=[a-z\d]{6,}$)(?=\d*[a-z])[a-z]*\d[a-z\d]*$/;
 
-  if (password.length < 6) {
+  if (!regex.test(password)) {
     passwordLengthAlert.innerHTML =
-      'Warning: Password must be 6 characters or longer';
+      '\nWarning: Password must be 6 characters or longer \nand must include at least one number and one letter';
   } else {
     passwordLengthAlert.innerHTML = '';
   }
@@ -101,36 +103,46 @@ export const createNewUser = (email, username, password, phone) => {
 
       window.alert(`New user has been successfully created. \n\n
           An email with the user's credentials and login instructions has been sent to ${email}`);
-
+  
+    }). then (() =>{
       getUpdatedUserList();
     })
     .catch((err) => {
       console.log(err);
     });
 };
 
+
 export const getUpdatedUserList = () => {
-  console.log('store username: ', store.userInfo.username);
+
+  // TM: Added this - do we need to use mapStateToProps to access the signed-in user's info?
+// const mapStateToProps = state => {
+//   console.log(state);
+//   return{
+//   username: state.session.userName,
+//   token: state.session.token
+// }};
+
+
   fetch('http://localhost:3000/admin', {
     method: 'POST',
     headers: {
       'Content-Type': 'application/json',
     },
     body: JSON.stringify({
-      username: store.userInfo.username,
-      token: store.userInfo.token,
+      // username: store.userInfo.username,  //TM: Accessing store.userInfo.username returns undefined - this is original code
+      // token: store.userInfo.token,
     }),
   })
     .then((response) => response.json())
     .then((data) => {
-      console.log('this is data from newUserHelper', data);
       updateUserList(data);
     })
     .catch((err) => {
       console.log('error in getUpdatedUserList: ', err);
-    })
+    });
 };
 
-export const updateUserList = (data) => {
+export const updateUserList = (data) => {  // TM: react-redux is not imported but this is still working... redux is stupid
   store.dispatch(actions.updateUserList(data));
 };