Merge branch 'master' of https://github.com/techx/quill

techx · Jan 22, 2018 · 15b59ff · 15b59ff
2 parents 0e575da + c7721ad
commit 15b59ff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/app.js b/app.js
@@ -7,7 +7,6 @@ var express         = require('express');
 var bodyParser      = require('body-parser');
 var methodOverride  = require('method-override');
 var morgan          = require('morgan');
-var cookieParser    = require('cookie-parser');
 
 var mongoose        = require('mongoose');
 var port            = process.env.PORT || 3000;
@@ -22,7 +21,6 @@ var app             = express();
 mongoose.connect(database);
 
 app.use(morgan('dev'));
-app.use(cookieParser());
 
 app.use(bodyParser.urlencoded({
   extended: true

diff --git a/app/client/src/routes.js b/app/client/src/routes.js
@@ -63,6 +63,9 @@ angular.module('reg')
         url: "/application",
         templateUrl: "views/application/application.html",
         controller: 'ApplicationCtrl',
+        data: {
+          requireVerified: true
+        },
         resolve: {
           currentUser: function(UserService){
             return UserService.getCurrentUser();

diff --git a/app/server/controllers/UserController.js b/app/server/controllers/UserController.js
@@ -406,7 +406,7 @@ UserController.declineById = function (id, callback){
 UserController.verifyByToken = function(token, callback){
   User.verifyEmailVerificationToken(token, function(err, email){
     User.findOneAndUpdate({
-      email: new RegExp('^' + email + '$', 'i')
+      email: email.toLowerCase()
     },{
       $set: {
         'verified': true
@@ -715,4 +715,4 @@ UserController.getStats = function(callback){
   return callback(null, Stats.getUserStats());
 };
 
-module.exports = UserController;
+module.exports = UserController;
diff --git a/app/server/models/User.js b/app/server/models/User.js
@@ -309,7 +309,7 @@ schema.statics.verifyTempAuthToken = function(token, callback){
 
 schema.statics.findOneByEmail = function(email){
   return this.findOne({
-    email: new RegExp('^' + email + '$', 'i')
+    email: email.toLowerCase()
   });
 };
 

diff --git a/package.json b/package.json
@@ -8,7 +8,6 @@
     "bcrypt-nodejs": "0.0.3",
     "body-parser": "^1.8.4",
     "bower": "^1.8.0",
-    "cookie-parser": "~1.3.2",
     "dotenv": "^1.2.0",
     "email-templates": "^2.0.1",
     "express": "^4.9.8",
@@ -20,7 +19,7 @@
     "gulp-sass": "^2.3.2",
     "gulp-sourcemaps": "^1.12.0",
     "gulp-uglify": "^1.5.4",
-    "handlebars": "^3.0.3",
+    "handlebars": "^4.0.11",
     "jsonwebtoken": "5.0.4",
     "method-override": "^2.3.5",
     "moment": "^2.10.3",