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

Swapped setup to use tiers API endpoint

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

- the products endpoint is going away in favour of tiers
This commit is contained in:
Hannah Wolfe 2022-05-12 19:40:08 +01:00
parent b6d9389124
commit a58ac016be
No known key found for this signature in database
GPG key ID: AB586C3B5AE5C037
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/server/services/auth/setup.js
View file

@ -108,8 +108,8 @@ async function doSettings(data, settingsAPI) {
} }
// Update names for default product and newsletter to site title // Update names for default product and newsletter to site title
async function doProductAndNewsletter(data, api) { async function doTiersAndNewsletter(data, api) {
const {products: productsAPI, newsletters: newslettersAPI} = api; const {tiers: tiersAPI, newsletters: newslettersAPI} = api;
const context = {context: {user: data.user.id}}; const context = {context: {user: data.user.id}};
const user = data.user; const user = data.user;
const blogTitle = data.userData.blogTitle; const blogTitle = data.userData.blogTitle;
@ -118,16 +118,16 @@ async function doProductAndNewsletter(data, api) {
return user; return user;
} }
try { try {
const productPage = await productsAPI.browse({limit: 'all'}); const tierPage = await tiersAPI.browse({limit: 'all'});
const newsletterPage = await newslettersAPI.browse({limit: 'all'}); const newsletterPage = await newslettersAPI.browse({limit: 'all'});
const defaultProduct = productPage.products.find(p => p.slug === 'default-product'); const defaultTier = tierPage.tiers.find(p => p.slug === 'default-product');
const defaultNewsletter = newsletterPage.newsletters.find(p => p.slug === 'default-newsletter'); const defaultNewsletter = newsletterPage.newsletters.find(p => p.slug === 'default-newsletter');
if (defaultProduct) { if (defaultTier) {
await productsAPI.edit({products: [{ await tiersAPI.edit({tiers: [{
name: blogTitle.trim() name: blogTitle.trim()
}]}, {context: context.context, id: defaultProduct.id}); }]}, {context: context.context, id: defaultTier.id});
} }
if (defaultNewsletter) { if (defaultNewsletter) {
@ -231,7 +231,7 @@ module.exports = {
assertSetupCompleted: assertSetupCompleted, assertSetupCompleted: assertSetupCompleted,
setupUser: setupUser, setupUser: setupUser,
doSettings: doSettings, doSettings: doSettings,
doProductAndNewsletter: doProductAndNewsletter, doProductAndNewsletter: doTiersAndNewsletter,
installTheme: installTheme, installTheme: installTheme,
doFixtures: doFixtures, doFixtures: doFixtures,
sendWelcomeEmail: sendWelcomeEmail sendWelcomeEmail: sendWelcomeEmail

22
test/unit/server/services/auth/setup.test.js
View file

@ -1,4 +1,4 @@
const {doProductAndNewsletter} = require('../../../../../core/server/services/auth/setup'); const {doProductAndNewsletter: doTierAndNewsletter} = require('../../../../../core/server/services/auth/setup');
const sinon = require('sinon'); const sinon = require('sinon');
describe('Auth Service: setup', function () { describe('Auth Service: setup', function () {
@ -8,10 +8,10 @@ describe('Auth Service: setup', function () {
describe('doProductAndNewsletter', function () { describe('doProductAndNewsletter', function () {
it('updates default product and newsletter name', async function () { it('updates default product and newsletter name', async function () {
const productEditStub = sinon.stub().resolves(); const tierEditStub = sinon.stub().resolves();
const newsletterEditStub = sinon.stub().resolves(); const newsletterEditStub = sinon.stub().resolves();
const productBrowseStub = sinon.stub().resolves({ const tierBrowseStub = sinon.stub().resolves({
products: [ tiers: [
{ {
id: 'product-1', id: 'product-1',
slug: 'free' slug: 'free'
@ -34,16 +34,16 @@ describe('Auth Service: setup', function () {
} }
] ]
}); });
let productsApi = { let tiersAPI = {
browse: productBrowseStub, browse: tierBrowseStub,
edit: productEditStub edit: tierEditStub
}; };
let newslettersApi = { let newslettersApi = {
browse: newsletterBrowseStub, browse: newsletterBrowseStub,
edit: newsletterEditStub edit: newsletterEditStub
}; };
const api = { const api = {
products: productsApi, tiers: tiersAPI,
newsletters: newslettersApi newsletters: newslettersApi
}; };
let data = { let data = {
@ -54,10 +54,10 @@ describe('Auth Service: setup', function () {
blogTitle: 'Test Blog' blogTitle: 'Test Blog'
} }
}; };
await doProductAndNewsletter(data, api); await doTierAndNewsletter(data, api);
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(
productEditStub, tierEditStub,
{products: [{name: 'Test Blog'}]}, {tiers: [{name: 'Test Blog'}]},
{context: {user: 'user-1'}, id: 'product-2'} {context: {user: 'user-1'}, id: 'product-2'}
); );
sinon.assert.calledOnceWithExactly( sinon.assert.calledOnceWithExactly(