diff --git a/core/server/data/schema/default-settings.json b/core/server/data/schema/default-settings.json index 15230a6973..e29f90ab37 100644 --- a/core/server/data/schema/default-settings.json +++ b/core/server/data/schema/default-settings.json @@ -220,23 +220,6 @@ }, "stripe_connect_integration": { "defaultValue": "{}" - }, - "membersjs_show_signup_name": { - "defaultValue": "true", - "validations": { - "isEmpty": false, - "isIn": [["true", "false"]] - } - }, - "membersjs_show_beacon": { - "defaultValue": "true", - "validations": { - "isEmpty": false, - "isIn": [["true", "false"]] - } - }, - "membersjs_allowed_plans": { - "defaultValue": "[\"free\", \"monthly\", \"yearly\"]" } }, "bulk_email": { diff --git a/core/server/services/members/middleware.js b/core/server/services/members/middleware.js index ae88838acc..04dd945db5 100644 --- a/core/server/services/members/middleware.js +++ b/core/server/services/members/middleware.js @@ -89,9 +89,7 @@ const getMemberSiteData = async function (req, res) { ); const stripeSecretToken = stripePaymentProcessor && stripePaymentProcessor.config.secret_token; const stripePublicToken = stripePaymentProcessor && stripePaymentProcessor.config.public_token; - const stripeConnectIntegration = settingsCache.get('stripe_connect_integration'); - - const isStripeConfigured = (!!stripeSecretToken && !!stripePublicToken) || !!(stripeConnectIntegration && stripeConnectIntegration.account_id); + const isStripeConfigured = (!!stripeSecretToken && stripeSecretToken !== '' && !!stripePublicToken && stripePublicToken !== ''); const response = { title: settingsCache.get('title'), description: settingsCache.get('description'), @@ -101,10 +99,7 @@ const getMemberSiteData = async function (req, res) { version: ghostVersion.safe, plans: membersService.config.getPublicPlans(), allowSelfSignup: membersService.config.getAllowSelfSignup(), - isStripeConfigured, - show_beacon: settingsCache.get('membersjs_show_beacon'), - show_signup_name: settingsCache.get('membersjs_show_signup_name'), - allowed_plans: settingsCache.get('membersjs_allowed_plans') + isStripeConfigured }; // Brand is currently an experimental feature