closes #4261

src/controllers/authentication.js

@@ -87,8 +87,7 @@ function registerAndLoginUser(req, res, userData, callback) {
 		function(_uid, next) {
 			uid = _uid;
 			if (res.locals.processLogin === true) {
-				user.logIP(uid, req.ip);
+				doLogin(req, uid, next);
-				req.login({uid: uid}, next);
 			} else {
 				next();
 			}
@@ -172,19 +171,36 @@ function continueLogin(req, res, next) {
 				res.status(200).send(nconf.get('relative_path') + '/reset/' + code);
 			});
 		} else {
-			req.login({
+			doLogin(req, userData.uid, function(err) {
-				uid: userData.uid
-			}, function(err) {
 				if (err) {
 					return res.status(403).send(err.message);
 				}
 
-				if (userData.uid) {
+				if (!req.session.returnTo) {
+					res.status(200).send(nconf.get('relative_path') + '/');
+				} else {
+					var next = req.session.returnTo;
+					delete req.session.returnTo;
+
+					res.status(200).send(next);
+				}
+			});
+		}
+	})(req, res, next);
+}
+
+function doLogin(req, uid, callback) {
+	req.login({uid: uid}, function(err) {
+		if (err) {
+			return callback(err);
+		}
+
+		if (uid) {
 			var uuid = utils.generateUUID();
 			req.session.meta = {};
 
 			// Associate IP used during login with user account
-					user.logIP(userData.uid, req.ip);
+			user.logIP(uid, req.ip);
 			req.session.meta.ip = req.ip;
 
 			// Associate metadata retrieved via user-agent
@@ -197,24 +213,15 @@ function continueLogin(req, res, next) {
 			});
 
 			// Associate login session with user
-					user.auth.addSession(userData.uid, req.sessionID);
+			user.auth.addSession(uid, req.sessionID);
-					db.setObjectField('uid:' + userData.uid + 'sessionUUID:sessionId', uuid, req.sessionID);
+			db.setObjectField('uid:' + uid + 'sessionUUID:sessionId', uuid, req.sessionID);
 
-					plugins.fireHook('action:user.loggedIn', userData.uid);
+			plugins.fireHook('action:user.loggedIn', uid);
 		}
 
-				if (!req.session.returnTo) {
+		callback();
-					res.status(200).send(nconf.get('relative_path') + '/');
-				} else {
-					var next = req.session.returnTo;
-					delete req.session.returnTo;
-
-					res.status(200).send(next);
-				}
 	});
 }
-	})(req, res, next);
-}
 
 authenticationController.localLogin = function(req, username, password, next) {
 	if (!username) {