Merge branch 'cloudron-io-master'

lib/models/users.js

@@ -61,6 +61,52 @@ module.exports.findByAccessToken = (accessToken, callback) => {
     });
 };
 
+module.exports.findByUsername = (username, callback) => {
+    db.getConnection((err, connection) => {
+        if (err) {
+            return callback(err);
+        }
+
+        connection.query('SELECT `id`, `username`, `email`, `access_token` FROM `users` WHERE `username`=? LIMIT 1', [username], (err, rows) => {
+            connection.release();
+
+            if (err) {
+                return callback(err);
+            }
+
+            if (!rows.length) {
+                return callback(null, false);
+            }
+
+            let user = tools.convertKeys(rows[0]);
+            return callback(null, user);
+        });
+    });
+};
+
+module.exports.add = (username, password, email, callback) => {
+    db.getConnection((err, connection) => {
+        if (err) {
+            return callback(err);
+        }
+
+        connection.query('INSERT INTO `users` (`username`, `password`, `email`, `created`) VALUES (?, ?, ?, NOW())', [username, password, email], (err, result) => {
+            connection.release();
+
+            if (err) {
+                return callback(err);
+            }
+
+            let id = result && result.insertId;
+            if (!id) {
+                return callback(new Error('Could not store user row'));
+            }
+
+            return callback(null, id);
+        });
+    });
+};
+
 /**
  * Fetches user by username and password
  *
@@ -70,6 +116,10 @@ module.exports.findByAccessToken = (accessToken, callback) => {
  */
 module.exports.authenticate = (username, password, callback) => {
 
+    if (password === '') {
+        return callback(null, false);
+    }
+
     let login = (connection, callback) => {
         connection.query('SELECT `id`, `password`, `access_token` FROM `users` WHERE `username`=? OR email=? LIMIT 1', [username, username], (err, rows) => {
             if (err) {