Merge pull request #1268 from pascaloliv/QWANT-2491-burger-menu

QMAPS-2491 - Hide burger menu with config clientRule
Qwant · Feb 15, 2022 · a6c735d · a6c735d
2 parents 1137b41 + 4f168b9
commit a6c735d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/bin/app.js b/bin/app.js
@@ -122,11 +122,12 @@ function App(config) {
   const ogMeta = new require('./middlewares/og_meta')(config);
 
   router.get('/*', redirectUnsupported, fullTextQuery, preFetchPoi, ogMeta, (req, res) => {
-    const userAgent = req.headers['user-agent'];
-    const disableMenuRule = config.server.disableBurgerMenu.userAgentRule;
+    const disableMenuRule = config.server.disableBurgerMenu.clientRule;
     const { server: _droppedServerConfig, ...appConfig } = config;
+    const regexpRule = new RegExp(`[?&]client=${disableMenuRule}`);
+
     let localAppConfig = appConfig;
-    if (disableMenuRule && userAgent && userAgent.match(disableMenuRule)) {
+    if (disableMenuRule && regexpRule.test(req.originalUrl)) {
       localAppConfig = {
         ...appConfig,
         burgerMenu: {

diff --git a/config/default_config.yml b/config/default_config.yml
@@ -15,7 +15,7 @@ server:
   logger:
     headersWhitelistEnabled: true
   disableBurgerMenu:
-    userAgentRule: '' # regex, ignored if empty
+    clientRule: override_by_environment
   # NB: `routerBaseUrl` may be different from `system.baseUrl` if a proxy is responsible for rewriting URLs
   routerBaseUrl: / # path prefix expected by the express server
   useGeoipForInitialPosition: true