Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-02-24 23:48:13 -05:00
Code Issues Activity

Fixed handling of Complimentary Stripe subscriptions (#13289)

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

Since we reintroduced the comped status, we did not update the
subscription handling to correctly set members to a status of comped
when they were on a 'Complimentary' plan. This meant that 'comped' members
had a status of 'paid'. The changes to @tryghost/members-api ensure that
handling subscriptions going forward will not result in this error.

Since we handle the Complimentary plan correctly now, we do not need to
manually check for the existence of one, we can instead rely on the
status to set the `comped` flag.
This commit is contained in:
Fabien 'egg' O'Carroll 2021-09-07 12:31:47 +02:00 • committed by GitHub
parent a0a35df13b
commit ae844db60b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/server/api/canary/utils/serializers/output/members.js
View file

@ -102,20 +102,8 @@ function exportCSV(page, _apiConfig, frame) {
function serializeMember(member, options) { function serializeMember(member, options) {
const json = member.toJSON ? member.toJSON(options) : member; const json = member.toJSON ? member.toJSON(options) : member;
let comped = false; const comped = json.status === 'comped';
if (json.subscriptions) {
const hasCompedSubscription = !!json.subscriptions.find(
/**
* @param {SerializedMemberStripeSubscription} sub
*/
function (sub) {
return sub.plan.nickname === 'Complimentary' && sub.status === 'active';
}
);
if (hasCompedSubscription) {
comped = true;
}
}
const subscriptions = json.subscriptions || []; const subscriptions = json.subscriptions || [];
const serialized = { const serialized = {

2
package.json
View file

@ -73,7 +73,7 @@
"@tryghost/limit-service": "0.6.1", "@tryghost/limit-service": "0.6.1",
"@tryghost/logging": "0.1.6", "@tryghost/logging": "0.1.6",
"@tryghost/magic-link": "1.0.11", "@tryghost/magic-link": "1.0.11",
"@tryghost/members-api": "1.29.2", "@tryghost/members-api": "1.29.3",
"@tryghost/members-csv": "1.1.6", "@tryghost/members-csv": "1.1.6",
"@tryghost/members-importer": "0.3.1", "@tryghost/members-importer": "0.3.1",
"@tryghost/members-ssr": "1.0.12", "@tryghost/members-ssr": "1.0.12",

8
yarn.lock
View file

@ -921,10 +921,10 @@
jsonwebtoken "^8.5.1" jsonwebtoken "^8.5.1"
lodash "^4.17.15" lodash "^4.17.15"
"@tryghost/members-api@1.29.2": "@tryghost/members-api@1.29.3":
version "1.29.2" version "1.29.3"
resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-1.29.2.tgz#e5c01085482d490e5d703b7568105fccee7409da" resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-1.29.3.tgz#793d447ddb4c60efd4099a876ee9036d97f6efd9"
integrity sha512-fCJytSDDflVGC20IpL+8YGrLL2Fb7AEYSIbPPt3vL4gDjh+6+2LGlhkGoYoj2EciLI1J1niT4pOave1fldxWQQ== integrity sha512-NwKuUyuXvF0E4Xo/EYLSLfom8lWv+PydfU62mBBZjiGgAsT94xhs2PqOCL+aHzIxSxrW9phx5KlXK6cvk1wD0A==
dependencies: dependencies:
"@tryghost/debug" "^0.1.2" "@tryghost/debug" "^0.1.2"
"@tryghost/errors" "^0.2.9" "@tryghost/errors" "^0.2.9"