From 065f2a47f60866f9d44836e7978ec727af66d5e0 Mon Sep 17 00:00:00 2001 From: David Baldwynn Date: Thu, 5 Nov 2015 17:22:16 -0800 Subject: [PATCH] added stuff --- .../users.authentication.server.controller.js | 40 ++++++++++++------- .../users.authorization.server.controller.js | 2 +- .../users/users.profile.server.controller.js | 4 +- app/routes/users.server.routes.js | 2 +- package.json | 2 +- public/modules/forms/css/form.css | 4 +- .../views/directiveViews/field/checkbox.html | 4 +- .../views/directiveViews/field/legal.html | 6 +-- .../views/directiveViews/field/radio.html | 2 +- .../controllers/verify.client.controller.js | 18 +++++---- .../resend-verify-email.client.view.html | 7 ++-- .../verify/verify-account.client.view.html | 4 +- 12 files changed, 55 insertions(+), 40 deletions(-) diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index a0cd0ec1..6a4595c3 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -58,13 +58,19 @@ config_nev(); var smtpTransport = nodemailer.createTransport(config.mailer.options); exports.validateVerificationToken = function(req, res){ - console.log('validateVerificationToken'); - console.log('token: '+req.params.token+'\n\n'); - nev.confirmTempUser(req.params.token, function(user, err) { + // console.log('validateVerificationToken'); + // console.log('token: '+req.params.token+'\n\n'); + + console.log('res.headerSent: '+res.headersSent); + nev.confirmTempUser(req.params.token, function(err, user) { if(err) { - res.status(500).send( {message: errorHandler.getErrorMessage(err) } ); - }else if (user){ - res.status(200).send('User successfully verified'); + console.log(errorHandler.getErrorMessage(err)); + console.log(err) + return res.status(500).send( {message: errorHandler.getErrorMessage(err) } ); + } + + else if (user){ + return res.status(200).send('User successfully verified'); }else { // redirect to resend verification email return res.status(400).send( {message: 'Verification token is invalid or has expired'} ); @@ -76,12 +82,15 @@ exports.resendVerificationEmail = function(req, res, next){ nev.resendVerificationEmail(req.body.email, function(err, userFound) { if(err) { console.log(errorHandler.getErrorMessage(err)); - res.status(500).send( {message: errorHandler.getErrorMessage(err) } ); - }else if (userFound){ + return res.status(500).send( {message: errorHandler.getErrorMessage(err) } ); + } + + if (userFound){ + console.log('hello'); res.status(200).send('Verification email successfully Re-Sent'); }else { // user hasn't been found yet - res.status(400).send( {message: 'Error: Verification Email could NOT be sent'} ); + res.status(400).send( {message: 'Error: User has not been registered yet'} ); } }); }; @@ -107,7 +116,7 @@ exports.signup = function(req, res) { if (err) { console.log('Error: '); console.log(err); - res.status(400).send({ + return res.status(400).send({ message: errorHandler.getErrorMessage(err) }); }else { @@ -118,17 +127,17 @@ exports.signup = function(req, res) { if (err) { console.log('Error: '); console.log(err); - res.status(400).send({ + return res.status(400).send({ message: errorHandler.getErrorMessage(err) }); }else { console.log('new tmpuser registered'); - res.status(200).send('An email has been sent to you. Please check it to verify your account.'); + return res.status(200).send('An email has been sent to you. Please check it to verify your account.'); } }); } else { - console.log('Error: Temp user already exists!'); - res.status(400).send({ message: 'Error: Temp user already exists!' }); + console.log('Error: User already exists!'); + return res.status(400).send({ message: 'Error: User already exists!' }); } } }); @@ -153,7 +162,7 @@ exports.signin = function(req, res, next) { message: errorHandler.getErrorMessage(err) }); } else { - res.json(user); + return res.json(user); } }); } @@ -166,6 +175,7 @@ exports.signin = function(req, res, next) { exports.signout = function(req, res) { req.logout(); res.redirect('/'); + return res.end(); }; /** diff --git a/app/controllers/users/users.authorization.server.controller.js b/app/controllers/users/users.authorization.server.controller.js index adff350b..683fdd8f 100755 --- a/app/controllers/users/users.authorization.server.controller.js +++ b/app/controllers/users/users.authorization.server.controller.js @@ -40,7 +40,7 @@ exports.requiresLogin = function(req, res, next) { message: 'User is not logged in' }); }else { - next(); + return next(); } }; diff --git a/app/controllers/users/users.profile.server.controller.js b/app/controllers/users/users.profile.server.controller.js index b1ecd3e7..dc2d0132 100755 --- a/app/controllers/users/users.profile.server.controller.js +++ b/app/controllers/users/users.profile.server.controller.js @@ -51,7 +51,7 @@ exports.update = function(req, res) { /** * Send User */ -exports.me = function(req, res) { +exports.getUser = function(req, res) { var _user = req.user; delete _user.password; delete _user.salt; @@ -59,4 +59,6 @@ exports.me = function(req, res) { delete _user.__v; res.json(req.user || null); + + res.end(); }; diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index 108f4f79..c459a8c5 100755 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -10,7 +10,7 @@ module.exports = function(app) { var users = require('../../app/controllers/users.server.controller'); // Setting up the users profile api - app.route('/users/me').get(users.requiresLogin, users.me); + app.route('/users/me').get(users.requiresLogin, users.getUser); app.route('/users').put(users.requiresLogin, users.update); app.route('/users/accounts').delete(users.requiresLogin, users.removeOAuthProvider); diff --git a/package.json b/package.json index e638dfc2..48259eaa 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "connect-mongo": "~0.8.1", "consolidate": "~0.10.0", "cookie-parser": "~1.3.2", - "email-verification": "~0.3.1", + "email-verification": "github.com/whitef0x0/node-email-verification", "express": "~4.10.1", "express-session": "~1.9.1", "forever": "~0.11.0", diff --git a/public/modules/forms/css/form.css b/public/modules/forms/css/form.css index b3520dda..6e739caf 100644 --- a/public/modules/forms/css/form.css +++ b/public/modules/forms/css/form.css @@ -89,7 +89,7 @@ form .row.field { form .row.field > .field-input { font-size: 1.4em; color: #777; - width: inherit; + /*width: inherit;*/ } form.submission-form .row.field.statement > .field-title { font-size:1.7em; @@ -140,7 +140,7 @@ form .row.field { padding: 0.45em 0.9em; width: 100%; line-height: 160%; - border: 3px dashed #ddd; + border: 2px dashed #ddd!important; } form .field-input > input.text-field-input:focus{ border: 0; diff --git a/public/modules/forms/views/directiveViews/field/checkbox.html b/public/modules/forms/views/directiveViews/field/checkbox.html index 07312c46..3212d2c2 100755 --- a/public/modules/forms/views/directiveViews/field/checkbox.html +++ b/public/modules/forms/views/directiveViews/field/checkbox.html @@ -1,5 +1,5 @@
-
{{field.title}} (* required)
+
{{field.title}} (* required)
@@ -12,7 +12,7 @@ ng-required="field.required" ng-disabled="field.disabled" ng-init="field.fieldValue = field.fieldOptions[0].option_id"/> - +
diff --git a/public/modules/forms/views/directiveViews/field/legal.html b/public/modules/forms/views/directiveViews/field/legal.html index ab0ca2f1..2b71459c 100644 --- a/public/modules/forms/views/directiveViews/field/legal.html +++ b/public/modules/forms/views/directiveViews/field/legal.html @@ -4,13 +4,13 @@

{{field.description}}

-
+
-