mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-10 23:36:14 -05:00
a565da06b2
refs https://github.com/TryGhost/Team/issues/1257 Offer Redemptions were being overcounted due to the way we were updating Stripe configuration for the Members service. We would create a new instance of the members-api, which would have event handlers for creating Offer Redemptions - by creating a new instance each time Stripe config changed, we would overcount them. Here we've pulled out Stripe related logic into the Stripe service, and updated it internally - rather than creating a new instance. This means that we've been able to remove all of the logic for re-instantiating the members-api. - Bumped members-api & stripe-service - Removed reinstantiation of members-api - Used stripe service to execute migrations - Updated Stripe Service to handle webhooks & migrations - Used webhook controller from stripe service - Used disconnect method from stripe service - Removed unused stripe dependency - Removed Stripe webhook config from members-api
53 lines
1.7 KiB
JavaScript
53 lines
1.7 KiB
JavaScript
const _ = require('lodash');
|
|
const StripeService = require('@tryghost/members-stripe-service');
|
|
const membersService = require('../members');
|
|
const config = require('../../../shared/config');
|
|
const settings = require('../../../shared/settings-cache');
|
|
const urlUtils = require('../../../shared/url-utils');
|
|
const events = require('../../lib/common/events');
|
|
const models = require('../../models');
|
|
const {getConfig} = require('./config');
|
|
|
|
function configureApi() {
|
|
const cfg = getConfig(settings, config, urlUtils);
|
|
if (cfg) {
|
|
module.exports.configure(cfg);
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
const debouncedConfigureApi = _.debounce(() => {
|
|
configureApi();
|
|
}, 600);
|
|
|
|
module.exports = new StripeService({
|
|
membersService,
|
|
models: _.pick(models, ['Product', 'StripePrice', 'StripeCustomerSubscription', 'StripeProduct', 'MemberStripeCustomer', 'Offer', 'Settings']),
|
|
StripeWebhook: {
|
|
async get() {
|
|
return {
|
|
webhook_id: settings.get('members_stripe_webhook_id'),
|
|
secret: settings.get('members_stripe_webhook_secret')
|
|
};
|
|
},
|
|
async save(data) {
|
|
await models.Settings.edit([{
|
|
key: 'members_stripe_webhook_id',
|
|
value: data.webhook_id
|
|
}, {
|
|
key: 'members_stripe_webhook_secret',
|
|
value: data.secret
|
|
}]);
|
|
}
|
|
}
|
|
});
|
|
|
|
module.exports.init = async function init() {
|
|
configureApi();
|
|
events.on('settings.edited', function (model) {
|
|
if (['stripe_publishable_key', 'stripe_secret_key', 'stripe_connect_publishable_key', 'stripe_connect_secret_key'].includes(model.get('key'))) {
|
|
debouncedConfigureApi();
|
|
}
|
|
});
|
|
};
|