jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

merge userdb.js into users.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-07-15 09:50:11 -07:00
parent 2840bba4bf
commit a1c61facdc
27 changed files with 1021 additions and 1456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/test/common.js
View File

@@ -18,7 +18,6 @@ const appdb = require('../appdb.js'),
settings = require('../settings.js'),
settingsdb = require('../settingsdb.js'),
tasks = require('../tasks.js'),
userdb = require('../userdb.js'),
users = require('../users.js');
const MANIFEST = {
@@ -168,18 +167,16 @@ function setup(done) {
settings.initCache,
blobs.initSecrets,
domains.add.bind(null, DOMAIN.domain, DOMAIN, AUDIT_SOURCE),
function createOwner(done) {
users.createOwner(ADMIN.username, ADMIN.password, ADMIN.email, ADMIN.displayName, AUDIT_SOURCE, function (error, result) {
if (error) return done(error);
ADMIN.id = result.id;
done();
});
async function createOwner() {
const result = await users.createOwner(ADMIN.email, ADMIN.username, ADMIN.password, ADMIN.displayName, AUDIT_SOURCE);
ADMIN.id = result.id;
},
appdb.add.bind(null, APP.id, APP.appStoreId, APP.manifest, APP.location, APP.domain, APP.portBindings, APP),
settingsdb.set.bind(null, settings.CLOUDRON_TOKEN_KEY, exports.APPSTORE_TOKEN), // appstore token
userdb.add.bind(null, USER.id, USER),
users.setPassword.bind(null, USER, USER.password),
async function createUser() {
const result = await users.add(USER.email, USER, AUDIT_SOURCE);
USER.id = result.id;
},
(done) => mailboxdb.addMailbox(exports.MAILBOX_NAME, DOMAIN.domain, { ownerId: USER.id, ownerType: mail.OWNERTYPE_USER, active: true }, done),
(done) => mailboxdb.setAliasesForName(exports.MAILBOX_NAME, DOMAIN.domain, [ { name: exports.ALIAS_NAME, domain: DOMAIN.domain} ], done),