Merge pull request #301 from WebJamApps/dev

Quena release

Author: JoshuaVSherman

.circleci/config.yml

@@ -4,7 +4,7 @@ jobs:
     working_directory: ~/web-jam-back
     # The primary container is an instance of the first list image listed. Your build commands run in this container.
     docker:
-      - image:         circleci/node:10.8.0-browsers
+      - image:         circleci/node:10.9.0-browsers
     # The secondary container is an instance of the second listed image which is run in a common network where ports exposed on the primary container are available on localhost.
       #- image:        mongo:3.4.4
     steps:
@@ -23,7 +23,7 @@ jobs:
             - node_modules
   test:
     docker:
-      - image:         circleci/node:10.8.0-browsers
+      - image:         circleci/node:10.9.0-browsers
       #- image:        mongo:3.4.4
     steps:
       - checkout

.eslintrc.json

@@ -10,7 +10,6 @@
     "comma-dangle": [0, "never"],
     "no-undef": [0, "never"],
     "no-underscore-dangle": [0, "never"],
-    "func-names": [0, "never"],
     "no-restricted-syntax": [0, "never"],
     "no-unused-expressions": [2, {
       "allowShortCircuit": true
@@ -32,7 +31,6 @@
     "no-trailing-spaces": [1, {
       "skipBlankLines": true
     }],
-    "node/no-unpublished-require": 0,
     "security/detect-unsafe-regex": 0,
     "security/detect-object-injection": 0,
     "prefer-destructuring": 0,

.nvmrc

@@ -1 +1 @@
-10.8.0
+10.9.0

.nycrc.json

@@ -0,0 +1,5 @@
+{
+  "report-dir": "./coverage/mocha",
+  "reporter": ["lcov", "json"],
+  "exclude": ["**/*.spec.js", "test"]
+}

auth/auth.controller.js

@@ -6,7 +6,7 @@ let frontURL = config.frontURL;
 /* istanbul ignore if */
 if (process.env.NODE_ENV === 'production') frontURL = 'https://web-jam.com';
 
-exports.signup = function (req, res) {
+exports.signup = function signup(req, res) {
   const randomNumba = authUtils.generateCode(99999, 10000);
   const user = new User({
     name: req.body.name,
@@ -42,23 +42,23 @@ exports.signup = function (req, res) {
   });
 };
 
-exports.validemail = function (req, res) {
-  console.log('email:' + req.body.email + ' resetCode:' + req.body.resetCode);
-  User.findOne({ email: req.body.email, resetCode: req.body.resetCode }, (err, user) => {
-    console.log(user);
-    if (!user) {
-      return res.status(401).json({ message: 'incorrect email or code' });
-    }
-    user.resetCode = '';
-    user.isPswdReset = false;
-    user.verifiedEmail = true;
-    return user.save((err) => {
-      res.status(201).json({ success: true });
-    });
-  });
-};
+// exports.validemail = function validemail(req, res) {
+//   // console.log('email:' + req.body.email + ' resetCode:' + req.body.resetCode);
+//   return User.findOne({ email: req.body.email, resetCode: req.body.resetCode }, (err, user) => {
+//     console.log(user);
+//     if (!user) {
+//       return res.status(401).json({ message: 'incorrect email or code' });
+//     }
+//     user.resetCode = '';
+//     user.isPswdReset = false;
+//     user.verifiedEmail = true;
+//     return user.save((err) => {
+//       res.status(201).json({ success: true });
+//     });
+//   });
+// };
 
-exports.login = function (req, res) {
+exports.login = function login(req, res) {
   console.log('req body email' + req.body.email);
   let reqUserEmail = '';
   reqUserEmail = authUtils.setIfExists(req.body.email);
@@ -77,32 +77,32 @@ exports.login = function (req, res) {
   });
 };
 
-exports.resetpass = function (req, res) {
-  console.log('email:' + req.body.email);
-  User.findOne({ email: req.body.email }, (err, user) => {
-    console.log(user);
-    if (!user) {
-      return res.status(401).json({ message: 'incorrect email address' });
-    }
-    if (!user.verifiedEmail) {
-      return res.status(401).json({ message: 'Verify your email address' });
-    }
-    const randomNumba = authUtils.generateCode(99999, 10000);
-    user.resetCode = randomNumba;
-    user.isPswdReset = true;
-    return user.save((err) => {
-      res.status(201).json({ email: user.email });
-      const mailBody = '<h2>A password reset was requested for ' + user.name
-      + '.</h2><p>Click this <a style="color:blue; text-decoration:underline; cursor:pointer; cursor:hand" href="'
-      + frontURL + '/userutil/?email=' + user.email + '&form=reset">'
-      + 'link</a>, then enter the following code to reset your password: <br><br><strong>'
-      + randomNumba + '</strong></p><p><i>If a reset was requested in error, you can ignore this email and login to web-jam.com as usual.</i></p>';
-      authUtils.sendGridEmail(mailBody, user.email, 'Password Reset');
-    });
-  });
-};
+// exports.resetpass = function resetpass(req, res) {
+//   console.log('email:' + req.body.email);
+//   User.findOne({ email: req.body.email }, (err, user) => {
+//     console.log(user);
+//     if (!user) {
+//       return res.status(401).json({ message: 'incorrect email address' });
+//     }
+//     if (!user.verifiedEmail) {
+//       return res.status(401).json({ message: 'Verify your email address' });
+//     }
+//     const randomNumba = authUtils.generateCode(99999, 10000);
+//     user.resetCode = randomNumba;
+//     user.isPswdReset = true;
+//     return user.save((err) => {
+//       res.status(201).json({ email: user.email });
+//       const mailBody = '<h2>A password reset was requested for ' + user.name
+//       + '.</h2><p>Click this <a style="color:blue; text-decoration:underline; cursor:pointer; cursor:hand" href="'
+//       + frontURL + '/userutil/?email=' + user.email + '&form=reset">'
+//       + 'link</a>, then enter the following code to reset your password: <br><br><strong>'
+//       + randomNumba + '</strong></p><p><i>If a reset was requested in error, you can ignore this email and login to web-jam.com as usual.</i></p>';
+//       authUtils.sendGridEmail(mailBody, user.email, 'Password Reset');
+//     });
+//   });
+// };
 
-exports.passwdreset = function (req, res) {
+exports.passwdreset = function passwdreset(req, res) {
   console.log('email:' + req.body.email + ' resetCode:' + req.body.resetCode);
   User.findOne({ email: req.body.email, resetCode: req.body.resetCode }, (err, user) => {
     console.log(user);
@@ -121,7 +121,7 @@ exports.passwdreset = function (req, res) {
   });
 };
 
-exports.changeemail = function (req, res) {
+exports.changeemail = function changeemail(req, res) {
   console.log('request to change the email address');
   authUtils.checkEmailSyntax(req, res);
   User.findOne({ email: req.body.changeemail }, (err, user) => {
@@ -148,7 +148,7 @@ exports.changeemail = function (req, res) {
   });
 };
 
-exports.updateemail = function (req, res) {
+exports.updateemail = function updateemail(req, res) {
   console.log('validate with pin then change the email address');
   authUtils.checkEmailSyntax(req, res);
   User.findOne({ email: req.body.email }, (err, user) => {

auth/index.js

@@ -1,4 +1,5 @@
 const express = require('express');
+const userController = require('../model/user/user-controller');
 // const authUtils = require('./authUtils');
 const authController = require('./auth.controller.js');
 // var meController = require('./me.controller.js');
@@ -13,10 +14,10 @@ const google = require('./google.js');
 // var foursquare = require('./foursquare');
 const router = express.Router();
 router.post('/signup', authController.signup);
-router.put('/validemail', authController.validemail);
+router.put('/validate-email', userController.validateEmail);
 router.post('/google', google.authenticate);
 router.post('/login', authController.login);
-router.put('/resetpass', authController.resetpass);
+router.put('/resetpass', userController.resetpass);
 router.put('/passwdreset', authController.passwdreset);
 router.put('/changeemail', authController.changeemail); // request is made and verification pin is sent to new email,
 // new email is stored in user.changeemail field

jest.config.json

@@ -0,0 +1,9 @@
+{
+  "verbose": true,
+  "bail": true,
+  "testPathIgnorePatterns": ["/node_modules/", "/test/mocha", "/frontend"],
+  "coverageDirectory": "coverage/jest",
+  "collectCoverage": true,
+  "testEnvironment": "node",
+  "testURL": "http://localhost/"
+}

lib/controller.js

@@ -1,8 +1,10 @@
 const mongoose = require('mongoose');
+const AuthUtils = require('../auth/authUtils');
 
 class Controller {
   constructor(model) {
     this.model = model;
+    this.authUtils = new AuthUtils();
   }
 
   find(req, res, next) {

lib/facade.js

@@ -32,11 +32,13 @@ class Facade {
   //   .exec();
   // }
 
-  // findOne(query) {
-  //   return this.Schema
-  //   .findOne(query)
-  //   .exec();
-  // }
+  findOne(query) {
+    return this.Schema.findOne(query).exec();
+  }
+
+  findOneAndUpdate(conditions, update) {
+    return this.Schema.findOneAndUpdate(conditions, update, { new:true }).exec();
+  }
 
   findById(id) {
     return this.Schema

model/user/user-controller.js

@@ -8,6 +8,42 @@ class UserController extends Controller {
       .then(collection => res.status(200).json(collection))
       .catch(err => res.status(500).json({ message: 'failed to find user by email', error: err }));
   }
+
+  async validateEmail(req, res) {
+    let updatedUser;
+    // try {
+    //   myUser = await this.model.findOne({ email: req.body.email, resetCode: req.body.resetCode });
+    // } catch (e) { return res.status(500).json({ message:e.message }); }
+    // if (myUser === null || myUser === undefined) return res.status(401).json({ message: 'incorrect email or code' });
+    const update = { resetCode: '', isPswdReset:false, verifiedEmail:true };
+    try {
+      updatedUser = await this.model.findOneAndUpdate({ email: req.body.email, resetCode: req.body.resetCode }, update);
+    } catch (e) { return res.status(500).json({ message:e.message }); }
+    if (updatedUser === null || updatedUser === undefined) return res.status(401).json({ message: 'incorrect email or code' });
+    return res.status(200).json(updatedUser);
+  }
+
+  resetpass(req, res) {
+    // console.log('email:' + req.body.email);
+    this.model.findOne({ email: req.body.email }, (err, user) => {
+      if (err) return res.status(500).json(e.message);
+      // console.log(user);
+      if (!user) return res.status(401).json({ message: 'incorrect email address' });
+      if (!user.verifiedEmail) return res.status(401).json({ message: 'Verify your email address' });
+      const randomNumba = authUtils.generateCode(99999, 10000);
+      user.resetCode = randomNumba;
+      user.isPswdReset = true;
+      return user.save((err) => {
+        res.status(200).json({ email: user.email });
+        const mailBody = '<h2>A password reset was requested for ' + user.name
+        + '.</h2><p>Click this <a style="color:blue; text-decoration:underline; cursor:pointer; cursor:hand" href="'
+        + frontURL + '/userutil/?email=' + user.email + '&form=reset">'
+        + 'link</a>, then enter the following code to reset your password: <br><br><strong>'
+        + randomNumba + '</strong></p><p><i>If a reset was requested in error, you can ignore this email and login to web-jam.com as usual.</i></p>';
+        this.authUtils.sendGridEmail(mailBody, user.email, 'Password Reset');
+      });
+    });
+  }
 }
 
 module.exports = new UserController(userModel);