diff --git a/core/client b/core/client index 08cfd215fd..52fe1b452a 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit 08cfd215fd2d609e57ec3f634e546b3ca9f9aa2e +Subproject commit 52fe1b452ad2a2713dd5d0c1a3b3776bd3bee9f1 diff --git a/core/server/api/canary/utils/serializers/output/utils/post-gating.js b/core/server/api/canary/utils/serializers/output/utils/post-gating.js index d73f41e5e3..92c14e4546 100644 --- a/core/server/api/canary/utils/serializers/output/utils/post-gating.js +++ b/core/server/api/canary/utils/serializers/output/utils/post-gating.js @@ -3,6 +3,12 @@ const labs = require('../../../../../../services/labs'); // @TODO: reconsider the location of this - it's part of members and adds a property to the API const forPost = (attrs, frame) => { + // CASE: Access always defaults to true, unless members is enabled and the member does not have access + if (!Object.prototype.hasOwnProperty.call(frame.options, 'columns') || (frame.options.columns.includes('access'))) { + attrs.access = true; + } + + // Handle members being enabled if (labs.isSet('members')) { const memberHasAccess = membersService.contentGating.checkPostAccess(attrs, frame.original.context.member); @@ -18,6 +24,7 @@ const forPost = (attrs, frame) => { attrs.access = memberHasAccess; } } + return attrs; }; diff --git a/core/server/data/migrations/versions/3.22/05-migrate-members-subscription-settings.js b/core/server/data/migrations/versions/3.22/05-migrate-members-subscription-settings.js index bd501ae8c6..4bda1c7533 100644 --- a/core/server/data/migrations/versions/3.22/05-migrate-members-subscription-settings.js +++ b/core/server/data/migrations/versions/3.22/05-migrate-members-subscription-settings.js @@ -42,23 +42,25 @@ module.exports = { .where('key', 'members_subscription_settings') .first(); - if (!membersSubscriptionSettingsJSON) { + if (!membersSubscriptionSettingsJSON || !membersSubscriptionSettingsJSON.value) { logging.warn(`Could not find members_subscription_settings - using default values`); return; } const membersSubscriptionSettings = JSON.parse(membersSubscriptionSettingsJSON.value); - const membersFromAddress = membersSubscriptionSettings.fromAddress; - const membersAllowSelfSignup = membersSubscriptionSettings.allowSelfSignup; + const membersFromAddress = typeof membersSubscriptionSettings.fromAddress === 'string' ? membersSubscriptionSettings.fromAddress : 'noreply'; + const membersAllowSelfSignup = typeof membersSubscriptionSettings.allowSelfSignup === 'boolean' ? membersSubscriptionSettings.allowSelfSignup : true; - const stripe = membersSubscriptionSettings.paymentProcessors[0]; + const stripe = membersSubscriptionSettings && membersSubscriptionSettings.paymentProcessors && membersSubscriptionSettings.paymentProcessors[0]; - const stripeDirectSecretKey = stripe.config.secret_token; - const stripeDirectPublishableKey = stripe.config.public_token; - const stripeProductName = stripe.config.product.name; + const stripeConfig = stripe && stripe.config || {}; - const stripePlans = stripe.config.plans.map((plan) => { + const stripeDirectSecretKey = stripeConfig.secret_token || ''; + const stripeDirectPublishableKey = stripeConfig.public_token || ''; + const stripeProductName = stripeConfig.product && stripeConfig.product.name || 'Ghost Members'; + + const stripePlans = (stripeConfig.plans || []).map((plan) => { return Object.assign(plan, { amount: plan.amount || 0 }); diff --git a/core/server/services/settings/index.js b/core/server/services/settings/index.js index 3c4991fbe4..7f1e77876b 100644 --- a/core/server/services/settings/index.js +++ b/core/server/services/settings/index.js @@ -6,18 +6,17 @@ const models = require('../../models'); const SettingsCache = require('./cache'); module.exports = { - init: function init() { - // Update the defaults - return models.Settings.populateDefaults() - .then((settingsCollection) => { - // Initialise the cache with the result - // This will bind to events for further updates - SettingsCache.init(settingsCollection); - }); + async init() { + const settingsCollection = await models.Settings.populateDefaults(); + SettingsCache.init(settingsCollection); }, - reinit: function reinit() { + async reinit() { SettingsCache.shutdown(); - return this.init(); + const settingsCollection = await models.Settings.populateDefaults(); + SettingsCache.init(settingsCollection); + for (const model of settingsCollection.models) { + model.emitChange(model.attributes.key + '.' + 'edited', {}); + } } }; diff --git a/package.json b/package.json index 10b172fa2d..b92775ba6a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "3.22.1", + "version": "3.22.2", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org", diff --git a/test/api-acceptance/content/utils.js b/test/api-acceptance/content/utils.js index b4a654c678..7e56248ecf 100644 --- a/test/api-acceptance/content/utils.js +++ b/test/api-acceptance/content/utils.js @@ -29,6 +29,8 @@ const expectedProperties = { // .without('page') // v2 returns a calculated excerpt field .concat('excerpt') + // Access is a calculated property in >= v3 + .concat('access') // returns meta fields from `posts_meta` schema .concat( ..._(schema.posts_meta).keys().without('post_id', 'id') diff --git a/test/regression/api/canary/content/posts_spec.js b/test/regression/api/canary/content/posts_spec.js index dd7bf5a371..6fea281264 100644 --- a/test/regression/api/canary/content/posts_spec.js +++ b/test/regression/api/canary/content/posts_spec.js @@ -227,7 +227,6 @@ describe('api/canary/content/posts', function () { let publicPost; let membersPost; let paidPost; - let contentGatingFields = ['access']; before(function () { // NOTE: ideally this would be set through Admin API request not a stub @@ -291,7 +290,7 @@ describe('api/canary/content/posts', function () { should.exist(jsonResponse.posts); const post = jsonResponse.posts[0]; - localUtils.API.checkResponse(post, 'post', contentGatingFields, null); + localUtils.API.checkResponse(post, 'post', null, null); post.slug.should.eql('thou-shalt-not-be-seen'); post.html.should.eql(''); }); @@ -309,7 +308,7 @@ describe('api/canary/content/posts', function () { should.exist(jsonResponse.posts); const post = jsonResponse.posts[0]; - localUtils.API.checkResponse(post, 'post', contentGatingFields, null); + localUtils.API.checkResponse(post, 'post', null, null); post.slug.should.eql('thou-shalt-be-paid-for'); post.html.should.eql(''); }); @@ -348,7 +347,7 @@ describe('api/canary/content/posts', function () { should.exist(jsonResponse.posts); localUtils.API.checkResponse(jsonResponse, 'posts'); jsonResponse.posts.should.have.length(14); - localUtils.API.checkResponse(jsonResponse.posts[0], 'post', contentGatingFields, null); + localUtils.API.checkResponse(jsonResponse.posts[0], 'post', null, null); localUtils.API.checkResponse(jsonResponse.meta.pagination, 'pagination'); _.isBoolean(jsonResponse.posts[0].featured).should.eql(true); diff --git a/test/regression/api/canary/content/utils.js b/test/regression/api/canary/content/utils.js index 3b0df72970..4fac2a65ca 100644 --- a/test/regression/api/canary/content/utils.js +++ b/test/regression/api/canary/content/utils.js @@ -28,6 +28,8 @@ const expectedProperties = { .without('type') // canary returns a calculated excerpt field .concat('excerpt') + // Access is a calculated property in >= v3 + .concat('access') // returns meta fields from `posts_meta` schema .concat( ..._(schema.posts_meta).keys().without('post_id', 'id') diff --git a/test/regression/api/v3/content/posts_spec.js b/test/regression/api/v3/content/posts_spec.js index ba333e4b81..e551284474 100644 --- a/test/regression/api/v3/content/posts_spec.js +++ b/test/regression/api/v3/content/posts_spec.js @@ -227,7 +227,6 @@ describe('api/v3/content/posts', function () { let publicPost; let membersPost; let paidPost; - let contentGatingFields = ['access']; before(function () { // NOTE: ideally this would be set through Admin API request not a stub @@ -291,7 +290,7 @@ describe('api/v3/content/posts', function () { should.exist(jsonResponse.posts); const post = jsonResponse.posts[0]; - localUtils.API.checkResponse(post, 'post', contentGatingFields, null); + localUtils.API.checkResponse(post, 'post', null, null); post.slug.should.eql('thou-shalt-not-be-seen'); post.html.should.eql(''); }); @@ -309,7 +308,7 @@ describe('api/v3/content/posts', function () { should.exist(jsonResponse.posts); const post = jsonResponse.posts[0]; - localUtils.API.checkResponse(post, 'post', contentGatingFields, null); + localUtils.API.checkResponse(post, 'post', null, null); post.slug.should.eql('thou-shalt-be-paid-for'); post.html.should.eql(''); }); @@ -348,7 +347,7 @@ describe('api/v3/content/posts', function () { should.exist(jsonResponse.posts); localUtils.API.checkResponse(jsonResponse, 'posts'); jsonResponse.posts.should.have.length(14); - localUtils.API.checkResponse(jsonResponse.posts[0], 'post', contentGatingFields, null); + localUtils.API.checkResponse(jsonResponse.posts[0], 'post', null, null); localUtils.API.checkResponse(jsonResponse.meta.pagination, 'pagination'); _.isBoolean(jsonResponse.posts[0].featured).should.eql(true); diff --git a/test/regression/api/v3/content/utils.js b/test/regression/api/v3/content/utils.js index c50d0571fa..5895ad0fc9 100644 --- a/test/regression/api/v3/content/utils.js +++ b/test/regression/api/v3/content/utils.js @@ -28,6 +28,8 @@ const expectedProperties = { .without('type') // v3 returns a calculated excerpt field .concat('excerpt') + // Access is a calculated property in >= v3 + .concat('access') // returns meta fields from `posts_meta` schema .concat( ..._(schema.posts_meta).keys().without('post_id', 'id')