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

make domaindb.update take object

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-01-20 10:24:11 -08:00
parent b64c41758e
commit 8da04f6f51
3 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/domaindb.js
View File

@@ -54,6 +54,7 @@ function getAll(callback) {
function add(name, domain, callback) {
assert.strictEqual(typeof name, 'string');
assert.strictEqual(typeof domain, 'object');
assert.strictEqual(typeof domain.zoneName, 'string');
assert.strictEqual(typeof domain.provider, 'string');
assert.strictEqual(typeof domain.config, 'object');
@@ -67,13 +68,24 @@ function add(name, domain, callback) {
});
}
function update(domain, provider, config, callback) {
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof provider, 'string');
assert.strictEqual(typeof config, 'object');
function update(name, domain, callback) {
assert.strictEqual(typeof name, 'string');
assert.strictEqual(typeof domain, 'object');
assert.strictEqual(typeof callback, 'function');
database.query('UPDATE domains SET provider=?, configJson=? WHERE domain=?', [ provider, JSON.stringify(config), domain ], function (error) {
var args = [ ], fields = [ ];
for (var k in domain) {
if (k === 'config') {
fields.push('configJson = ?');
args.push(JSON.stringify(domain[k]));
} else {
fields.push(k + ' = ?');
args.push(domain[k]);
}
}
args.push(name);
database.query('UPDATE domains SET ' + fields.join(', ') + ' WHERE domain=?', args, function (error) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DatabaseError(DatabaseError.NOT_FOUND));
if (error) return callback(new DatabaseError(DatabaseError.INTERNAL_ERROR, error));

2
src/domains.js
View File

@@ -197,7 +197,7 @@ function update(domain, provider, config, fallbackCertificate, callback) {
if (error && error.reason === DomainError.INVALID_PROVIDER) return callback(new DomainError(DomainError.BAD_FIELD, error.message));
if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
domaindb.update(domain, provider, result, function (error) {
domaindb.update(domain, { provider: provider, config: result }, function (error) {
if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new DomainError(DomainError.NOT_FOUND));
if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));

7
src/test/database-test.js
View File

@@ -19,7 +19,6 @@ var appdb = require('../appdb.js'),
groupdb = require('../groupdb.js'),
hat = require('hat'),
mailboxdb = require('../mailboxdb.js'),
path = require('path'),
settingsdb = require('../settingsdb.js'),
tokendb = require('../tokendb.js'),
userdb = require('../userdb.js'),
@@ -133,7 +132,7 @@ describe('database', function () {
it('can update domain', function (done) {
const newConfig = { provider: 'manual' };
domaindb.update(DOMAIN_1.domain, DOMAIN_1.provider, newConfig, function (error) {
domaindb.update(DOMAIN_1.domain, { provider: DOMAIN_1.provider, config: newConfig }, function (error) {
expect(error).to.equal(null);
domaindb.get(DOMAIN_1.domain, function (error, result) {
@@ -359,7 +358,7 @@ describe('database', function () {
});
});
it('can update the user', function (done) {
it('can update the user', function (done) {
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) {
@@ -1409,7 +1408,7 @@ describe('database', function () {
eventlogdb.getAllPaged(null, null, 1, 100, function (error, results) {
expect(error).to.be(null);
expect(results.length).to.be(2);
results = results.sort(function (x, y) { return x.action > y.action }); // because equal timestamp gives random ordering
results = results.sort(function (x, y) { return x.action > y.action; }); // because equal timestamp gives random ordering
expect(results[1].action).to.be.eql('persistent.event');
expect(results[0].action).to.be.eql('anotherpersistent.event');