ghost 5.12.2 → 5.13.0

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.12%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.13%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22moment%22%3A%7B%22includeTimezone%22%3A%22all%22%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -36,8 +36,8 @@
         }
     </style>
 
-    <link integrity="" rel="stylesheet" href="assets/vendor-bc9d2c9e5c8a33f0c92e81189d48e04c.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-0bbbef127e5dc0c0651fc442c4fdba8e.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/vendor-733135cd6cbca8126c6fa223d63a5bf3.css">
+    <link integrity="" rel="stylesheet" href="assets/ghost-647c9a79282265a4d29bf273c44f72c0.css" title="light">
 
     
 </head>
@@ -53,9 +53,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-52613f40d62355e9ac64cbfa211169bb.js"></script>
-<script src="assets/chunk.579.65e09dd89eec70d059a0.js"></script>
-<script src="assets/chunk.143.b51e90c24c7efd3fbc00.js"></script>
-    <script src="assets/ghost-0526c96b20843697927c1d06a9010197.js"></script>
+    <script src="assets/vendor-ab4b5dfdf8b86f24d726115ac7de0980.js"></script>
+<script src="assets/chunk.763.9a285d7351e1f4415f8d.js"></script>
+<script src="assets/chunk.143.e96aad00fdf7196692c7.js"></script>
+    <script src="assets/ghost-3203510c519d3195f1e71a34e9eecc59.js"></script>
 </body>
 </html>

package/core/server/lib/common/events.js

