From 512c9803bd109b34e72f9e15f12494aec6aeb718 Mon Sep 17 00:00:00 2001
From: timvisee <tim@visee.me>
Date: Fri, 7 May 2021 13:06:59 +0200
Subject: [PATCH] Enable base URL detection by default with npm start, remove
 FXA_CLIENT_ID

---
 package.json     |  2 +-
 server/config.js | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 09f23b36..e9846087 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "test:report": "nyc report --reporter=html",
     "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'",
-    "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",
     "prod": "node server/bin/prod.js"
   },
diff --git a/server/config.js b/server/config.js
index a6ea0ce4..d530610f 100644
--- a/server/config.js
+++ b/server/config.js
@@ -212,17 +212,16 @@ conf.validate({ allowed: 'strict' });
 
 const props = conf.getProperties();
 
-const deriveBaseUrl = (req) => {
-  if (props.detect_base_url) {
-    const protocol = req.secure ? 'https://' : 'http://';
-
-    return `${protocol}${req.headers.host}`;
-  } else {
+const deriveBaseUrl = req => {
+  if (!props.detect_base_url) {
     return props.base_url;
   }
+
+  const protocol = req.secure ? 'https://' : 'http://';
+  return `${protocol}${req.headers.host}`;
 };
 
 module.exports = {
   ...props,
-  deriveBaseUrl,
+  deriveBaseUrl
 };