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

Fixup various tests for multidomain

Browse Source
This commit is contained in:
Johannes Zellner
2017-11-11 03:06:57 +01:00
parent d4b6768464
commit 1ccc3b84b8
10 changed files with 100 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/userdb.js
View File

@@ -19,6 +19,7 @@ exports = module.exports = {
var assert = require('assert'),
constants = require('./constants.js'),
config = require('./config.js'),
database = require('./database.js'),
debug = require('debug')('box:userdb'),
DatabaseError = require('./databaseerror'),
@@ -145,8 +146,8 @@ function add(userId, user, callback) {
});
if (user.username) {
queries.push({
query: 'INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)',
args: [ user.username, userId, mailboxdb.TYPE_USER ]
query: 'INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)',
args: [ user.username, config.fqdn(), userId, mailboxdb.TYPE_USER ]
});
}
@@ -239,8 +240,8 @@ function update(userId, user, callback) {
queries.push({ query: 'DELETE FROM mailboxes WHERE ownerId = ? AND aliasTarget IS NULL', args: [ userId ] });
// add new mailbox
queries.push({
query: 'INSERT INTO mailboxes (name, ownerId, ownerType) VALUES (?, ?, ?)',
args: [ user.username, userId, mailboxdb.TYPE_USER ]
query: 'INSERT INTO mailboxes (name, domain, ownerId, ownerType) VALUES (?, ?, ?, ?)',
args: [ user.username, config.fqdn(), userId, mailboxdb.TYPE_USER ]
});
}