mentos1386/send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Enable base URL detection by default with npm start, remove FXA_CLIENT_ID

Browse source
This commit is contained in:
timvisee 2021-05-07 13:06:59 +02:00
parent 4c45d6217d
commit 512c9803bd
No known key found for this signature in database
GPG key ID: B8DB720BC383E172
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -30,7 +30,7 @@
"test:report": "nyc report --reporter=html", "test:report": "nyc report --reporter=html",
"test-integration": "cross-env NODE_ENV=development wdio test/wdio.docker.conf.js", "test-integration": "cross-env NODE_ENV=development wdio test/wdio.docker.conf.js",
"circleci-test-integration": "echo 'webdriverio tests need to be updated to node 12'", "circleci-test-integration": "echo 'webdriverio tests need to be updated to node 12'",
"start": "npm run clean && cross-env NODE_ENV=development L10N_DEV=true FXA_CLIENT_ID=fced6b5e3f4c66b9 BASE_URL=http://localhost:8080 webpack-dev-server --mode=development", "start": "npm run clean && cross-env NODE_ENV=development L10N_DEV=true BASE_URL=http://localhost:8080 DETECT_BASE_URL=true webpack-dev-server --mode=development",
"android": "cross-env ANDROID=1 npm start", "android": "cross-env ANDROID=1 npm start",
"prod": "node server/bin/prod.js" "prod": "node server/bin/prod.js"
}, },

13
server/config.js
View file

@ -212,17 +212,16 @@ conf.validate({ allowed: 'strict' });
const props = conf.getProperties(); const props = conf.getProperties();
const deriveBaseUrl = (req) => { const deriveBaseUrl = req => {
if (props.detect_base_url) { if (!props.detect_base_url) {
const protocol = req.secure ? 'https://' : 'http://';
return `${protocol}${req.headers.host}`;
} else {
return props.base_url; return props.base_url;
} }
const protocol = req.secure ? 'https://' : 'http://';
return `${protocol}${req.headers.host}`;
}; };
module.exports = { module.exports = {
...props, ...props,
deriveBaseUrl, deriveBaseUrl
}; };