use uid instead of socket.uid

src/socket.io/user.js

@@ -84,16 +84,19 @@ SocketUser.reset.send = function(socket, email, callback) {
 };
 
 SocketUser.reset.commit = function(socket, data, callback) {
-	if(data && data.code && data.password) {
-		async.series([
-			async.apply(db.getObjectField, 'reset:uid', data.code),
-			async.apply(user.reset.commit, data.code, data.password)
-		], function(err, data) {
+	if (!data || !data.code || !data.password) {
+		return callback(new Error('[[error:invalid-data]]'));
+	}
+
+	async.parallel({
+		uid: async.apply(db.getObjectField, 'reset:uid', data.code),
+		reset: async.apply(user.reset.commit, data.code, data.password)
+	}, function(err, results) {
 		if (err) {
 			return callback(err);
 		}
 
-			var uid = data[0],
+		var uid = results.uid,
 			now = new Date(),
 			parsedDate = now.getFullYear() + '/' + (now.getMonth()+1) + '/' + now.getDate();
 
@@ -105,14 +108,14 @@ SocketUser.reset.commit = function(socket, data, callback) {
 				subject: '[[email:reset.notify.subject]]'
 			});
 		});
+
 		events.log({
 			type: 'password-reset',
-				uid: socket.uid,
+			uid: uid,
 			ip: socket.ip
 		});
 		callback();
 	});
-	}
 };
 
 SocketUser.checkStatus = function(socket, uid, callback) {