Added unit tests for Audit Log: 1 test case for the frontend and 5 test cases for API calls.

Author: Pikalot

api/main_endpoints/routes/Auth.js

@@ -1,5 +1,5 @@
 'use strict';
-const bcrypt = require('cryptjs');
+const bcrypt = require('bcryptjs');
 const express = require('express');
 const crypto = require('crypto');
 const router = express.Router();
@@ -14,24 +14,21 @@ const { verifyCaptcha } = require('../util/captcha');
 const {
   checkIfTokenSent,
   checkIfTokenValid,
-  decodeToken,
+  decodeToken
 } = require('../util/token-functions');
 const jwt = require('jsonwebtoken');
-const { OK, BAD_REQUEST, FORBIDDEN, UNAUTHORIZED, NOT_FOUND, CONFLICT } =
-  require('../../util/constants').STATUS_CODES;
-const membershipState = require('../../util/constants').MEMBERSHIP_STATE;
-const PASSWORD_RESET_EXPIRATION =
-  require('../../util/constants').PASSWORD_RESET_EXPIRATION;
-const {
-  sendVerificationEmail,
-  sendPasswordReset,
-} = require('../util/emailHelpers');
 const {
-  userWithEmailExists,
-  checkIfPageCountResets,
-  findPasswordReset,
-} = require('../util/userHelpers');
-
+  OK,
+  BAD_REQUEST,
+  FORBIDDEN,
+  UNAUTHORIZED,
+  NOT_FOUND,
+  CONFLICT
+} = require('../../util/constants').STATUS_CODES;
+const membershipState = require('../../util/constants').MEMBERSHIP_STATE;
+const PASSWORD_RESET_EXPIRATION = require('../../util/constants').PASSWORD_RESET_EXPIRATION;
+const { sendVerificationEmail, sendPasswordReset } = require('../util/emailHelpers');
+const { userWithEmailExists, checkIfPageCountResets, findPasswordReset } = require('../util/userHelpers');
 
 const AuditLogActions = require('../util/auditLogActions.js');
 const AuditLog = require('../models/AuditLog.js');
