Merge pull request #16 from benAkehurst/feature/caching

Feature - Update to token checking methods

Author: benAkehurst

api/controllers/authController.js

@@ -9,8 +9,8 @@ const {
   checkEmailExists,
   validateEmail,
 } = require('../../middlewares/validators');
+const { checkToken } = require('../../middlewares/token');
 const { sendEmail } = require('../../middlewares/utils/emailService');
-const tokenMiddleware = require('../../middlewares/token');
 const User = require('../models/userModel');
 const Code = require('../models/codeModel');
 
@@ -430,41 +430,34 @@ exports.delete_user_account = async (req, res) => {
  * PARAM: token
  */
 exports.check_token_valid_external = async (req, res) => {
-  const token = req.params.token;
-  if (!token || token === null) {
+  const { token } = req.params;
+  if (!token) {
     res.status(400).json({
       success: false,
       message: 'Incorrect Request Parameters',
       data: null,
     });
   }
-  let tokenValid;
-  await tokenMiddleware
-    .checkToken(token)
-    .then((promiseResponse) => {
-      if (promiseResponse.success) {
-        tokenValid = true;
-      }
-    })
-    .catch((promiseError) => {
-      if (promiseError) {
-        return res.status(500).json({
-          success: false,
-          message: 'Bad Token',
-          data: null,
-        });
-      }
-    });
-  if (tokenValid) {
-    res.status(200).json({
-      success: true,
-      message: 'Token Valid',
-      data: null,
-    });
-  } else {
-    res.status(400).json({
+  try {
+    let tokenValid = await checkToken(token);
+    if (!tokenValid) {
+      res.status(400).json({
+        success: false,
+        message: 'Token Not Valid',
+        data: null,
+      });
+    } else {
+      res.status(200).json({
+        success: true,
+        message: 'Token Valid',
+        data: null,
+      });
+    }
+  } catch {
+    res.status(500).json({
       success: false,
-      message: 'Token not valid',
+      message: 'Oh, something went wrong checking token. Please try again!',
+      data: null,
     });
   }
 };

api/controllers/todoListController.js

@@ -2,7 +2,7 @@ const mongoose = require('mongoose');
 const { format } = require('date-fns');
 const sanitize = require('mongo-sanitize');
 const { v4: uuidv4 } = require('uuid');
-const tokenMiddleware = require('../../middlewares/token');
+const { checkToken } = require('../../middlewares/token');
 const { checkUserExists } = require('../../middlewares/validators');
 const Task = require('../models/taskModel');
 
@@ -24,7 +24,7 @@ exports.create_new_task = async (req, res) => {
     });
   } else {
     try {
-      let tokenValid = await tokenMiddleware.checkToken(token);
+      let tokenValid = await checkToken(token);
       let userExists = await checkUserExists(uniqueId);
       if (tokenValid.success && userExists) {
         let newTask = new Task({
@@ -81,9 +81,10 @@ exports.read_all_user_tasks = async (req, res) => {
     });
   } else {
     try {
-      let tokenValid = await tokenMiddleware.checkToken(token);
+      let tokenValid = await checkToken(token);
       let userExists = await checkUserExists(uniqueId);
       if (tokenValid.success && userExists) {
+        // TODO: Call cache here?
         Task.find({ user: { $all: uniqueId } }, (err, tasks) => {
           if (err) {
             return res.status(400).json({
@@ -130,8 +131,9 @@ exports.read_single_task = async (req, res) => {
     });
   } else {
     try {
-      let tokenValid = await tokenMiddleware.checkToken(token);
+      let tokenValid = await checkToken(token);
       let userExists = await checkUserExists(uniqueId);
+      // TODO: Call cache here?
       if (tokenValid.success && userExists) {
         Task.find({ externalId: sanitize(externalId) }, (err, task) => {
           if (err) {
@@ -184,7 +186,7 @@ exports.update_single_task = async (req, res) => {
     });
   } else {
     try {
-      let tokenValid = await tokenMiddleware.checkToken(token);
+      let tokenValid = await checkToken(token);
       let userExists = await checkUserExists(uniqueId);
       if (tokenValid.success && userExists) {
         Task.updateOne(
@@ -238,7 +240,7 @@ exports.delete_single_task = async (req, res) => {
     });
   } else {
     try {
-      let tokenValid = await tokenMiddleware.checkToken(token);
+      let tokenValid = await checkToken(token);
       let userExists = await checkUserExists(uniqueId);
       if (tokenValid.success && userExists) {
         Task.deleteOne(

middlewares/token.js

@@ -1,6 +1,6 @@
 const jwt = require('jsonwebtoken');
 
-let checkToken = (req) => {
+const checkToken = (req) => {
   let token = req;
   return new Promise((resolve, reject) => {
     if (!token) {
@@ -28,4 +28,4 @@ let checkToken = (req) => {
   });
 };
 
-module.exports = { checkToken: checkToken };
+module.exports = { checkToken };