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

domain: split the config and wellknown routes

Browse Source 
we want to add more stuff to the UI like the jitsi URL
This commit is contained in:
Girish Ramakrishnan
2021-12-03 13:46:54 -08:00
parent 5592dc8a42
commit 39807e6ba4
8 changed files with 107 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/test/dns-providers-test.js
View File

@@ -28,7 +28,7 @@ describe('dns provider', function () {
domainCopy.provider = 'noop';
domainCopy.config = {};
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('upsert succeeds', async function () {
@@ -55,7 +55,7 @@ describe('dns provider', function () {
token: TOKEN
};
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('upsert non-existing record succeeds', async function () {
@@ -292,7 +292,7 @@ describe('dns provider', function () {
apiSecret: SECRET
};
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('upsert record succeeds', async function () {
@@ -367,7 +367,7 @@ describe('dns provider', function () {
token: TOKEN
};
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('upsert record succeeds', async function () {
@@ -430,7 +430,7 @@ describe('dns provider', function () {
token: TOKEN
};
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('upsert record succeeds', async function () {
@@ -530,7 +530,7 @@ describe('dns provider', function () {
token: token
};
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
beforeEach(function () {
@@ -942,7 +942,7 @@ describe('dns provider', function () {
AWS._originalRoute53 = AWS.Route53;
AWS.Route53 = Route53Mock;
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
after(function () {
@@ -1078,7 +1078,7 @@ describe('dns provider', function () {
_OriginalGCDNS = GCDNS.prototype.getZones;
GCDNS.prototype.getZones = mockery(zoneQueue);
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
after(function () {

14
src/test/domains-test.js
View File

@@ -52,12 +52,12 @@ describe('Domains', function () {
expect(result).to.be(null);
});
it('can update domain', async function () {
it('can set domain config', async function () {
const newConfig = {};
const newTlsConfig = { provider: 'letsencrypt-staging' };
const newDomain = Object.assign({}, DOMAIN_0, { config: newConfig, tlsConfig: newTlsConfig });
await domains.update(DOMAIN_0.domain, newDomain, auditSource);
await domains.setConfig(DOMAIN_0.domain, newDomain, auditSource);
const result = await domains.get(DOMAIN_0.domain);
expect(result.domain).to.equal(DOMAIN_0.domain);
@@ -70,6 +70,16 @@ describe('Domains', function () {
DOMAIN_0.tlsConfig = newTlsConfig;
});
it('can set domain wellknown', async function () {
await domains.setWellKnown(DOMAIN_0.domain, { service: 'some.service' }, auditSource);
let result = await domains.get(DOMAIN_0.domain);
expect(result.wellKnown).to.eql({ service: 'some.service' });
await domains.setWellKnown(DOMAIN_0.domain, null, auditSource);
result = await domains.get(DOMAIN_0.domain);
expect(result.wellKnown).to.eql(null);
});
it('can get all domains', async function () {
const result = await domains.list();
expect(result.length).to.equal(2);

6
src/test/reverseproxy-test.js
View File

@@ -143,7 +143,7 @@ describe('Reverse Proxy', function () {
before(async function () {
domainCopy.tlsConfig = { provider: 'letsencrypt-prod' };
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('returns prod acme in prod cloudron', async function () {
@@ -157,7 +157,7 @@ describe('Reverse Proxy', function () {
before(async function () {
domainCopy.tlsConfig = { provider: 'letsencrypt-staging' };
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('returns staging acme in prod cloudron', async function () {
@@ -171,7 +171,7 @@ describe('Reverse Proxy', function () {
before(async function () {
domainCopy.tlsConfig = { provider: 'fallback' };
await domains.update(domainCopy.domain, domainCopy, auditSource);
await domains.setConfig(domainCopy.domain, domainCopy, auditSource);
});
it('configure nginx correctly', async function () {