diff --git a/core/server/services/members/middleware.js b/core/server/services/members/middleware.js index 609b6da985..51deafbf15 100644 --- a/core/server/services/members/middleware.js +++ b/core/server/services/members/middleware.js @@ -176,18 +176,10 @@ const createSessionFromMagicLink = async function (req, res, next) { }) .find(sub => ['active', 'trialing'].includes(sub.status)); if (mostRecentActiveSubscription) { - if (labsService.isSet('tierWelcomePages')) { - customRedirect = mostRecentActiveSubscription.tier.welcome_page_url; - } else { - customRedirect = settingsCache.get('members_paid_signup_redirect') || ''; - } + customRedirect = mostRecentActiveSubscription.tier.welcome_page_url; } else { - if (labsService.isSet('tierWelcomePages')) { - const freeTier = await models.Product.findOne({type: 'free'}); - customRedirect = freeTier && freeTier.get('welcome_page_url') || ''; - } else { - customRedirect = settingsCache.get('members_free_signup_redirect') || ''; - } + const freeTier = await models.Product.findOne({type: 'free'}); + customRedirect = freeTier && freeTier.get('welcome_page_url') || ''; } if (customRedirect && customRedirect !== '/') { diff --git a/core/server/services/members/service.js b/core/server/services/members/service.js index b58f21bc45..de7764405a 100644 --- a/core/server/services/members/service.js +++ b/core/server/services/members/service.js @@ -18,7 +18,6 @@ const jobsService = require('../jobs'); const VerificationTrigger = require('@tryghost/verification-trigger'); const DomainEvents = require('@tryghost/domain-events'); const {LastSeenAtUpdater} = require('@tryghost/members-events-service'); -const events = require('../../lib/common/events'); const DatabaseInfo = require('@tryghost/database-info'); const messages = { @@ -74,32 +73,6 @@ module.exports = { const createMembersApiInstance = require('./api'); const env = config.get('env'); - events.on('settings.edited', async function (settingModel) { - if (labsService.isSet('multipleProducts')) { - return; - } - - const key = settingModel.get('key'); - const value = settingModel.get('value'); - - if (key === 'members_free_signup_redirect') { - try { - await models.Product.forge().query().update('welcome_page_url', value).where('type', 'free'); - } catch (err) { - logging.error(err); - } - return; - } - if (key === 'members_paid_signup_redirect') { - try { - await models.Product.forge().query().update('welcome_page_url', value).where('type', 'paid'); - } catch (err) { - logging.error(err); - } - return; - } - }); - // @TODO Move to stripe service if (env !== 'production') { if (stripeService.api.configured && stripeService.api.mode === 'live') {