Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-20 22:42:53 -05:00
Code Issues Activity

Updated products data in portal site endpoint

Browse source 
refs https://github.com/TryGhost/Team/issues/763
refs https://github.com/TryGhost/Team/issues/718

- Removes redundant `plans` data from site data
- Updates products data to include monthly/yearly price
- Filters multiple products on site data based on labs flag
This commit is contained in:
Rishabh 2021-06-11 12:36:54 +05:30
parent 1bc57b584a
commit 0766a19afd
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
core/server/services/members/middleware.js
View file

@ -5,6 +5,7 @@ const urlUtils = require('../../../shared/url-utils');
const ghostVersion = require('../../lib/ghost-version'); const ghostVersion = require('../../lib/ghost-version');
const settingsCache = require('../settings/cache'); const settingsCache = require('../settings/cache');
const {formattedMemberResponse} = require('./utils'); const {formattedMemberResponse} = require('./utils');
const labsService = require('../labs');
// @TODO: This piece of middleware actually belongs to the frontend, not to the member app // @TODO: This piece of middleware actually belongs to the frontend, not to the member app
// Need to figure a way to separate these things (e.g. frontend actually talks to members API) // Need to figure a way to separate these things (e.g. frontend actually talks to members API)
@ -95,14 +96,21 @@ const getPortalProductPrices = async function () {
id: product.id, id: product.id,
name: product.name, name: product.name,
description: product.description || '', description: product.description || '',
monthlyPrice: product.monthlyPrice,
yearlyPrice: product.yearlyPrice,
prices: productPrices prices: productPrices
}; };
}); });
const defaultProduct = products[0];
const defaultPrices = defaultProduct ? defaultProduct.prices : [];
let portalProducts = defaultProduct ? [defaultProduct] : [];
if (labsService.isSet('multipleProducts')) {
portalProducts = products;
}
const defaultPrices = products[0] ? products[0].prices : [];
return { return {
prices: defaultPrices, prices: defaultPrices,
products: products products: portalProducts
}; };
}; };
@ -124,9 +132,6 @@ const getMemberSiteData = async function (req, res) {
accent_color: settingsCache.get('accent_color'), accent_color: settingsCache.get('accent_color'),
url: urlUtils.urlFor('home', true), url: urlUtils.urlFor('home', true),
version: ghostVersion.safe, version: ghostVersion.safe,
plans: membersService.config.getPublicPlans(),
prices,
products,
free_price_name: settingsCache.get('members_free_price_name'), free_price_name: settingsCache.get('members_free_price_name'),
free_price_description: settingsCache.get('members_free_price_description'), free_price_description: settingsCache.get('members_free_price_description'),
allow_self_signup: membersService.config.getAllowSelfSignup(), allow_self_signup: membersService.config.getAllowSelfSignup(),
@ -139,7 +144,9 @@ const getMemberSiteData = async function (req, res) {
portal_button_signup_text: settingsCache.get('portal_button_signup_text'), portal_button_signup_text: settingsCache.get('portal_button_signup_text'),
portal_button_style: settingsCache.get('portal_button_style'), portal_button_style: settingsCache.get('portal_button_style'),
firstpromoter_id: firstpromoterId, firstpromoter_id: firstpromoterId,
members_support_address: supportAddress members_support_address: supportAddress,
prices,
products
}; };
res.json({site: response}); res.json({site: response});