make user.create take auditSource

This commit is contained in:
Girish Ramakrishnan
2016-05-01 20:01:34 -07:00
parent 63702f836a
commit 37bdd2672b
10 changed files with 47 additions and 32 deletions
+8 -3
View File
@@ -25,6 +25,7 @@ var assert = require('assert'),
clientdb = require('./clientdb.js'),
crypto = require('crypto'),
DatabaseError = require('./databaseerror.js'),
eventlog = require('./eventlog.js'),
groups = require('./groups.js'),
GroupError = groups.GroupError,
hat = require('hat'),
@@ -111,11 +112,12 @@ function validateDisplayName(name) {
return null;
}
function createUser(username, password, email, displayName, options, callback) {
function createUser(username, password, email, displayName, auditSource, options, callback) {
assert.strictEqual(typeof username, 'string');
assert.strictEqual(typeof password, 'string');
assert.strictEqual(typeof email, 'string');
assert.strictEqual(typeof displayName, 'string');
assert.strictEqual(typeof auditSource, 'object');
if (typeof options === 'function') {
callback = options;
@@ -165,6 +167,8 @@ function createUser(username, password, email, displayName, options, callback) {
if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new UserError(UserError.ALREADY_EXISTS));
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
eventlog.add(eventlog.ACTION_USER_ADD, auditSource, { userId: user.id, email: user.email });
callback(null, user);
if (!owner) mailer.userAdded(user, sendInvite);
@@ -420,11 +424,12 @@ function setPassword(userId, newPassword, callback) {
});
}
function createOwner(username, password, email, displayName, callback) {
function createOwner(username, password, email, displayName, auditSource, callback) {
assert.strictEqual(typeof username, 'string');
assert.strictEqual(typeof password, 'string');
assert.strictEqual(typeof email, 'string');
assert.strictEqual(typeof displayName, 'string');
assert.strictEqual(typeof auditSource, 'object');
assert.strictEqual(typeof callback, 'function');
// This is only not allowed for the owner
@@ -434,7 +439,7 @@ function createOwner(username, password, email, displayName, callback) {
if (error) return callback(new UserError(UserError.INTERNAL_ERROR, error));
if (count !== 0) return callback(new UserError(UserError.ALREADY_EXISTS));
createUser(username, password, email, displayName, { owner: true }, function (error, user) {
createUser(username, password, email, displayName, auditSource, { owner: true }, function (error, user) {
if (error) return callback(error);
groups.addMember(groups.ADMIN_GROUP_ID, user.id, function (error) {