X-Git-Url: https://git.auder.net/?p=qomet.git;a=blobdiff_plain;f=models%2Fuser.js;h=4b66c88f9ed286c1794309945b06b711d92e3522;hp=c6fa7764e8ee90685bd4b5915a26bd1f4c363eb8;hb=43828378be054cf3604b753e8d9ab24af911188f;hpb=7a7dc732599b358b25b770cfc27036f4b403d1b4

diff --git a/models/user.js b/models/user.js
index c6fa776..4b66c88 100644
--- a/models/user.js
+++ b/models/user.js
@@ -1,15 +1,160 @@
-const UserEntity = require("../entities/user");
 const params = require("../config/parameters");
+const db = require("../utils/database");
 
 const UserModel =
 {
+	/*
+	 * Structure:
+	 *   _id: BSON id
+	 *   ** Strings, identification informations:
+	 *   email
+	 *   name
+	 *   initials : computed, Benjamin Auder --> ba ...etc
+	 *   loginToken: {
+	 *     value: string
+	 *     timestamp: datetime (validity)
+	 *     ip: address of requesting machine
+	 *   }
+	 *   sessionTokens (array): cookie identification
+	 */
+
+	// BASIC FUNCTIONS
+	//////////////////
+
+	getInitialsByPrefix: function(prefix, cb)
+	{
+		db.users.find(
+			{ initials: new RegExp("^" + prefix) },
+			{ initials: 1, _id: 0 },
+			cb
+		);
+	},
+
+	insert: function(newUser, cb)
+	{
+		db.users.insert(Object.assign({},
+			newUser,
+			{
+				loginToken: { },
+				sessionTokens: [ ],
+			}),
+			cb
+		);
+	},
+
+	getByLoginToken: function(token, cb)
+	{
+		db.users.findOne(
+			{ "loginToken.value": token },
+			cb
+		);
+	},
+
+	getBySessionToken: function(token, cb)
+	{
+		db.users.findOne(
+			{ sessionTokens: token},
+			cb
+		);
+	},
+
+	getById: function(uid, cb)
+	{
+		db.users.findOne(
+			{ _id: uid },
+			cb
+		);
+	},
+
+	getByEmail: function(email, cb)
+	{
+		db.users.findOne(
+			{ email: email },
+			cb
+		);
+	},
+
+	getByInitials: function(initials, cb)
+	{
+		db.users.findOne(
+			{ initials: initials },
+			cb
+		);
+	},
+
+	getUnlogged: function(cb)
+	{
+		var tsNow = new Date().getTime();
+		// 86400000 = 24 hours in milliseconds
+		var day = 86400000;
+		db.users.find({}, (err,userArray) => {
+			let unlogged = userArray.filter( u => {
+				return u.sessionTokens.length==0 && u._id.getTimestamp().getTime() + day < tsNow;
+			});
+			cb(err, unlogged);
+		});
+	},
+
+	getAll: function(cb)
+	{
+		db.users.find({}, cb);
+	},
+
+	setLoginToken: function(token, uid, ip, cb)
+	{
+		db.users.update(
+			{ _id: uid },
+			{ $set: { loginToken: {
+					value: token,
+					timestamp: new Date().getTime(),
+					ip: ip,
+				}}
+			},
+			cb
+		);
+	},
+
+	setSessionToken: function(token, uid, cb)
+	{
+		// Also empty the login token to invalidate future attempts
+		db.users.update(
+			{ _id: uid },
+			{
+				$set: { loginToken: {} },
+				$push: { sessionTokens: {
+					$each: [token],
+					$slice: -7 //only allow 7 simultaneous connections per user (TODO?)
+				}}
+			},
+			cb
+		);
+	},
+
+	removeToken: function(uid, token, cb)
+	{
+		db.users.update(
+			{ _id: uid },
+			{ $pull: {sessionTokens: token} },
+			cb
+		);
+	},
+
+	// TODO: later, allow account removal
+	remove: function(uids)
+	{
+		db.users.remove({_id: uids});
+	},
+
+	/////////////////////
+	// ADVANCED FUNCTIONS
+
 	create: function(newUser, callback)
 	{
 		// Determine initials from name parts
 		let nameParts = newUser.name.split(/[ -]+/);
 		let initials = nameParts.map( n => { return n.charAt(0).toLowerCase(); }).join("");
 		// First retrieve all users with similar prefix initials
-		UserEntity.getInitialsByPrefix(initials, (err,userArray) => {
+		UserModel.getInitialsByPrefix(initials, (err,userArray) => {
 			if (!!userArray && userArray.length == 1)
 				initials = initials + "2"; //thus number == users count for this hash
 			else if (!!userArray && userArray.length > 1)
@@ -25,7 +170,7 @@ const UserModel =
 				initials = initials + (Math.max(...numbers)+1);
 			}
 			Object.assign(newUser, {initials: initials});
-			UserEntity.insert(newUser, callback);
+			UserModel.insert(newUser, callback);
 		});
 	},
 
@@ -41,15 +186,10 @@ const UserModel =
 		return false;
 	},
 
-	logout: function(uid, token, cb)
-	{
-		UserEntity.removeToken(uid, token, cb);
-	},
-
 	cleanUsersDb: function()
 	{
-		UserEntity.getUnlogged( (err,unlogged) => {
-			UserEntity.remove(unlogged);
+		UserModel.getUnlogged( (err,unlogged) => {
+			UserModel.remove(unlogged);
 		});
 	},
 }