larvituser 0.19.1 → 0.20.1

package/dbmigration/1.sql

@@ -1,33 +0,0 @@
-CREATE TABLE IF NOT EXISTS `user_data_fields` (
-  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
-  `name` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `user_roles_rights` (
-  `role` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `uri` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`role`,`uri`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `user_users` (
-  `uuid` binary(16) NOT NULL,
-  `username` varchar(191) COLLATE utf8mb4_unicode_ci NOT NULL,
-  `password` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`uuid`),
-  UNIQUE KEY `username` (`username`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
-
-CREATE TABLE IF NOT EXISTS `user_users_data` (
-  `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT,
-  `userUuid` binary(16) NOT NULL,
-  `fieldId` int(11) unsigned NOT NULL,
-  `data` text COLLATE utf8mb4_unicode_ci NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `userUuid` (`userUuid`),
-  KEY `fieldId` (`fieldId`),
-  KEY `userUuid_fieldId` (`userUuid`,`fieldId`),
-  CONSTRAINT `user_users_data_ibfk_1` FOREIGN KEY (`userUuid`) REFERENCES `user_users` (`uuid`),
-  CONSTRAINT `user_users_data_ibfk_2` FOREIGN KEY (`fieldId`) REFERENCES `user_data_fields` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;

package/dbmigration/2.js

@@ -1,63 +0,0 @@
-'use strict';
-
-const	uuidLib	= require('uuid'),
-	async	= require('async'),
-	db	= require('larvitdb');
-
-exports = module.exports = function (cb) {
-	const	tasks	= [];
-
-	/* Create example data to test this migration against existing data * /
-	let userUuid	= uuidLib.v1();
-	let username	= 'fomme';
-	tasks.push(function (cb) {
-		db.query('INSERT INTO user_data_fields (name) VALUES(\'foo\'),(\'bar\');', cb);
-	});
-	tasks.push(function (cb) {
-		db.query('INSERT INTO user_users (uuid, username, password) VALUES(UNHEX(?),?,?);', [userUuid.replace(/-/g, ''), username, 'false'], cb);
-	});
-	tasks.push(function (cb) {
-		const	sql	= 'INSERT INTO user_users_data (userUuid, fieldId, data) SELECT UNHEX(\'' + userUuid.replace(/-/g, '') + '\'), id, \'mepp\' FROM user_data_fields WHERE name = \'foo\';';
-
-		db.query(sql, cb);
-	});
-	tasks.push(function (cb) {
-		const	sql	= 'INSERT INTO user_users_data (userUuid, fieldId, data) SELECT UNHEX(\'' + userUuid.replace(/-/g, '') + '\'), id, \'waff\' FROM user_data_fields WHERE name = \'bar\';';
-
-		db.query(sql, cb);
-	});/**/
-
-	// Migrate stuff
-	tasks.push(function (cb) {
-		db.query('ALTER TABLE `user_data_fields` ADD `uuid` binary(16) NOT NULL FIRST;', cb);
-	});
-
-	tasks.push(function (cb) {
-		db.query('SELECT id, name FROM user_data_fields', function (err, rows) {
-			const	tasks	= [];
-
-			if (err) { cb(err); return; }
-
-			for (let i = 0; rows[i] !== undefined; i ++) {
-				const	row	= rows[i];
-
-				tasks.push(function (cb) {
-					db.query('UPDATE user_data_fields SET uuid = UNHEX(?) WHERE id = ?;', [uuidLib.v1().replace(/-/g, ''), row.id], cb);
-				});
-			}
-
-			async.parallel(tasks, cb);
-		});
-	});
-
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` ADD `fieldUuid` binary(16) NOT NULL AFTER `userUuid`;',	cb); });
-	tasks.push(function (cb) { db.query('UPDATE user_users_data uud SET fieldUuid = (SELECT uuid FROM user_data_fields WHERE id = uud.fieldId)',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` DROP FOREIGN KEY `user_users_data_ibfk_2`;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` DROP `id`, DROP `fieldId`;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_data_fields` DROP `id`;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_data_fields` ADD PRIMARY KEY `uuid` (`uuid`);',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` ADD FOREIGN KEY (`fieldUuid`) REFERENCES `user_data_fields` (`uuid`) ON DELETE NO ACTION ON UPDATE NO ACTION;',	cb); });
-	tasks.push(function (cb) { db.query('ALTER TABLE `user_users_data` DROP INDEX `userUuid_fieldId`;',	cb); });
-
-	async.series(tasks, cb);
-};

package/helpers.js

@@ -1,110 +0,0 @@
-'use strict';
-
-const	topLogPrefix	= 'larvituser: helpers.js - ',
-	LUtils	= require('larvitutils');
-
-function Helpers(options) {
-	const	logPrefix	= topLogPrefix + 'Helpers() - ',
-		that	= this;
-
-	if ( ! options.log) {
-		const	tmpLUtils	= new LUtils();
-		options.log	= new tmpLUtils.Log();
-	}
-
-	that.options	= options;
-
-	for (const key of Object.keys(options)) {
-		that[key]	= options[key];
-	}
-
-	that.lUtils	= new LUtils({'log': that.log});
-
-	if ( ! that.log)	{
-		const	err	= new Error('Required option log not set');
-		that.log.error(logPrefix + err.message);
-		throw err;
-	}
-
-	if ( ! that.dataWriter)	{
-		const	err	= new Error('Required option dataWriter not set');
-		that.log.error(logPrefix + err.message);
-		throw err;
-	}
-
-	if ( ! that.db)	{
-		const	err	= new Error('Required option db not set');
-		that.log.error(logPrefix + err.message);
-		throw err;
-	}
-}
-
-/**
- * Get field name by uuid
- *
- * @param str uuid
- * @param func cb(err, name) - name is false if no match is found
- */
-Helpers.prototype.getFieldName = function getFieldName(uuid, cb) {
-	const	fieldUuidBuffer = this.lUtils.uuidToBuffer(uuid),
-		logPrefix	= topLogPrefix + 'getFieldName() - ',
-		that	= this,
-		sql	= 'SELECT name FROM user_data_fields WHERE uuid = ?';
-
-	if (fieldUuidBuffer === false) {
-		const	err	= new Error('Invalid field uuid');
-		that.log.verbose(logPrefix + err.message);
-		return cb(err);
-	}
-
-	that.db.query(sql, [fieldUuidBuffer], function (err, rows) {
-		if (err) return cb(err);
-
-		if (rows.length) {
-			cb(null, rows[0].name);
-		} else {
-			cb(null, false);
-		}
-	});
-};
-
-/**
- * Get data field uuid by field name
- *
- * @param str fieldName
- * @param func cb(err, uuid)
- */
-Helpers.prototype.getFieldUuid = function getFieldUuid(fieldName, cb) {
-	const	dbFields	= [],
-		that	= this,
-		sql	= 'SELECT uuid FROM user_data_fields WHERE name = ?';
-
-	fieldName	= fieldName.trim();
-	dbFields.push(fieldName);
-
-	that.db.query(sql, dbFields, function (err, rows) {
-		if (err) return cb(err);
-
-		if (rows.length) {
-			cb(null, that.lUtils.formatUuid(rows[0].uuid));
-		} else {
-			const	options	= {'exchange': that.dataWriter.exchangeName},
-				sendObj	= {};
-
-			sendObj.action	= 'addUserFieldReq';
-			sendObj.params	= {};
-			sendObj.params.name	= fieldName;
-
-			that.dataWriter.intercom.send(sendObj, options, function (err) {
-				if (err) return cb(err);
-
-				that.dataWriter.emitter.once('addedField_' + fieldName, function (err) {
-					if (err) return cb(err);
-					that.getFieldUuid(fieldName, cb);
-				});
-			});
-		}
-	});
-};
-
-exports = module.exports = Helpers;