From 989ab0edb5d1d6c08fee0487a34e9ff0cf743a1b Mon Sep 17 00:00:00 2001 From: Aileen Nowak Date: Mon, 25 Oct 2021 09:43:59 +0200 Subject: [PATCH] Added forceUpgrade config settings no issue - Added the `forceUpgrade` config setting to be able to use it together with BMA. - The flag is a property of `host_settings` and is passed to the Admin client --- core/server/api/canary/config.js | 3 ++- core/server/api/v3/config.js | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/server/api/canary/config.js b/core/server/api/canary/config.js index 44e513e10d..8f68a17351 100644 --- a/core/server/api/canary/config.js +++ b/core/server/api/canary/config.js @@ -23,7 +23,8 @@ module.exports = { enableDeveloperExperiments: config.get('enableDeveloperExperiments') || false, stripeDirect: config.get('stripeDirect'), mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun, - emailAnalytics: config.get('emailAnalytics') + emailAnalytics: config.get('emailAnalytics'), + forceUpgrade: config.get('host_settings:forceUpgrade') || false }; if (billingUrl) { response.billingUrl = billingUrl; diff --git a/core/server/api/v3/config.js b/core/server/api/v3/config.js index 44e513e10d..8f68a17351 100644 --- a/core/server/api/v3/config.js +++ b/core/server/api/v3/config.js @@ -23,7 +23,8 @@ module.exports = { enableDeveloperExperiments: config.get('enableDeveloperExperiments') || false, stripeDirect: config.get('stripeDirect'), mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun, - emailAnalytics: config.get('emailAnalytics') + emailAnalytics: config.get('emailAnalytics'), + forceUpgrade: config.get('host_settings:forceUpgrade') || false }; if (billingUrl) { response.billingUrl = billingUrl;