diff --git a/src/test/database-test.js b/src/test/database-test.js index 59817efda..23ecc86ba 100644 --- a/src/test/database-test.js +++ b/src/test/database-test.js @@ -40,7 +40,8 @@ describe('database', function () { salt: 'morton', createdAt: 'sometime back', modifiedAt: 'now', - resetToken: hat(256) + resetToken: hat(256), + displayName: '' }; var ADMIN_0 = { @@ -52,7 +53,8 @@ describe('database', function () { salt: 'tata', createdAt: 'sometime back', modifiedAt: 'now', - resetToken: '' + resetToken: '', + displayName: 'Herbert Heidelberg' }; it('can add user', function (done) { @@ -154,10 +156,11 @@ describe('database', function () { }); it('can update the user', function (done) { - userdb.update(USER_0.id, { email: 'some@thing.com' }, function (error) { + userdb.update(USER_0.id, { email: 'some@thing.com', displayName: 'Heiter' }, function (error) { expect(error).to.not.be.ok(); userdb.get(USER_0.id, function (error, user) { expect(user.email).to.equal('some@thing.com'); + expect(user.displayName).to.equal('Heiter'); done(); }); }); diff --git a/src/userdb.js b/src/userdb.js index b0baae525..81eb223a6 100644 --- a/src/userdb.js +++ b/src/userdb.js @@ -23,7 +23,7 @@ var assert = require('assert'), debug = require('debug')('box:userdb'), DatabaseError = require('./databaseerror'); -var USERS_FIELDS = [ 'id', 'username', 'email', 'password', 'salt', 'createdAt', 'modifiedAt', 'admin', 'resetToken' ].join(','); +var USERS_FIELDS = [ 'id', 'username', 'email', 'password', 'salt', 'createdAt', 'modifiedAt', 'admin', 'resetToken', 'displayName' ].join(','); function get(userId, callback) { assert.strictEqual(typeof userId, 'string'); @@ -113,10 +113,11 @@ function add(userId, user, callback) { assert.strictEqual(typeof user.createdAt, 'string'); assert.strictEqual(typeof user.modifiedAt, 'string'); assert.strictEqual(typeof user.resetToken, 'string'); + assert.strictEqual(typeof user.displayName, 'string'); assert.strictEqual(typeof callback, 'function'); - var data = [ userId, user.username, user.password, user.email, user.admin, user.salt, user.createdAt, user.modifiedAt, user.resetToken ]; - database.query('INSERT INTO users (id, username, password, email, admin, salt, createdAt, modifiedAt, resetToken) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', + var data = [ userId, user.username, user.password, user.email, user.admin, user.salt, user.createdAt, user.modifiedAt, user.resetToken, user.displayName ]; + database.query('INSERT INTO users (id, username, password, email, admin, salt, createdAt, modifiedAt, resetToken, displayName) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)', data, function (error, result) { if (error && error.code === 'ER_DUP_ENTRY') return callback(new DatabaseError(DatabaseError.ALREADY_EXISTS, error)); if (error || result.affectedRows !== 1) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error)); @@ -199,4 +200,3 @@ function adminCount(callback) { return callback(null, result[0].total); }); } -