From aaff165a218397ffef49e6d0365e3812ef864601 Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Thu, 31 Mar 2022 16:15:53 +0200 Subject: [PATCH] Fixed 'labels is not defined on the model' error (#378) no issue - When a new member is added via the API, with a stripe_customer_id, the member bread service is passed also with a default option: `withRelated: ['labels']`. - This option is passed along to the member repository, and further and is also passed when loading relations that don't have a relationship called 'labels'. - This results in a `labels is not defined on the model` error when you try to create a new member with a stripe customer id. - Test that found this issue will be added to the Ghost repo. --- ghost/members-api/lib/services/member-bread.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghost/members-api/lib/services/member-bread.js b/ghost/members-api/lib/services/member-bread.js index 9340bbcf27..66aeaa2041 100644 --- a/ghost/members-api/lib/services/member-bread.js +++ b/ghost/members-api/lib/services/member-bread.js @@ -220,12 +220,16 @@ module.exports = class MemberBREADService { throw error; } + const sharedOptions = options.transacting ? { + transacting: options.transacting + } : {}; + try { if (data.stripe_customer_id) { await this.memberRepository.linkStripeCustomer({ customer_id: data.stripe_customer_id, member_id: model.id - }, options); + }, sharedOptions); } } catch (error) { const isStripeLinkingError = error.message && (error.message.match(/customer|plan|subscription/g)); @@ -245,7 +249,7 @@ module.exports = class MemberBREADService { if (!this.labsService.isSet('multipleProducts')) { if (data.comped) { - await this.memberRepository.setComplimentarySubscription(model, options); + await this.memberRepository.setComplimentarySubscription(model, sharedOptions); } }