Merge pull request #265 from WebJamApps/dev

Promote to master

Author: JoshuaVSherman

.circleci/config.yml

@@ -4,14 +4,14 @@ 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:8.9.4-browsers
+      - image: circleci/node:8.10.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:
       - checkout
       - run:
           name: Install globals
-          command: 'sudo npm install -g npm@latest && sudo npm install -g bower@latest && sudo npm install -g codeclimate-test-reporter'
+          command: 'sudo npm install -g npm@latest && sudo npm install -g codeclimate-test-reporter'
       - restore_cache:
           key: dependency-cache-{{ checksum "package.json" }}
       - run:
@@ -23,13 +23,13 @@ jobs:
             - node_modules
   test:
     docker:
-      - image: circleci/node:8.9.4-browsers
+      - image: circleci/node:8.10.0-browsers
       #- image: mongo:3.4.4
     steps:
       - checkout
       - run:
           name: Test install
-          command: 'sudo npm install -g npm@latest && sudo npm install -g bower@latest && sudo npm install -g codeclimate-test-reporter && yarn install'
+          command: 'sudo npm install -g npm@latest && sudo npm install -g codeclimate-test-reporter && yarn install'
       #- run:
       #    name: ubuntu dependancies
       #    command: 'sudo apt-get update -y && sudo apt-get install -y apt-utils gconf-service libasound2 libatk1.0-0 libcups2 libdbus-1-3 libgconf-2-4 libgtk-3-0 libnspr4 libxcomposite1 libxss1 fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils'

auth/auth.controller.js

@@ -60,7 +60,7 @@ exports.login = function(req, res) {
     } if (user.password === '' || user.password === null || user.password === undefined) {
       return res.status(401).json({ message: 'Please reset your password' });
     } if (!user.verifiedEmail) {
-      return res.status(401).json({ message: 'Verify your email' });
+      return res.status(401).json({ message: '<a href="/userutil">Verify</a> your email' });
     }
     // authUtils.verifySaveUser(user, req, res);
     user.comparePassword(req.body.password, (err, isMatch) => {
@@ -131,7 +131,7 @@ exports.changeemail = function(req, res) {
         res.status(201).json({ success: true });
         const mailBody = '<h2>An Email Address Change was Requested for ' + existinguser.name + '.</h2><p>Click this <a style="color:blue; text-decoration:underline; cursor:pointer; cursor:hand" href="' +
         frontURL + '/userutil/?changeemail=' + existinguser.changeemail + '">' +
-        'link</a>, then enter the following code to validate this new email: <br><br><strong>' + existinguser.resetCode + '</strong></p><p><i>If this reset was requested in error, you can ignore it and login as usual.</i></p>';
+        'link</a>, then enter the following code to validate this new email: <br><br><strong>' + existinguser.resetCode + '</strong></p><p><i>If this email change was requested in error, you can ignore it and login as usual.</i></p>';
         authUtils.sendGridEmail(mailBody, existinguser.changeemail, 'Email Change Request');
       });
     });

package.json

@@ -1,18 +1,17 @@
 {
   "name": "web-jam-back",
-  "version": "0.7.6",
+  "version": "0.7.7",
   "description": "web-jam.com",
   "main": "index.js",
   "engines": {
-    "node": "8.9.4",
-    "npm": "5.6.0"
+    "node": "8.10.0"
   },
   "license": "MIT",
   "scripts": {
-    "installglobals": "npm install -g npm@latest && npm install -g bower@latest",
+    "installglobals": "npm install -g npm@latest",
     "postinstall": "./postinstall.sh",
     "dev": "nodemon index.js",
-    "build:prod": "(cd frontend || exit; npm run vulc && npm start -- build)",
+    "build:prod": "(cd frontend || exit; npm start -- build)",
     "start": "node index.js",
     "cleaninstall": "rm -rf yarn.lock && rm -rf node_modules && yarn cache clean && npm run installglobals && yarn install",
     "debug": "node --inspect-brk index.js",
@@ -59,7 +58,7 @@
     "mockgoose": "^6.0.8",
     "nock": "^9.0.13",
     "nodemon": "^1.9.2",
-    "sinon": "^1.17.6"
+    "sinon": "^4.4.6"
   },
   "snyk": true
 }