Update Dev Depenedencies + Password Change Fix

meanjs · Mar 30, 2014 · c0a7c05 · c0a7c05
1 parent 12cb3bf
commit c0a7c05
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 36 deletions.
diff --git a/app/controllers/users.js b/app/controllers/users.js
@@ -98,7 +98,7 @@ exports.update = function(req, res) {
 		user = _.extend(user, req.body);
 		user.updated = Date.now();
 		user.displayName = user.firstName + ' ' + user.lastName;
-		
+
 		user.save(function(err) {
 			if (err) {
 				return res.send(400, {
@@ -129,50 +129,56 @@ exports.changePassword = function(req, res, next) {
 	var passwordDetails = req.body;
 	var message = null;
 
-	if (req.user) {
-		User.findById(req.user.id, function(err, user) {
-			if (!err && user) {
-				if (user.authenticate(passwordDetails.currentPassword)) {
-					if (passwordDetails.newPassword === passwordDetails.verifyPassword) {
-						user.password = passwordDetails.newPassword;
-
-						user.save(function(err) {
-							if (err) {
-								return res.send(400, {
-									message: getErrorMessage(err)
-								});
-							} else {
-								req.login(user, function(err) {
-									if (err) {
-										res.send(400, err);
-									} else {
-										res.send({
-											message: 'Password changed successfully'
-										});
-									}
-								});
-							}
-						});
+	if (passwordDetails.currentPassword) {
+		if (req.user) {
+			User.findById(req.user.id, function(err, user) {
+				if (!err && user) {
+					if (user.authenticate(passwordDetails.currentPassword)) {
+						if (passwordDetails.newPassword === passwordDetails.verifyPassword) {
+							user.password = passwordDetails.newPassword;
+
+							user.save(function(err) {
+								if (err) {
+									return res.send(400, {
+										message: getErrorMessage(err)
+									});
+								} else {
+									req.login(user, function(err) {
+										if (err) {
+											res.send(400, err);
+										} else {
+											res.send({
+												message: 'Password changed successfully'
+											});
+										}
+									});
+								}
+							});
 
+						} else {
+							res.send(400, {
+								message: 'Passwords do not match'
+							});
+						}
 					} else {
 						res.send(400, {
-							message: 'Passwords do not match'
+							message: 'Current password is incorrect'
 						});
 					}
 				} else {
 					res.send(400, {
-						message: 'Current password is incorrect'
+						message: 'User is not found'
 					});
 				}
-			} else {
-				res.send(400, {
-					message: 'User is not found'
-				});
-			}
-		});
+			});
+		} else {
+			res.send(400, {
+				message: 'User is not signed in'
+			});
+		}
 	} else {
 		res.send(400, {
-			message: 'User is not signed in'
+			message: 'Please fill current password'
 		});
 	}
 };

diff --git a/package.json b/package.json
@@ -36,8 +36,8 @@
 		"grunt-cli": "~0.1.13"
 	},
 	"devDependencies": {
-		"supertest": "~0.9.0",
-		"should": "~3.1.3",
+		"supertest": "~0.10.0",
+		"should": "~3.2.0",
 		"grunt-env": "~0.4.1",
 		"grunt-node-inspector": "~0.1.3",
 		"grunt-contrib-watch": "~0.6.1",