fix various users-test.js

src/provision.js

@@ -138,11 +138,11 @@ async function activate(username, password, email, displayName, ip, auditSource)
 
     debug(`activate: user: ${username} email:${email}`);
 
-    const [error, userObject] = await safe(users.createOwner(email, username, password, displayName, auditSource));
+    const [error, ownerId] = await safe(users.createOwner(email, username, password, displayName, auditSource));
     if (error && error.reason === BoxError.ALREADY_EXISTS) throw new BoxError(BoxError.CONFLICT, 'Already activated');
     if (error) throw error;
 
-    const token = { clientId: tokens.ID_WEBADMIN, identifier: userObject.id, expires: Date.now() + constants.DEFAULT_TOKEN_EXPIRATION_MSECS };
+    const token = { clientId: tokens.ID_WEBADMIN, identifier: ownerId, expires: Date.now() + constants.DEFAULT_TOKEN_EXPIRATION_MSECS };
     const result = await tokens.add(token);
 
     eventlog.add(eventlog.ACTION_ACTIVATE, auditSource, {});
@@ -150,7 +150,7 @@ async function activate(username, password, email, displayName, ip, auditSource)
     setImmediate(cloudron.onActivated.bind(null, {}, NOOP_CALLBACK));
 
     return {
-        userId: userObject.id,
+        userId: ownerId,
         token: result.accessToken,
         expires: result.expires
     };

src/test/common.js

@@ -73,7 +73,8 @@ const ADMIN = {
     groupIds: [],
     role: 'owner',
     source: '',
-    avatar: constants.AVATAR_GRAVATAR
+    avatar: constants.AVATAR_GRAVATAR,
+    active: true,
 };
 
 const USER = {
@@ -90,7 +91,8 @@ const USER = {
     displayName: '',
     source: '',
     permissions: null,
-    avatar: constants.AVATAR_NONE
+    avatar: constants.AVATAR_NONE,
+    active: true,
 };
 
 const APP = {
@@ -113,6 +115,7 @@ const APP = {
 
 exports = module.exports = {
     createTree,
+    domainSetup,
     setup,
     cleanup,
 
@@ -156,7 +159,7 @@ function createTree(root, obj) {
     createSubTree(obj, root);
 }
 
-function setup(done) {
+function domainSetup(done) {
     nock.cleanAll();
 
     async.series([
@@ -167,6 +170,12 @@ function setup(done) {
         settings.initCache,
         blobs.initSecrets,
         domains.add.bind(null, DOMAIN.domain, DOMAIN, AUDIT_SOURCE),
+    ], done);
+}
+
+function setup(done) {
+    async.series([
+        domainSetup,
         async function createOwner() {
             const result = await users.createOwner(ADMIN.email, ADMIN.username, ADMIN.password, ADMIN.displayName, AUDIT_SOURCE);
             ADMIN.id = result.id;
@@ -193,3 +202,4 @@ function cleanup(done) {
         database.uninitialize
     ], done);
 }
+

src/users.js

@@ -13,6 +13,7 @@ exports = module.exports = {
     get,
     getByResetToken,
     getByUsername,
+    getByEmail,
     getOwner,
     getAdmins,
     getSuperadmins,
@@ -240,7 +241,7 @@ async function add(email, data, auditSource) {
 
     eventlog.add(eventlog.ACTION_USER_ADD, auditSource, { userId: user.id, email: user.email, user: removePrivateFields(user) });
 
-    return user;
+    return user.id;
 }
 
 // returns true if ghost user was matched