X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=app.js;h=e63aca44b7ec0f35954d6e4106d25a300733e537;hb=26b8e4f7c71030d49e44fe1d89632ef91b886d67;hp=22c220b92ad1df9a35aa8e29928cd6c060d1b5a4;hpb=b57dbd126734b4398861292c611197c6991ed3eb;p=vchess.git

diff --git a/app.js b/app.js
index 22c220b9..e63aca44 100644
--- a/app.js
+++ b/app.js
@@ -5,6 +5,7 @@ var cookieParser = require('cookie-parser');
 var logger = require('morgan');
 var sassMiddleware = require('node-sass-middleware');
 var favicon = require('serve-favicon');
+var UserModel = require(path.join(__dirname, "models", "User"));
 
 var app = express();
 
@@ -45,21 +46,26 @@ app.use(express.static(path.join(__dirname, 'public')));
 
 // Before showing any page, check + save credentials
 app.use(function(req, res, next) {
-	req.loggedIn = false;
-	res.locals.user = { name: "" };
+	req.userId = 0; //means "anonymous"
+	res.locals.user = { name: "" }; //"anonymous"
 	if (!req.cookies.token)
 		return next();
 	UserModel.getOne("sessionToken", req.cookies.token, function(err, user) {
 		if (!!user)
 		{
-			req.loggedIn = true;
+			req.userId = user.id;
 			res.locals.user = {
-				_id: user._id,
+				id: user.id,
 				name: user.name,
 				email: user.email,
 				notify: user.notify,
 			};
 		}
+		else
+		{
+			// Token in cookies presumably wrong: erase it
+			res.clearCookie("token");
+		}
 		next();
 	});
 });