@@ -22,6 +22,18 @@ EventRegistry = function () {
 
 util.inherits(EventRegistry, events.EventEmitter);
 
+/**
+ * This is method is semi-hack to make sure listeners are only registered once
+ * during the lifetime of the process. And example problem it solves is
+ * registering duplicate listeners between Ghost instance reboots when running tests.
+ * @param {String} eventName
+ * @param {String} listenerName named function name registered as a listener for the event
+ * @returns {Boolean}
+ */
+EventRegistry.prototype.hasRegisteredListener = function (eventName, listenerName) {
+    return !!(this.listeners(eventName).find(listener => (listener.name === listenerName)));
+};
+
 EventRegistryInstance = new EventRegistry();
 EventRegistryInstance.setMaxListeners(100);
 

package/core/server/services/comments/emails.js

@@ -5,12 +5,13 @@ const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const postEmailSerializer = require('../mega/post-email-serializer');
 
 class CommentsServiceEmails {
-    constructor({config, logging, models, mailer, settingsCache, urlService, urlUtils}) {
+    constructor({config, logging, models, mailer, settingsCache, settingsHelpers, urlService, urlUtils}) {
         this.config = config;
         this.logging = logging;
         this.models = models;
         this.mailer = mailer;
         this.settingsCache = settingsCache;
+        this.settingsHelpers = settingsHelpers;
         this.urlService = urlService;
         this.urlUtils = urlUtils;
 
@@ -166,25 +167,8 @@ class CommentsServiceEmails {
         return siteDomain;
     }
 
-    get membersAddress() {
-        // TODO: get from address of default newsletter?
-        return `noreply@${this.siteDomain}`;
-    }
-
-    // TODO: duplicated from services/members/config - exrtact to settings?
-    get supportAddress() {
-        const supportAddress = this.settingsCache.get('members_support_address') || 'noreply';
-
-        // Any fromAddress without domain uses site domain, like default setting `noreply`
-        if (supportAddress.indexOf('@') < 0) {
-            return `${supportAddress}@${this.siteDomain}`;
-        }
-
-        return supportAddress;
-    }
-
     get notificationFromAddress() {
-        return this.supportAddress || this.membersAddress;
+        return this.settingsHelpers.getMembersSupportAddress();
     }
 
     extractInitials(name = '') {

package/core/server/services/comments/index.js

@@ -14,6 +14,7 @@ class CommentsServiceWrapper {
         const urlUtils = require('../../../shared/url-utils');
         const membersService = require('../members');
         const db = require('../../data/db');
+        const settingsHelpers = require('../settings-helpers');
 
         this.api = new CommentsService({
             config,
@@ -21,6 +22,7 @@ class CommentsServiceWrapper {
             models,
             mailer,
             settingsCache,
+            settingsHelpers,
             urlService,
             urlUtils,
             contentGating: membersService.contentGating

package/core/server/services/comments/service.js

@@ -15,7 +15,7 @@ const messages = {
 };
 
 class CommentsService {
-    constructor({config, logging, models, mailer, settingsCache, urlService, urlUtils, contentGating}) {
+    constructor({config, logging, models, mailer, settingsCache, settingsHelpers, urlService, urlUtils, contentGating}) {
         /** @private */
         this.models = models;
 
@@ -33,6 +33,7 @@ class CommentsService {
             models,
             mailer,
             settingsCache,
+            settingsHelpers,
             urlService,
             urlUtils
         });

package/core/server/services/mega/post-email-serializer.js

@@ -248,7 +248,14 @@ const serialize = async (postModel, newsletter, options = {isBrowserPreview: fal
     const momentDate = post.published_at ? moment(post.published_at) : moment();
     post.published_at = momentDate.tz(timezone).format('DD MMM YYYY');
 
-    post.authors = post.authors && post.authors.map(author => author.name).join(', ');
+    if (post.authors) {
+        if (post.authors.length <= 2) {
+            post.authors = post.authors.map(author => author.name).join(' & ');
+        } else if (post.authors.length > 2) {
+            post.authors = `${post.authors[0].name} & ${post.authors.length - 1} others`;
+        }
+    }
+
     if (post.posts_meta) {
         post.email_subject = post.posts_meta.email_subject;
     }

package/core/server/services/mega/template.js

@@ -28,9 +28,10 @@ const sanitizeKeys = (obj, keys) => {
 module.exports = ({post, site, newsletter, templateSettings}) => {
     const date = new Date();
     const hasFeatureImageCaption = templateSettings.showFeatureImage && post.feature_image && post.feature_image_caption;
-    const cleanPost = sanitizeKeys(post, ['title', 'excerpt', 'html', 'feature_image_alt', 'feature_image_caption']);
+    const cleanPost = sanitizeKeys(post, ['title', 'excerpt', 'authors', 'feature_image_alt', 'feature_image_caption']);
     const cleanSite = sanitizeKeys(site, ['title']);
     const cleanNewsletter = sanitizeKeys(newsletter, ['name']);
+
     return `<!doctype html>
 <html>
 

package/core/server/services/members/config.js

@@ -1,101 +1,40 @@
-const errors = require('@tryghost/errors');
 const logging = require('@tryghost/logging');
-const tpl = require('@tryghost/tpl');
 const {URL} = require('url');
 const crypto = require('crypto');
 const createKeypair = require('keypair');
 
-const messages = {
-    incorrectKeyType: 'type must be one of "direct" or "connect".'
-};
-
 class MembersConfigProvider {
     /**
      * @param {object} options
      * @param {{get: (key: string) => any}} options.settingsCache
-     * @param {{get: (key: string) => any}} options.config
+     * @param {{getDefaultEmailDomain(): string, getMembersSupportAddress(): string, isStripeConnected(): boolean}} options.settingsHelpers
      * @param {any} options.urlUtils
      */
-    constructor(options) {
-        this._settingsCache = options.settingsCache;
-        this._config = options.config;
-        this._urlUtils = options.urlUtils;
+    constructor({settingsCache, settingsHelpers, urlUtils}) {
+        this._settingsCache = settingsCache;
+        this._settingsHelpers = settingsHelpers;
+        this._urlUtils = urlUtils;
     }
 
-    /**
-     * @private
-     */
-    _getDomain() {
-        const url = this._urlUtils.urlFor('home', true).match(new RegExp('^https?://([^/:?#]+)(?:[/:?#]|$)', 'i'));
-        const domain = (url && url[1]) || '';
-        if (domain.startsWith('www.')) {
-            return domain.replace(/^(www)\.(?=[^/]*\..{2,5})/, '');
-        }
-        return domain;
+    get defaultEmailDomain() {
+        return this._settingsHelpers.getDefaultEmailDomain();
     }
 
     getEmailFromAddress() {
         // Individual from addresses are set per newsletter - this is the fallback address
-        return `noreply@${this._getDomain()}`;
+        return `noreply@${this.defaultEmailDomain}`;
     }
 
     getEmailSupportAddress() {
-        const supportAddress = this._settingsCache.get('members_support_address') || 'noreply';
-
-        // Any fromAddress without domain uses site domain, like default setting `noreply`
-        if (supportAddress.indexOf('@') < 0) {
-            return `${supportAddress}@${this._getDomain()}`;
-        }
-        return supportAddress;
+        return this._settingsHelpers.getMembersSupportAddress();
     }
 
     getAuthEmailFromAddress() {
-        return this.getEmailSupportAddress() || this.getEmailFromAddress();
-    }
-
-    /**
-     * @param {'direct' | 'connect'} type - The "type" of keys to fetch from settings
-     * @returns {{publicKey: string, secretKey: string} | null}
-     */
-    getStripeKeys(type) {
-        if (type !== 'direct' && type !== 'connect') {
-            throw new errors.IncorrectUsageError({message: tpl(messages.incorrectKeyType)});
-        }
-
-        const secretKey = this._settingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}secret_key`);
-        const publicKey = this._settingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}publishable_key`);
-
-        if (!secretKey || !publicKey) {
-            return null;
-        }
-
-        return {
-            secretKey,
-            publicKey
-        };
-    }
-
-    /**
-     * @returns {{publicKey: string, secretKey: string} | null}
-     */
-    getActiveStripeKeys() {
-        const stripeDirect = this._config.get('stripeDirect');
-
-        if (stripeDirect) {
-            return this.getStripeKeys('direct');
-        }
-
-        const connectKeys = this.getStripeKeys('connect');
-
-        if (!connectKeys) {
-            return this.getStripeKeys('direct');
-        }
-
-        return connectKeys;
+        return this.getEmailSupportAddress();
     }
 
     isStripeConnected() {
-        return this.getActiveStripeKeys() !== null;
+        return this._settingsHelpers.isStripeConnected();
     }
 
     getAuthSecret() {

package/core/server/services/members/middleware.js

@@ -3,6 +3,7 @@ const logging = require('@tryghost/logging');
 const membersService = require('./service');
 const models = require('../../models');
 const urlUtils = require('../../../shared/url-utils');
+const spamPrevention = require('../../web/shared/middleware/api/spam-prevention');
 const {formattedMemberResponse} = require('./utils');
 
 // @TODO: This piece of middleware actually belongs to the frontend, not to the member app
@@ -155,6 +156,7 @@ const createSessionFromMagicLink = async function (req, res, next) {
 
     try {
         const member = await membersService.ssr.exchangeTokenForSession(req, res);
+        spamPrevention.membersAuth().reset(req.ip, `${member.email}login`);
         const subscriptions = member && member.subscriptions || [];
 
         const action = req.query.action;

package/core/server/services/members/service.js

@@ -20,6 +20,7 @@ const VerificationTrigger = require('@tryghost/verification-trigger');
 const DomainEvents = require('@tryghost/domain-events');
 const {LastSeenAtUpdater} = require('@tryghost/members-events-service');
 const DatabaseInfo = require('@tryghost/database-info');
+const settingsHelpers = require('../settings-helpers');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',
@@ -30,7 +31,7 @@ const messages = {
 const ghostMailer = new GhostMailer();
 
 const membersConfig = new MembersConfigProvider({
-    config,
+    settingsHelpers,
     settingsCache,
     urlUtils
 });

package/core/server/services/settings/settings-service.js

@@ -2,13 +2,9 @@
  * Settings Lib
  * A collection of utilities for handling settings including a cache
  */
-const errors = require('@tryghost/errors');
-const tpl = require('@tryghost/tpl');
-
 const events = require('../../lib/common/events');
 const models = require('../../models');
 const labs = require('../../../shared/labs');
-const config = require('../../../shared/config');
 const adapterManager = require('../adapter-manager');
 const SettingsCache = require('../../../shared/settings-cache');
 const SettingsBREADService = require('./settings-bread-service');
@@ -18,10 +14,7 @@ const SingleUseTokenProvider = require('../members/SingleUseTokenProvider');
 const urlUtils = require('../../../shared/url-utils');
 
 const ObjectId = require('bson-objectid');
-
-const messages = {
-    incorrectKeyType: 'type must be one of "direct" or "connect".'
-};
+const settingsHelpers = require('../settings-helpers');
 
 const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
 
@@ -79,76 +72,16 @@ module.exports = {
         SettingsCache.reset(events);
     },
 
-    isMembersEnabled() {
-        return SettingsCache.get('members_signup_access') !== 'none';
-    },
-
-    isMembersInviteOnly() {
-        return SettingsCache.get('members_signup_access') === 'invite';
-    },
-
-    /**
-     * @param {'direct' | 'connect'} type - The "type" of keys to fetch from settings
-     * @returns {{publicKey: string, secretKey: string} | null}
-     */
-    getStripeKeys(type) {
-        if (type !== 'direct' && type !== 'connect') {
-            throw new errors.IncorrectUsageError({message: tpl(messages.incorrectKeyType)});
-        }
-
-        const secretKey = SettingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}secret_key`);
-        const publicKey = SettingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}publishable_key`);
-
-        if (!secretKey || !publicKey) {
-            return null;
-        }
-
-        return {
-            secretKey,
-            publicKey
-        };
-    },
-
-    /**
-     * @returns {{publicKey: string, secretKey: string} | null}
-     */
-    getActiveStripeKeys() {
-        const stripeDirect = config.get('stripeDirect');
-
-        if (stripeDirect) {
-            return this.getStripeKeys('direct');
-        }
-
-        const connectKeys = this.getStripeKeys('connect');
-
-        if (!connectKeys) {
-            return this.getStripeKeys('direct');
-        }
-
-        return connectKeys;
-    },
-
-    arePaidMembersEnabled() {
-        return this.isMembersEnabled() && this.getActiveStripeKeys() !== null;
-    },
-
-    getFirstpromoterId() {
-        if (!SettingsCache.get('firstpromoter')) {
-            return null;
-        }
-        return SettingsCache.get('firstpromoter_id');
-    },
-
     /**
      *
      */
     getCalculatedFields() {
         const fields = [];
 
-        fields.push(new CalculatedField({key: 'members_enabled', type: 'boolean', group: 'members', fn: this.isMembersEnabled.bind(this), dependents: ['members_signup_access']}));
-        fields.push(new CalculatedField({key: 'members_invite_only', type: 'boolean', group: 'members', fn: this.isMembersInviteOnly.bind(this), dependents: ['members_signup_access']}));
-        fields.push(new CalculatedField({key: 'paid_members_enabled', type: 'boolean', group: 'members', fn: this.arePaidMembersEnabled.bind(this), dependents: ['members_signup_access', 'stripe_secret_key', 'stripe_publishable_key', 'stripe_connect_secret_key', 'stripe_connect_publishable_key']}));
-        fields.push(new CalculatedField({key: 'firstpromoter_account', type: 'string', group: 'firstpromoter', fn: this.getFirstpromoterId.bind(this), dependents: ['firstpromoter', 'firstpromoter_id']}));
+        fields.push(new CalculatedField({key: 'members_enabled', type: 'boolean', group: 'members', fn: settingsHelpers.isMembersEnabled.bind(settingsHelpers), dependents: ['members_signup_access']}));
+        fields.push(new CalculatedField({key: 'members_invite_only', type: 'boolean', group: 'members', fn: settingsHelpers.isMembersInviteOnly.bind(settingsHelpers), dependents: ['members_signup_access']}));
+        fields.push(new CalculatedField({key: 'paid_members_enabled', type: 'boolean', group: 'members', fn: settingsHelpers.arePaidMembersEnabled.bind(settingsHelpers), dependents: ['members_signup_access', 'stripe_secret_key', 'stripe_publishable_key', 'stripe_connect_secret_key', 'stripe_connect_publishable_key']}));
+        fields.push(new CalculatedField({key: 'firstpromoter_account', type: 'string', group: 'firstpromoter', fn: settingsHelpers.getFirstpromoterId.bind(settingsHelpers), dependents: ['firstpromoter', 'firstpromoter_id']}));
 
         return fields;
     },

package/core/server/services/settings-helpers/index.js

@@ -0,0 +1,6 @@
+const settingsCache = require('../../../shared/settings-cache');
+const urlUtils = require('../../../shared/url-utils');
+const config = require('../../../shared/config');
+const SettingsHelpers = require('./settings-helpers');
+
+module.exports = new SettingsHelpers({settingsCache, urlUtils, config});

package/core/server/services/settings-helpers/settings-helpers.js

@@ -0,0 +1,99 @@
+const tpl = require('@tryghost/tpl');
+const errors = require('@tryghost/errors');
+
+const messages = {
+    incorrectKeyType: 'type must be one of "direct" or "connect".'
+};
+
+class SettingsHelpers {
+    constructor({settingsCache, urlUtils, config}) {
+        this.settingsCache = settingsCache;
+        this.urlUtils = urlUtils;
+        this.config = config;
+    }
+
+    isMembersEnabled() {
+        return this.settingsCache.get('members_signup_access') !== 'none';
+    }
+
+    isMembersInviteOnly() {
+        return this.settingsCache.get('members_signup_access') === 'invite';
+    }
+
+    /**
+     * @param {'direct' | 'connect'} type - The "type" of keys to fetch from settings
+     * @returns {{publicKey: string, secretKey: string} | null}
+     */
+    getStripeKeys(type) {
+        if (type !== 'direct' && type !== 'connect') {
+            throw new errors.IncorrectUsageError({message: tpl(messages.incorrectKeyType)});
+        }
+
+        const secretKey = this.settingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}secret_key`);
+        const publicKey = this.settingsCache.get(`stripe_${type === 'connect' ? 'connect_' : ''}publishable_key`);
+
+        if (!secretKey || !publicKey) {
+            return null;
+        }
+
+        return {
+            secretKey,
+            publicKey
+        };
+    }
+
+    /**
+     * @returns {{publicKey: string, secretKey: string} | null}
+     */
+    getActiveStripeKeys() {
+        const stripeDirect = this.config.get('stripeDirect');
+
+        if (stripeDirect) {
+            return this.getStripeKeys('direct');
+        }
+
+        const connectKeys = this.getStripeKeys('connect');
+
+        if (!connectKeys) {
+            return this.getStripeKeys('direct');
+        }
+
+        return connectKeys;
+    }
+
+    isStripeConnected() {
+        return this.getActiveStripeKeys() !== null;
+    }
+
+    arePaidMembersEnabled() {
+        return this.isMembersEnabled() && this.isStripeConnected();
+    }
+
+    getFirstpromoterId() {
+        if (!this.settingsCache.get('firstpromoter')) {
+            return null;
+        }
+        return this.settingsCache.get('firstpromoter_id');
+    }
+
+    getDefaultEmailDomain() {
+        const url = this.urlUtils.urlFor('home', true).match(new RegExp('^https?://([^/:?#]+)(?:[/:?#]|$)', 'i'));
+        const domain = (url && url[1]) || '';
+        if (domain.startsWith('www.')) {
+            return domain.substring('www.'.length);
+        }
+        return domain;
+    }
+
+    getMembersSupportAddress() {
+        const supportAddress = this.settingsCache.get('members_support_address') || 'noreply';
+
+        // Any fromAddress without domain uses site domain, like default setting `noreply`
+        if (supportAddress.indexOf('@') < 0) {
+            return `${supportAddress}@${this.getDefaultEmailDomain()}`;
+        }
+        return supportAddress;
+    }
+}
+
+module.exports = SettingsHelpers;

package/core/server/services/staff/index.js

@@ -2,22 +2,20 @@ class StaffServiceWrapper {
     init() {
         const StaffService = require('@tryghost/staff-service');
 
-        const config = require('../../../shared/config');
         const logging = require('@tryghost/logging');
         const models = require('../../models');
         const {GhostMailer} = require('../mail');
         const mailer = new GhostMailer();
         const settingsCache = require('../../../shared/settings-cache');
-        const urlService = require('../url');
         const urlUtils = require('../../../shared/url-utils');
+        const settingsHelpers = require('../settings-helpers');
 
         this.api = new StaffService({
-            config,
             logging,
             models,
             mailer,
+            settingsHelpers,
             settingsCache,
-            urlService,
             urlUtils
         });
     }

package/core/server/services/stripe/config.js

@@ -16,7 +16,7 @@ const messages = {
  */
 
 module.exports = {
-    getConfig(settings, config, urlUtils) {
+    getConfig({config, urlUtils, settingsHelpers}) {
         /**
          * @returns {StripeURLConfig}
          */
@@ -41,43 +41,7 @@ module.exports = {
             };
         }
 
-        /**
-         * @param {'direct' | 'connect'} type - The "type" of keys to fetch from settings
-         * @returns {{publicKey: string, secretKey: string} | null}
-         */
-        function getStripeKeys(type) {
-            const secretKey = settings.get(`stripe_${type === 'connect' ? 'connect_' : ''}secret_key`);
-            const publicKey = settings.get(`stripe_${type === 'connect' ? 'connect_' : ''}publishable_key`);
-
-            if (!secretKey || !publicKey) {
-                return null;
-            }
-
-            return {
-                secretKey,
-                publicKey
-            };
-        }
-
-        /**
-         * @returns {{publicKey: string, secretKey: string} | null}
-         */
-        function getActiveStripeKeys() {
-            const stripeDirect = config.get('stripeDirect');
-
-            if (stripeDirect) {
-                return getStripeKeys('direct');
-            }
-
-            const connectKeys = getStripeKeys('connect');
-
-            if (!connectKeys) {
-                return getStripeKeys('direct');
-            }
-
-            return connectKeys;
-        }
-        const keys = getActiveStripeKeys();
+        const keys = settingsHelpers.getActiveStripeKeys();
         if (!keys) {
             return null;
         }

package/core/server/services/stripe/service.js

@@ -8,9 +8,10 @@ const urlUtils = require('../../../shared/url-utils');
 const events = require('../../lib/common/events');
 const models = require('../../models');
 const {getConfig} = require('./config');
+const settingsHelpers = require('../settings-helpers');
 
 async function configureApi() {
-    const cfg = getConfig(settings, config, urlUtils);
+    const cfg = getConfig({settingsHelpers, config, urlUtils});
     if (cfg) {
         cfg.testEnv = process.env.NODE_ENV.startsWith('test');
         await module.exports.configure(cfg);