@@ -41,13 +38,13 @@ router.post('/register', async (req, res) => {
   const registrationStatus = await registerUser(req.body);
   if (registrationStatus.userSaved) {
     const name = req.body.firstName + ' ' + req.body.lastName;
-    const user = await User.findOne({ email: req.body.email });
+    const user = await User.findOne({email: req.body.email});
 
     if (user) {
       AuditLog.create({
         userId: user._id,
         action: AuditLogActions.SIGN_UP,
-        details: { email: req.body.email },
+        details: {email: req.body.email}
       }).catch(logger.error);
     }
 
@@ -56,7 +53,7 @@ router.post('/register', async (req, res) => {
   }
   if (registrationStatus.status === 'BAD_REQUEST') {
     return res.status(BAD_REQUEST).send({
-      message: registrationStatus.message,
+      message: registrationStatus.message
     });
   }
   return res.status(CONFLICT).send({ message: registrationStatus.message });
@@ -72,7 +69,7 @@ router.post('/resendVerificationEmail', async (req, res) => {
   if (!maybeUser) {
     return res.sendStatus(NOT_FOUND);
   }
-  let name = maybeUser.firstName +  ' ' + maybeUser.lastName;
+  let name = maybeUser.firstName + ' ' + maybeUser.lastName;
   sendVerificationEmail(name, req.body.email);
   res.sendStatus(OK);
 });
@@ -83,15 +80,15 @@ router.post('/sendPasswordReset', async (req, res) => {
 
   if (invalidEmail) {
     return res.status(BAD_REQUEST).send({
-      message: 'Invalid email.',
+      message: 'Invalid email.'
     });
   }
 
   if (process.env.NODE_ENV === 'production') {
     const captchaValid = await verifyCaptcha(req.body.captchaToken);
     if (!captchaValid.success) {
       return res.status(BAD_REQUEST).send({
-        message: 'Captcha verification failed.',
+        message: 'Captcha verification failed.'
       });
     }
   }
@@ -104,22 +101,20 @@ router.post('/sendPasswordReset', async (req, res) => {
       return res.sendStatus(OK);
     }
     if (
-      [membershipState.PENDING, membershipState.BANNED].includes(
-        result.accessLevel
-      )
+      [
+        membershipState.PENDING,
+        membershipState.BANNED,
+      ].includes(result.accessLevel)
     ) {
       return res.status(UNAUTHORIZED).send({
-        message: 'Cannot reset password, account is in a bad state!',
+        message: 'Cannot reset password, account is in a bad state!'
       });
     }
 
     const buffer = crypto.randomBytes(12);
     let id = buffer.toString('base64');
 
-    const resetToken = id
-      .replace(/\+/g, '-')
-      .replace(/\//g, '_')
-      .replace(/=+$/, '');
+    const resetToken = id.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, '');
     try {
       const passwordReset = new PasswordReset({
         resetToken,
@@ -134,7 +129,6 @@ router.post('/sendPasswordReset', async (req, res) => {
   });
 });
 
-
 // User Login
 router.post('/login', function(req, res) {
   if (!req.body.email || !req.body.password) {
@@ -143,7 +137,7 @@ router.post('/login', function(req, res) {
 
   User.findOne(
     {
-      email: req.body.email.toLowerCase(),
+      email: req.body.email.toLowerCase()
     },
     function(error, user) {
       if (error) {
@@ -152,75 +146,83 @@ router.post('/login', function(req, res) {
       }
 
       if (!user) {
-        return res.status(UNAUTHORIZED).send({
-          message: 'Username or password does not match our records.',
+        res
+          .status(UNAUTHORIZED)
+          .send({
+            message: 'Username or password does not match our records.'
+          });
+      } else {
+        // Check if password matches database
+        user.comparePassword(req.body.password, function(error, isMatch) {
+          if (isMatch && !error) {
+            if (user.accessLevel === membershipState.BANNED) {
+              return res
+                .status(UNAUTHORIZED)
+                .send({
+                  message: 'The account with email ' +
+                    req.body.email +
+                    ' is banned',
+                });
+            }
+
+            // Check if the user's email has been verified
+            if (!user.emailVerified) {
+              return res
+                .status(UNAUTHORIZED)
+                .send({ message: `The email ${req.body.email} has not been verified` });
+            }
+
+            // If the username and password matches the database, assign and
+            // return a jwt token
+            const jwtOptions = {
+              expiresIn: '2h'
+            };
+
+            // check here to see if we should reset the pagecount. If so, do it
+            if (checkIfPageCountResets(user.lastLogin)) {
+              user.pagesPrinted = 0;
+            }
+
+            // Include fields from the User model that should
+            // be passed to the JSON Web Token (JWT)
+            const userToBeSigned = {
+              firstName: user.firstName,
+              lastName: user.lastName,
+              email: user.email,
+              accessLevel: user.accessLevel,
+              pagesPrinted: user.pagesPrinted,
+              _id: user._id
+            };
+            user
+              .save()
+              .then(() => {
+                const token = jwt.sign(
+                  userToBeSigned, config.secretKey, jwtOptions
+                );
+                // Create audit log on successful sign-in
+                AuditLog.create({
+                  userId: user._id,
+                  action: AuditLogActions.LOG_IN,
+                  details: { email: user.email }
+                }).catch(logger.error);
+
+                res.json({ token: 'JWT ' + token });
+              })
+              .catch((error) => {
+                logger.error('unable to login user', error);
+                res.sendStatus(SERVER_ERROR);
+              });
+          } else {
+            res.status(UNAUTHORIZED).send({
+              message: 'Username or password does not match our records.'
+            });
+          }
         });
       }
-
-      user.comparePassword(req.body.password, function(error, isMatch) {
-        if (error || !isMatch) {
-          return res.status(UNAUTHORIZED).send({
-            message: 'Username or password does not match our records.',
-          });
-        }
-        if (user.accessLevel === membershipState.BANNED) {
-          return res.status(UNAUTHORIZED).send({
-            message: 'The account with email ' + req.body.email + ' is banned',
-          });
-        }
-
-        if (!user.emailVerified) {
-          return res.status(UNAUTHORIZED).send({
-            message: `The email ${req.body.email} has not been verified`,
-          });
-        }
-
-        const jwtOptions = {
-          expiresIn: '2h',
-        };
-
-        if (checkIfPageCountResets(user.lastLogin)) {
-          user.pagesPrinted = 0;
-        }
-
-        user.lastLogin = new Date();
-
-        const userToBeSigned = {
-          firstName: user.firstName,
-          lastName: user.lastName,
-          email: user.email,
-          accessLevel: user.accessLevel,
-          pagesPrinted: user.pagesPrinted,
-          _id: user._id,
-        };
-
-        user
-          .save()
-          .then(() => {
-            const token = jwt.sign(
-              userToBeSigned,
-              config.secretKey,
-              jwtOptions
-            );
-            AuditLog.create({
-              userId: user._id,
-              action: AuditLogActions.LOG_IN,
-              details: { email: user.email },
-            }).catch(logger.error);
-
-            res.json({ token: 'JWT' + token });
-          })
-          .catch((error) => {
-            logger.error('unable to login user', error);
-            res.sendStatus(SERVER_ERROR);
-          });
-      });
     }
   );
 });
 
-
-
 // Verifies the users session if they have an active jwtToken.
 // Used on the inital load of root '/'
 // Returns the name and accesslevel of the user w/ the given access token
@@ -249,6 +251,7 @@ router.post('/generateHashedId', async (req, res) => {
     // bcrypts library
     bcrypt.genSalt(10, function(error, salt) {
       if (error) {
+        // reject('Bcrypt failed')
         res.sendStatus(BAD_REQUEST);
       }
 
@@ -272,39 +275,35 @@ router.post('/validateVerificationEmail', async (req, res) => {
       res.sendStatus(NOT_FOUND);
     }
 
-    bcrypt.compare(
-      String(result._id),
-      req.body.hashedId,
-      async function(error, isMatch) {
-        if (error) {
-          res.sendStatus(BAD_REQUEST);
-        }
-        if (isMatch) {
-          result.emailVerified = true;
-          result.accessLevel = membershipState.NON_MEMBER;
-          await result
-            .save()
-            .then((_) => {
-              res.sendStatus(OK);
-            })
-            .catch((err) => {
-              res.sendStatus(BAD_REQUEST);
-            });
-        } else {
-          res.sendStatus(BAD_REQUEST);
-        }
+    bcrypt.compare(String(result._id), req.body.hashedId, async function(
+      error,
+      isMatch) {
+      if (error) {
+        res.sendStatus(BAD_REQUEST);
       }
-    );
+      if (isMatch) {
+        result.emailVerified = true;
+        result.accessLevel = membershipState.NON_MEMBER;
+        await result
+          .save()
+          .then(_ => {
+            res.sendStatus(OK);
+          })
+          .catch(err => {
+            res.sendStatus(BAD_REQUEST);
+          });
+      } else {
+        res.sendStatus(BAD_REQUEST);
+      }
+    });
   });
 });
 
 router.post('/validatePasswordReset', async (req, res) => {
   try {
     const passwordReset = await findPasswordReset(req.body.resetToken);
     if (!passwordReset) {
-      return res
-        .status(NOT_FOUND)
-        .send({ message: 'Invalid or expired reset tokennn.' });
+      return res.status(NOT_FOUND).send({ message: 'Invalid or expired reset token.' });
     }
     res.sendStatus(OK);
   } catch (error) {
@@ -317,7 +316,7 @@ router.post('/resetPassword', async (req, res) => {
   const testPassword = testPasswordStrength(req.body.password);
   if (!testPassword.success) {
     return res.status(BAD_REQUEST).send({
-      message: 'Password does not meet requirements.',
+      message: 'Password does not meet requirements.'
     });
   }
 
@@ -354,4 +353,3 @@ router.post('/resetPassword', async (req, res) => {
 });
 
 module.exports = router;
-

src/Pages/AuditLog/AuditLog.js

@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import { getAllLogs } from '../../APIFunctions/AuditLog';
 import Pagination from './Components/Pagination';
 import { useSCE } from '../../Components/context/SceContext';
@@ -37,21 +37,6 @@ export default function AuditLogPage() {
     'DELETE_CARD',
   ];
 
-  const toggleActivityFilter = activity => {
-    setActivityFilters(prev => (prev.includes(activity) ? prev.filter(a => a !== activity) : [...prev, activity]));
-  };
-
-  const activityTypes = [
-    'SIGN_UP',
-    'LOG_IN',
-    'UPDATE_USER',
-    'PRINT_PAGE',
-    'VERIFY_EMAIL',
-    'EMAIL_SENT',
-    'CHANGE_PW',
-    'RESET_PW',
-  ];
-
   const getAuditLogsFromDB = async () => {
     try {
       setLoading(true);