diff --git a/src/apps.js b/src/apps.js index 2157b6408..0f0e5542a 100644 --- a/src/apps.js +++ b/src/apps.js @@ -1381,7 +1381,7 @@ async function install(data, auditSource) { icon = Buffer.from(icon, 'base64'); } - const locations = [{ subdomain: subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }] + const locations = [{ subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }] .concat(secondaryDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_SECONDARY }))) .concat(redirectDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_REDIRECT }))) .concat(aliasDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_ALIAS }))); @@ -2277,7 +2277,7 @@ async function clone(app, data, user, auditSource) { if (error) throw error; const secondaryDomains = translateSecondaryDomains(data.secondaryDomains || {}); - const locations = [{ subdomain: subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }] + const locations = [{ subdomain, domain, type: exports.LOCATION_TYPE_PRIMARY }] .concat(secondaryDomains.map(ad => _.extend(ad, { type: exports.LOCATION_TYPE_SECONDARY }))); const domainObjectMap = await domains.getDomainObjectMap(); @@ -2867,10 +2867,10 @@ async function restoreConfig(app) { function getLocationsSync(app) { assert.strictEqual(typeof app, 'object'); - const locations = [{ domain: app.domain, fqdn: app.fqdn, certificate: app.certificate, type: exports.LOCATION_TYPE_PRIMARY }] - .concat(app.secondaryDomains.map(sd => { return { domain: sd.domain, certificate: sd.certificate, fqdn: sd.fqdn, type: exports.LOCATION_TYPE_SECONDARY }; })) - .concat(app.redirectDomains.map(rd => { return { domain: rd.domain, certificate: rd.certificate, fqdn: rd.fqdn, type: exports.LOCATION_TYPE_REDIRECT }; })) - .concat(app.aliasDomains.map(ad => { return { domain: ad.domain, certificate: ad.certificate, fqdn: ad.fqdn, type: exports.LOCATION_TYPE_ALIAS }; })); + const locations = [{ subdomain: app.subdomain, domain: app.domain, fqdn: app.fqdn, certificate: app.certificate, type: exports.LOCATION_TYPE_PRIMARY }] + .concat(app.secondaryDomains.map(sd => { return { subdomain: sd.subdomain, domain: sd.domain, certificate: sd.certificate, fqdn: sd.fqdn, type: exports.LOCATION_TYPE_SECONDARY }; })) + .concat(app.redirectDomains.map(rd => { return { subdomain: rd.subdomain, domain: rd.domain, certificate: rd.certificate, fqdn: rd.fqdn, type: exports.LOCATION_TYPE_REDIRECT }; })) + .concat(app.aliasDomains.map(ad => { return { subdomain: ad.subdomain, domain: ad.domain, certificate: ad.certificate, fqdn: ad.fqdn, type: exports.LOCATION_TYPE_ALIAS }; })); return locations; }