larvituser 0.18.0 → 0.19.1

package/dataWriter.js

@@ -247,6 +247,7 @@ DataWriter.prototype.create = function create(params, deliveryTag, msgUuid, cb)
 		if (results.affectedRows === 0) {
 			const	err	= new Error('No user created, duplicate key on uuid: "' + params.uuid + '" or username: "' + params.username + '"');
 			that.log.warn(logPrefix + err.message);
+			that.emitter.emit(msgUuid, err);
 			return cb(err);
 		}
 

package/index.js

@@ -62,9 +62,7 @@ function User(options, cb) {
 		'mode':	that.mode,
 		'log':	that.log,
 		'db':	that.db,
-		'amsync_host':	that.options.amsync_host || null,
-		'amsync_minPort':	that.options.amsync_minPort || null,
-		'amsync_maxPort':	that.options.amsync_maxPort || null
+		'amsync': that.options.amsync,
 	}, function (err) {
 		if (err) return cb(err);
 
@@ -346,6 +344,9 @@ User.prototype.fromUserAndPass = function fromUserAndPass(username, password, cb
 		userUuid,
 		userObj;
 
+	if (typeof username !== 'string') return cb(new Error('Username must be a string'), false);
+	if (typeof password !== 'string') return cb(new Error('Password must be a string'), false);
+
 	username	= username.trim();
 	password	= password.trim();
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larvituser",
-  "version": "0.18.0",
+  "version": "0.19.1",
   "author": {
     "name": "Mikael 'Lilleman' Göransson",
     "email": "lilleman@larvit.se",
@@ -19,7 +19,7 @@
   "description": "User module for node.js",
   "devDependencies": {
     "freeport": "1.0.5",
-    "mocha": "6.1.4",
+    "mocha": "6.2.2",
     "mocha-eslint": "5.0.0"
   },
   "scripts": {

package/test/00test.js

@@ -53,6 +53,11 @@ before(function (done) {
 		});
 	});
 
+	// Clear DB
+	tasks.push(function (cb) {
+		db.removeAllTables(cb);
+	});
+
 	// Check for empty db
 	tasks.push(function (cb) {
 		db.query('SHOW TABLES', function (err, rows) {
@@ -202,6 +207,23 @@ describe('User', function () {
 			});
 		});
 
+		it('should fail to log in user if username is an array', function (done) {
+			userLib.fromUserAndPass(['lill', 'eman'], 'foobar', function (err, user) {
+				assert(err.message === 'Username must be a string', 'Error should be "Username must be a string"');
+				assert(user === false, 'user should be false');
+				done();
+			});
+		});
+
+
+		it('should fail to log in user if password is an array', function (done) {
+			userLib.fromUserAndPass('lilleman', ['foo', 'bar'], function (err, user) {
+				assert(err.message === 'Password must be a string', 'Error should be "Password must be a string"');
+				assert(user === false, 'user should be false');
+				done();
+			});
+		});
+
 		it('should log in user by field', function (done) {
 			userLib.fromField('firstname', 'migal', function (err, user) {
 				if (err) throw err;

package/users.js

@@ -138,7 +138,9 @@ Users.prototype.get = function (cb) {
 			if (err) return cb(err);
 
 			let	sql = 'SELECT user_users.uuid as uuid, user_users.username as username',
-				allowedSortables = ['uuid', 'username'];
+				allowedSortables = ['uuid', 'username'],
+				mainDbFields = dbFields.slice(0);
+
 
 			if (that.returnFields !== undefined && ! Array.isArray(that.returnFields)) {
 				that.returnFields = [that.returnFields];
@@ -154,7 +156,7 @@ Users.prototype.get = function (cb) {
 						sql += ', group_concat(user_users_data.data) as ' + dbCon.escapeId(that.order.by) + ' FROM user_users ';
 						sql += 'LEFT JOIN user_users_data on (user_users_data.fieldUuid = (SELECT uuid FROM user_data_fields WHERE name = ?) AND user_users_data.userUuid = user_users.uuid) ';
 						sql += 'WHERE 1 ';
-						dbFields.unshift(that.order.by);
+						mainDbFields.unshift(that.order.by);
 					} else {
 						sql += ' FROM user_users WHERE 1 ';
 					}
@@ -185,7 +187,7 @@ Users.prototype.get = function (cb) {
 				}
 			}
 
-			dbCon.query(sql, dbFields, function (err, rows) {
+			dbCon.query(sql, mainDbFields, function (err, rows) {
 				dbCon.release();
 				if (err) return cb(err);
 
@@ -267,7 +269,6 @@ Users.prototype.get = function (cb) {
 			if (err) return cb(err);
 
 			totalElements	= rows[0].totalElements;
-
 			cb(err);
 		});
 	});

package/controllers/adminUsers/edit.js

@@ -1,180 +0,0 @@
-'use strict';
-
-const	userLib	= require('larvituser'),
-	async	= require('async');
-
-exports.run = function (req, res, cb) {
-	const	tasks	= [],
-		data	= {'global': res.globalData};
-
-	data.global.errors = [];
-
-	// Make sure the user have the correct rights
-	// This is set in larvitadmingui controllerGlobal
-	if ( ! res.adminRights) {
-		cb(new Error('Invalid rights'), req, res, {});
-		return;
-	}
-
-	data.global.menuControllerName	= 'adminUsers';
-
-	if (data.global.formFields.save !== undefined) {
-		const	userFields	= {};
-
-		let	newPassword,
-			user;
-
-		if (data.global.formFields.disableLogin === 'yes') {
-			newPassword = false;
-		} else {
-			newPassword = data.global.formFields.password.trim();
-		}
-
-		// Format userFields
-		for (let i = 0; data.global.formFields.fieldName[i] !== undefined; i ++) {
-			const	fieldName	= data.global.formFields.fieldName[i],
-				fieldValue	= data.global.formFields.fieldValue[i];
-
-			if (fieldValue !== '' && fieldValue !== undefined) {
-				if (userFields[fieldName] === undefined) {
-					userFields[fieldName] = [];
-				}
-
-				userFields[fieldName].push(fieldValue);
-			}
-		}
-
-		// Create user if it did not exist
-		if (data.global.urlParsed.query.uuid === undefined) {
-
-			// Check so username is not taken
-			tasks.push(function (cb) {
-				userLib.usernameAvailable(data.global.formFields.username.trim(), function (err, result) {
-					if (err) return cb(err);
-
-					if (result !== true) {
-						const	err	= new Error('Username is taken by another user');
-						data.global.errors.push(err.message);
-						return cb(err);
-					}
-
-					cb(err);
-				});
-			});
-
-			// Create the user
-			tasks.push(function (cb) {
-				if (data.global.errors.length) return cb();
-
-				userLib.create(data.global.formFields.username, newPassword, userFields, function (err, result) {
-					user = result;
-					cb(err);
-				});
-			});
-		} else {
-			tasks.push(function (cb) {
-				userLib.fromUuid(data.global.urlParsed.query.uuid, function (err, result) {
-					user = result;
-					cb(err);
-				});
-			});
-		}
-
-		// Update username
-		tasks.push(function (cb) {
-			if ( ! user) {
-				throw new Error('No user set');
-			}
-
-			data.global.formFields.username = data.global.formFields.username.trim();
-
-			if (data.global.formFields.username === user.username) return cb();
-
-			userLib.usernameAvailable(data.global.formFields.username, function (err, result) {
-				if (err) return cb(err);
-
-				if (result !== true) {
-					data.global.errors.push('Username is taken by another user');
-				}
-
-				cb(err);
-			});
-		});
-
-		tasks.push(function (cb) {
-			if (data.global.formFields.username === user.username) return cb();
-
-			if (data.global.errors.length) return cb();
-
-			user.setUsername(data.global.formFields.username.trim(), cb);
-		});
-
-		// Update password
-		if (newPassword !== '' || newPassword === false) {
-			tasks.push(function (cb) {
-				if (data.global.errors.length) return cb();
-
-				user.setPassword(newPassword, cb);
-			});
-		}
-
-		// Replace user fields
-		tasks.push(function (cb) {
-			if (data.global.errors.length) return cb();
-
-			user.replaceFields(userFields, cb);
-		});
-
-		tasks.push(function (cb) {
-			if (data.global.errors.length) return cb();
-
-			if (data.global.urlParsed.query.uuid === undefined) {
-				req.session.data.nextCallData = {'global': {'messages': ['New user created']}};
-				res.statusCode = 302;
-				res.setHeader('Location', '/adminUsers/edit?uuid=' + user.uuid);
-			} else {
-				data.global.messages = ['Saved'];
-			}
-
-			cb();
-		});
-	}
-
-	if (data.global.formFields.rmUser !== undefined) {
-		tasks.push(function (cb) {
-			userLib.rmUser(data.global.urlParsed.query.uuid, function (err) {
-				if (err) return cb(err);
-
-				req.session.data.nextCallData = {'global': {'messages': ['User "' + data.global.urlParsed.query.uuid + '" erased']}};
-				res.statusCode = 302;
-				res.setHeader('Location', '/adminUsers/list');
-				cb();
-			});
-		});
-	}
-
-	if (data.global.urlParsed.query.uuid !== undefined) {
-		tasks.push(function (cb) {
-			userLib.fromUuid(data.global.urlParsed.query.uuid, function (err, user) {
-				if (err) return cb(err);
-
-				data.user = {
-					'uuid':	user.uuid,
-					'username':	user.username,
-					'passwordIsFalse':	user.passwordIsFalse,
-					'fields':	user.fields
-				};
-
-				cb();
-			});
-		});
-	}
-
-	async.series(tasks, function (err) {
-		if (err && ! data.global.errors) {
-			cb(err, req, res, data);
-		} else {
-			cb(null, req, res, data);
-		}
-	});
-};

package/controllers/adminUsers/list.js

@@ -1,47 +0,0 @@
-'use strict';
-
-const	userLib	= require(__dirname + '/../../index.js'),
-	async	= require('async');
-
-exports.run = function (req, res, cb) {
-	const	tasks	= [],
-		data	= {'global': res.globalData};
-
-	// Make sure the user have the correct rights
-	// This is set in larvitadmingui controllerGlobal
-	if ( ! res.adminRights) {
-		cb(new Error('Invalid rights'), req, res, {});
-		return;
-	}
-
-	data.global.menuControllerName	= 'adminUsers';
-	data.pagination	= {};
-	data.pagination.urlParsed	= data.global.urlParsed;
-	data.pagination.elementsPerPage	= 100;
-
-	tasks.push(function (cb) {
-		const	users	= new userLib.Users();
-
-		//users.returnFields	= ['firstname', 'lastname'];
-		users.limit	= data.pagination.elementsPerPage;
-		users.offset	= parseInt(data.global.urlParsed.query.offset)	|| 0;
-
-		if (isNaN(users.offset) || users.offset < 0) {
-			users.offset = 0;
-		}
-
-		//if (data.global.urlParsed.query.filterStatus) {
-		//	users.matchAllFields = {'status': data.global.urlParsed.query.filterStatus};
-		//}
-
-		users.get(function (err, result, totalElements) {
-			data.users	= result;
-			data.pagination.totalElements	= totalElements;
-			cb(err);
-		});
-	});
-
-	async.series(tasks, function (err) {
-		cb(err, req, res, data);
-	});
-};

package/public/tmpl/adminUsers/edit.tmpl

@@ -1,71 +0,0 @@
-<%= _.render('inc/head', obj) %>
-<%= _.render('inc/pageTop', obj) %>
-<form method="post">
-
-	<div class="row">
-		<div class="six columns">
-			<label for="uuid">Uuid</label>
-			<input class="u-full-width" type="text" name="uuid" placeholder="auto generated" readonly="readonly" value="<%= obj.global.urlParsed.query.uuid %>" />
-		</div>
-
-		<div class="six columns">
-			<label for="disableLogin">
-				<input id="disableLogin" name="disableLogin" type="checkbox" value="yes" <% if (obj.user && obj.user.passwordIsFalse === true) { print('checked="checked"');} %> />
-				<span class="label-body">Disable login (will erase the password)</span>
-			</label>
-		</div>
-	</div>
-
-	<div class="row">
-		<div class="six columns">
-			<label for="username">Username</label>
-			<input class="u-full-width" type="text" name="username" value="<%= obj.user ? obj.user.username : '' %>" />
-		</div>
-
-		<div class="six columns">
-			<label for="password">Password (Leave empty to not change the password)</label>
-			<input class="u-full-width" type="password" name="password" />
-		</div>
-	</div>
-
-	<h2>Fields</h2>
-	<% if (obj.user) { %>
-		<% _.forEach(obj.user.fields, function (fieldValues, fieldName) { %>
-			<% if ( ! (fieldValues instanceof Array)) { fieldValues = [fieldValues]; } %>
-			<% for (var i = 0; fieldValues[i] !== undefined; i ++) { %>
-				<div class="row">
-					<div class="six columns">
-						<label for="fieldName[]">Field Name</label>
-						<input class="u-full-width" type="text" name="fieldName[]" value="<%= fieldName %>" />
-					</div>
-
-					<div class="six columns">
-						<label for="fieldValue[]">Field Value</label>
-						<input class="u-full-width" type="text" name="fieldValue[]" value="<%= fieldValues[i] %>" />
-					</div>
-				</div>
-			<% }; %>
-		<% }); %>
-	<% }; %>
-
-	<div class="row">
-		<div class="six columns">
-			<label for="fieldName[]">Field Name</label>
-			<input class="u-full-width" type="text" name="fieldName[]" value="" />
-		</div>
-
-		<div class="six columns">
-			<label for="fieldValue[]">Field Value</label>
-			<input class="u-full-width" type="text" name="fieldValue[]" value="" />
-		</div>
-	</div>
-
-	<div class="controls clearfix">
-		<button type="submit" name="save" class="button right inv">Save</button>
-		<a class="button left" href="/adminUsers/list">Cancel</a>
-		<% if (global.urlParsed.query.uuid) { %>
-			<button type="submit" name="rmUser" class="button left warning" value="true">Delete user</button>
-		<% } %>
-	</div>
-</form>
-<%= _.render('inc/pageBottom', obj) %>

package/public/tmpl/adminUsers/list.tmpl

@@ -1,22 +0,0 @@
-<%= _.render('inc/head', obj) %>
-<%= _.render('inc/pageTop', obj) %>
-<form method="post">
-	<table>
-		<thead>
-			<tr>
-				<th>UUID</th>
-				<th>Username</th>
-			</tr>
-		</thead>
-		<tbody>
-			<% _.forEach(obj.users, function (user) { %>
-				<tr>
-					<td><a href="/adminUsers/edit?uuid=<%= user.uuid %>"><%= user.uuid %></a></td>
-					<td><%= user.username %></td>
-				</tr>
-			<% }); %>
-		</tbody>
-	</table>
-</form>
-<%= _.render('inc/pagination', obj.pagination) %>
-<%= _.render('inc/pageBottom', obj) %>