From 8d989bd3c356bb6c1e1c4396a2de6a8de7c3753d Mon Sep 17 00:00:00 2001 From: Rish Date: Tue, 7 Jul 2020 13:41:16 +0530 Subject: [PATCH] Updated members site data to include new portal settings no issue - Adds new portal button settings to members site data for portal script - Updates settings input/output serializers to handle portal icon image url --- core/server/api/canary/utils/serializers/input/settings.js | 2 +- core/server/api/canary/utils/serializers/output/utils/url.js | 2 +- core/server/services/members/middleware.js | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/server/api/canary/utils/serializers/input/settings.js b/core/server/api/canary/utils/serializers/input/settings.js index ded36fdf21..666e861b48 100644 --- a/core/server/api/canary/utils/serializers/input/settings.js +++ b/core/server/api/canary/utils/serializers/input/settings.js @@ -91,7 +91,7 @@ module.exports = { setting.key = 'lang'; } - if (['cover_image', 'icon', 'logo'].includes(setting.key)) { + if (['cover_image', 'icon', 'logo', 'portal_button_icon'].includes(setting.key)) { setting = url.forSetting(setting); } }); diff --git a/core/server/api/canary/utils/serializers/output/utils/url.js b/core/server/api/canary/utils/serializers/output/utils/url.js index 1e2df9bb8b..652f33c111 100644 --- a/core/server/api/canary/utils/serializers/output/utils/url.js +++ b/core/server/api/canary/utils/serializers/output/utils/url.js @@ -93,7 +93,7 @@ const forSettings = (attrs) => { // @NOTE: Admin & Content API return a different format, need to mappers if (_.isArray(attrs)) { attrs.forEach((obj) => { - if (['cover_image', 'logo', 'icon'].includes(obj.key) && obj.value) { + if (['cover_image', 'logo', 'icon', 'portal_button_icon'].includes(obj.key) && obj.value) { obj.value = urlUtils.urlFor('image', {image: obj.value}, true); } }); diff --git a/core/server/services/members/middleware.js b/core/server/services/members/middleware.js index 162f995e52..4207de7651 100644 --- a/core/server/services/members/middleware.js +++ b/core/server/services/members/middleware.js @@ -98,7 +98,10 @@ const getMemberSiteData = async function (req, res) { is_stripe_configured: isStripeConfigured, portal_button: settingsCache.get('portal_button'), portal_name: settingsCache.get('portal_name'), - portal_plans: settingsCache.get('portal_plans') + portal_plans: settingsCache.get('portal_plans'), + portal_button_icon: settingsCache.get('portal_button_icon'), + portal_button_signup_text: settingsCache.get('portal_button_signup_text'), + portal_button_style: settingsCache.get('portal_button_style') }; // accent_color is currently an experimental feature