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

move dashboard setting into dashboard.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-11 19:41:05 +05:30
parent 27ce8f9351
commit eee49a8291
25 changed files with 157 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/routes/test/cloudron-test.js
+4 -5
View File
@@ -8,11 +8,10 @@
const constants = require('../../constants.js'),
common = require('./common.js'),
expect = require('expect.js'),
superagent = require('superagent'),
settings = require('../../settings.js');
superagent = require('superagent');
describe('Cloudron API', function () {
const { setup, cleanup, serverUrl, owner, user } = common;
const { setup, cleanup, serverUrl, owner, user, dashboardFqdn } = common;
before(setup);
after(cleanup);
@@ -32,7 +31,7 @@ describe('Cloudron API', function () {
expect(response.statusCode).to.equal(200);
expect(response.body.apiServerOrigin).to.eql('http://localhost:6060');
expect(response.body.webServerOrigin).to.eql('https://cloudron.io');
expect(response.body.adminFqdn).to.eql(settings.dashboardFqdn());
expect(response.body.adminFqdn).to.eql(dashboardFqdn);
expect(response.body.version).to.eql(constants.VERSION);
expect(response.body.cloudronName).to.be.a('string');
});
@@ -44,7 +43,7 @@ describe('Cloudron API', function () {
expect(response.statusCode).to.equal(200);
expect(response.body.apiServerOrigin).to.eql('http://localhost:6060');
expect(response.body.webServerOrigin).to.eql('https://cloudron.io');
expect(response.body.adminFqdn).to.eql(settings.dashboardFqdn());
expect(response.body.adminFqdn).to.eql(dashboardFqdn);
expect(response.body.version).to.eql(constants.VERSION);
expect(response.body.cloudronName).to.be.a('string');
});
src/routes/test/mail-test.js
+19 -20
View File
@@ -8,12 +8,11 @@
const common = require('./common.js'),
expect = require('expect.js'),
mail = require('../../mail.js'),
settings = require('../../settings.js'),
superagent = require('superagent'),
_ = require('underscore');
describe('Mail API', function () {
const { setup, cleanup, serverUrl, owner, dashboardDomain, mailFqdn } = common;
const { setup, cleanup, serverUrl, owner, dashboardDomain, dashboardFqdn, mailFqdn } = common;
let publicKey;
before(async () => {
@@ -117,14 +116,14 @@ describe('Mail API', function () {
expect(response.body.dns.dkim.domain).to.eql(dkimDomain);
expect(response.body.dns.dkim.type).to.eql('TXT');
expect(response.body.dns.dkim.value).to.eql(null);
expect(response.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + publicKey);
expect(response.body.dns.dkim.expected).to.eql(`v=DKIM1; t=s; p=${publicKey}`);
expect(response.body.dns.dkim.status).to.eql(false);
expect(response.body.dns.spf).to.be.an('object');
expect(response.body.dns.spf.domain).to.eql(spfDomain);
expect(response.body.dns.spf.type).to.eql('TXT');
expect(response.body.dns.spf.value).to.eql(null);
expect(response.body.dns.spf.expected).to.eql('v=spf1 a:' + settings.dashboardFqdn() + ' ~all');
expect(response.body.dns.spf.expected).to.eql(`v=spf1 a:${dashboardFqdn} ~all`);
expect(response.body.dns.spf.status).to.eql(false);
expect(response.body.dns.dmarc).to.be.an('object');
@@ -136,7 +135,7 @@ describe('Mail API', function () {
expect(response.body.dns.mx).to.be.an('object');
expect(response.body.dns.mx.type).to.eql('MX');
expect(response.body.dns.mx.value).to.eql(null);
expect(response.body.dns.mx.expected).to.eql('10 ' + mailFqdn + '.');
expect(response.body.dns.mx.expected).to.eql(`10 ${mailFqdn}.`);
expect(response.body.dns.mx.status).to.eql(false);
expect(response.body.dns.ptr).to.be.an('object');
@@ -160,12 +159,12 @@ describe('Mail API', function () {
expect(response.statusCode).to.equal(200);
expect(response.body.dns.spf).to.be.an('object');
expect(response.body.dns.spf.expected).to.eql('v=spf1 a:' + settings.dashboardFqdn() + ' ~all');
expect(response.body.dns.spf.expected).to.eql(`v=spf1 a:${dashboardFqdn} ~all`);
expect(response.body.dns.spf.status).to.eql(false);
expect(response.body.dns.spf.value).to.eql(null);
expect(response.body.dns.dkim).to.be.an('object');
expect(response.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + publicKey);
expect(response.body.dns.dkim.expected).to.eql(`v=DKIM1; t=s; p=${publicKey}`);
expect(response.body.dns.dkim.status).to.eql(false);
expect(response.body.dns.dkim.value).to.eql(null);
@@ -176,7 +175,7 @@ describe('Mail API', function () {
expect(response.body.dns.mx).to.be.an('object');
expect(response.body.dns.mx.status).to.eql(false);
expect(response.body.dns.mx.expected).to.eql('10 ' + mailFqdn + '.');
expect(response.body.dns.mx.expected).to.eql(`10 ${mailFqdn}.`);
expect(response.body.dns.mx.value).to.eql(null);
expect(response.body.dns.ptr).to.be.an('object');
@@ -199,7 +198,7 @@ describe('Mail API', function () {
expect(response.statusCode).to.equal(200);
expect(response.body.dns.spf).to.be.an('object');
expect(response.body.dns.spf.expected).to.eql('v=spf1 a:' + settings.dashboardFqdn() + ' a:random.com ~all');
expect(response.body.dns.spf.expected).to.eql(`v=spf1 a:${dashboardFqdn} a:random.com ~all`);
expect(response.body.dns.spf.status).to.eql(false);
expect(response.body.dns.spf.value).to.eql('v=spf1 a:random.com ~all');
@@ -215,8 +214,8 @@ describe('Mail API', function () {
expect(response.body.dns.mx).to.be.an('object');
expect(response.body.dns.mx.status).to.eql(true);
expect(response.body.dns.mx.expected).to.eql('10 ' + mailFqdn + '.');
expect(response.body.dns.mx.value).to.eql('20 ' + mailFqdn + '. 10 some.other.server.');
expect(response.body.dns.mx.expected).to.eql(`10 ${mailFqdn}.`);
expect(response.body.dns.mx.value).to.eql(`20 ${mailFqdn}. 10 some.other.server.`);
expect(response.body.dns.ptr).to.be.an('object');
expect(response.body.dns.ptr.expected).to.eql(mailFqdn);
@@ -239,8 +238,8 @@ describe('Mail API', function () {
expect(response.body.dns.spf).to.be.an('object');
expect(response.body.dns.spf.domain).to.eql(spfDomain);
expect(response.body.dns.spf.type).to.eql('TXT');
expect(response.body.dns.spf.value).to.eql('v=spf1 a:example.com a:' + mailFqdn + ' ~all');
expect(response.body.dns.spf.expected).to.eql('v=spf1 a:example.com a:' + mailFqdn + ' ~all');
expect(response.body.dns.spf.value).to.eql(`v=spf1 a:example.com a:${mailFqdn} ~all`);
expect(response.body.dns.spf.expected).to.eql(`v=spf1 a:example.com a:${mailFqdn} ~all`);
expect(response.body.dns.spf.status).to.eql(true);
});
@@ -266,7 +265,7 @@ describe('Mail API', function () {
dnsAnswerQueue[mxDomain].MX = [ { priority: '10', exchange: mailFqdn } ];
dnsAnswerQueue[dmarcDomain].TXT = [['v=DMARC1; p=reject; pct=100']];
dnsAnswerQueue[dkimDomain].TXT = [['v=DKIM1; t=s; p=', publicKey ]];
dnsAnswerQueue[spfDomain].TXT = [['v=spf1 a:' + settings.dashboardFqdn() + ' ~all']];
dnsAnswerQueue[spfDomain].TXT = [[`v=spf1 a:${dashboardFqdn} ~all`]];
const response = await superagent.get(`${serverUrl}/api/v1/mail/${dashboardDomain}` + '/status')
.query({ access_token: owner.token });
@@ -276,15 +275,15 @@ describe('Mail API', function () {
expect(response.body.dns.dkim).to.be.an('object');
expect(response.body.dns.dkim.domain).to.eql(dkimDomain);
expect(response.body.dns.dkim.type).to.eql('TXT');
expect(response.body.dns.dkim.value).to.eql('v=DKIM1; t=s; p=' + publicKey);
expect(response.body.dns.dkim.expected).to.eql('v=DKIM1; t=s; p=' + publicKey);
expect(response.body.dns.dkim.value).to.eql(`v=DKIM1; t=s; p=${publicKey}`);
expect(response.body.dns.dkim.expected).to.eql(`v=DKIM1; t=s; p=${publicKey}`);
expect(response.body.dns.dkim.status).to.eql(true);
expect(response.body.dns.spf).to.be.an('object');
expect(response.body.dns.spf.domain).to.eql(spfDomain);
expect(response.body.dns.spf.type).to.eql('TXT');
expect(response.body.dns.spf.value).to.eql('v=spf1 a:' + settings.dashboardFqdn() + ' ~all');
expect(response.body.dns.spf.expected).to.eql('v=spf1 a:' + settings.dashboardFqdn() + ' ~all');
expect(response.body.dns.spf.value).to.eql(`v=spf1 a:${dashboardFqdn} ~all`);
expect(response.body.dns.spf.expected).to.eql(`v=spf1 a:${dashboardFqdn} ~all`);
expect(response.body.dns.spf.status).to.eql(true);
expect(response.body.dns.dmarc).to.be.an('object');
@@ -294,8 +293,8 @@ describe('Mail API', function () {
expect(response.body.dns.mx).to.be.an('object');
expect(response.body.dns.mx.status).to.eql(true);
expect(response.body.dns.mx.expected).to.eql('10 ' + mailFqdn + '.');
expect(response.body.dns.mx.value).to.eql('10 ' + mailFqdn + '.');
expect(response.body.dns.mx.expected).to.eql(`10 ${mailFqdn}.`);
expect(response.body.dns.mx.value).to.eql(`10 ${mailFqdn}.`);
});
});