diff --git a/src/prestart.js b/src/prestart.js index a85b14d6a8..f6a76cae3c 100644 --- a/src/prestart.js +++ b/src/prestart.js @@ -93,7 +93,15 @@ function loadConfig(configFile) { const urlObject = new URL(url); nconf.set('url', url.replace(/\/$/, '')); - nconf.set('url_parsed', urlObject); + nconf.set('url_parsed', { + href: urlObject.href, + origin: urlObject.origin, + protocol: urlObject.protocol, + host: urlObject.host, + hostname: urlObject.hostname, + port: urlObject.port, + pathname: urlObject.pathname, + }); // Parse out the relative_url and other goodies from the configured URL const relativePath = urlObject.pathname !== '/' ? urlObject.pathname.replace(/\/+$/, '') : ''; nconf.set('base_url', `${urlObject.protocol}//${urlObject.host}`); diff --git a/test/mocks/databasemock.js b/test/mocks/databasemock.js index e2a15cdbb5..ef1520f13d 100644 --- a/test/mocks/databasemock.js +++ b/test/mocks/databasemock.js @@ -9,8 +9,6 @@ require('../../require-main'); const path = require('path'); const nconf = require('nconf'); -const url = require('url'); -const util = require('util'); process.env.NODE_ENV = process.env.TEST_ENV || 'production'; @@ -52,7 +50,15 @@ nconf.set('relative_path', relativePath); nconf.set('asset_base_url', `${relativePath}/assets`); nconf.set('upload_path', path.join(nconf.get('base_dir'), nconf.get('upload_path'))); nconf.set('upload_url', '/assets/uploads'); -nconf.set('url_parsed', urlObject); +nconf.set('url_parsed', { + href: urlObject.href, + origin: urlObject.origin, + protocol: urlObject.protocol, + host: urlObject.host, + hostname: urlObject.hostname, + port: urlObject.port, + pathname: urlObject.pathname, +}); nconf.set('base_url', `${urlObject.protocol}//${urlObject.host}`); nconf.set('secure', urlObject.protocol === 'https:'); nconf.set('use_port', !!urlObject.port);