ghost 4.33.2 → 4.34.3

package/core/frontend/services/routing/helpers/fetch-data.js

@@ -113,8 +113,6 @@ function fetchData(pathOptions, routerOptions, locals) {
 
                     if (config.type === 'browse') {
                         response.data[name].meta = results[name].meta;
-                        // @TODO remove in v3
-                        response.data[name][config.resource] = results[name][config.resource];
                     }
                 });
             }

package/core/frontend/services/theme-engine/middleware/update-global-template-options.js

@@ -48,8 +48,9 @@ function calculateLegacyPriceData(products) {
 async function getProductAndPricesData() {
     try {
         const page = await api.canary.productsPublic.browse({
-            include: ['monthly_price', 'yearly_price'],
-            limit: 'all'
+            include: ['monthly_price', 'yearly_price', 'benefits'],
+            limit: 'all',
+            filter: 'active:true'
         });
 
         return page.products;

package/core/server/api/canary/members.js

@@ -497,7 +497,8 @@ module.exports = {
 
     activityFeed: {
         options: [
-            'limit'
+            'limit',
+            'filter'
         ],
         permissions: {
             method: 'browse'

package/core/server/api/canary/products-public.js

@@ -2,7 +2,7 @@
 // as it is a getter and may change during runtime.
 const membersService = require('../../services/members');
 
-const allowedIncludes = ['stripe_prices', 'monthly_price', 'yearly_price'];
+const allowedIncludes = ['stripe_prices', 'monthly_price', 'yearly_price', 'benefits'];
 
 module.exports = {
     docName: 'products',

package/core/server/api/canary/products.js

@@ -78,7 +78,7 @@ module.exports = {
                 name: {required: true}
             }
         },
-        permissions: false,
+        permissions: true,
         async query(frame) {
             const model = await membersService.api.productRepository.create(
                 frame.data,
@@ -101,7 +101,7 @@ module.exports = {
                 }
             }
         },
-        permissions: false,
+        permissions: true,
         async query(frame) {
             const model = await membersService.api.productRepository.update(
                 frame.data,

package/core/server/data/migrations/versions/4.34/2022-01-25-13-53-add-welcome-page-url-column-to-products.js

@@ -0,0 +1,7 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('products', 'welcome_page_url', {
+    type: 'string',
+    maxlength: 2000,
+    nullable: true
+});

package/core/server/data/schema/schema.js

@@ -379,6 +379,7 @@ module.exports = {
         name: {type: 'string', maxlength: 191, nullable: false},
         slug: {type: 'string', maxlength: 191, nullable: false, unique: true},
         active: {type: 'boolean', nullable: false, defaultTo: true},
+        welcome_page_url: {type: 'string', maxlength: 2000, nullable: true},
         monthly_price_id: {type: 'string', maxlength: 24, nullable: true},
         yearly_price_id: {type: 'string', maxlength: 24, nullable: true},
         description: {type: 'string', maxlength: 191, nullable: true},

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

@@ -1,3 +1,4 @@
+const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const MembersSSR = require('@tryghost/members-ssr');
@@ -12,9 +13,9 @@ const labsService = require('../../../shared/labs');
 const settingsCache = require('../../../shared/settings-cache');
 const config = require('../../../shared/config');
 const models = require('../../models');
-const _ = require('lodash');
 const {GhostMailer} = require('../mail');
 const jobsService = require('../jobs');
+const VerificationTrigger = require('@tryghost/verification-trigger');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',
@@ -32,23 +33,15 @@ const membersConfig = new MembersConfigProvider({
     urlUtils
 });
 
+const membersStats = new MembersStats({
+    db: db,
+    settingsCache: settingsCache,
+    isSQLite: config.get('database:client') === 'sqlite3'
+});
+
 let membersApi;
 let membersSettings;
-
-/**
- * @description Calculates threshold based on following formula
- * Threshold = max{[current number of members], [volume threshold]}
- *
- * @returns {Promise<number>}
- */
-const fetchImportThreshold = async () => {
-    const membersTotal = await module.exports.stats.getTotalMembers();
-    const configThreshold = _.get(config.get('hostSettings'), 'emailVerification.importThreshold');
-    const volumeThreshold = (configThreshold === undefined) ? Infinity : configThreshold;
-    const threshold = Math.max(membersTotal, volumeThreshold);
-
-    return threshold;
-};
+let verificationTrigger;
 
 const membersImporter = new MembersCSVImporter({
     storagePath: config.getContentPath('data'),
@@ -58,53 +51,20 @@ const membersImporter = new MembersCSVImporter({
     isSet: labsService.isSet.bind(labsService),
     addJob: jobsService.addJob.bind(jobsService),
     knex: db.knex,
-    urlFor: urlUtils.urlFor.bind(urlUtils),
-    fetchThreshold: fetchImportThreshold
+    urlFor: urlUtils.urlFor.bind(urlUtils)
 });
 
-const startEmailVerification = async (importedNumber) => {
-    const isVerifiedEmail = config.get('hostSettings:emailVerification:verified') === true;
-
-    if ((!isVerifiedEmail)) {
-        // Only trigger flag change and escalation email the first time
-        if (settingsCache.get('email_verification_required') !== true) {
-            await models.Settings.edit([{
-                key: 'email_verification_required',
-                value: true
-            }], {context: {internal: true}});
-
-            const escalationAddress = config.get('hostSettings:emailVerification:escalationAddress');
-            const fromAddress = config.get('user_email');
-
-            if (escalationAddress) {
-                ghostMailer.send({
-                    subject: 'Email needs verification',
-                    html: tpl(messages.emailVerificationEmailMessage, {
-                        importedNumber,
-                        siteUrl: urlUtils.getSiteUrl()
-                    }),
-                    forceTextContent: true,
-                    from: fromAddress,
-                    to: escalationAddress
-                });
-            }
-        }
-
-        throw new errors.ValidationError({
-            message: tpl(messages.emailVerificationNeeded)
-        });
-    }
-};
-
 const processImport = async (options) => {
     const result = await membersImporter.process(options);
-    const freezeTriggered = result.meta.freeze;
     const importSize = result.meta.originalImportSize;
-    delete result.meta.freeze;
     delete result.meta.originalImportSize;
 
-    if (freezeTriggered) {
-        await startEmailVerification(importSize);
+    const importThreshold = await verificationTrigger.getImportThreshold();
+    if (importSize > importThreshold) {
+        await verificationTrigger.startVerificationProcess({
+            amountImported: importSize,
+            throwOnTrigger: true
+        });
     }
 
     return result;
@@ -139,6 +99,32 @@ module.exports = {
             });
         }
 
+        verificationTrigger = new VerificationTrigger({
+            configThreshold: _.get(config.get('hostSettings'), 'emailVerification.importThreshold'),
+            isVerified: () => config.get('hostSettings:emailVerification:verified') === true,
+            isVerificationRequired: () => settingsCache.get('email_verification_required') === true,
+            sendVerificationEmail: ({subject, message, amountImported}) => {
+                const escalationAddress = config.get('hostSettings:emailVerification:escalationAddress');
+                const fromAddress = config.get('user_email');
+    
+                if (escalationAddress) {
+                    ghostMailer.send({
+                        subject,
+                        html: tpl(message, {
+                            importedNumber: amountImported,
+                            siteUrl: urlUtils.getSiteUrl()
+                        }),
+                        forceTextContent: true,
+                        from: fromAddress,
+                        to: escalationAddress
+                    });
+                }
+            },
+            membersStats,
+            Settings: models.Settings,
+            eventRepository: membersApi.events
+        });
+
         (async () => {
             try {
                 const collection = await models.SingleUseToken.fetchAll();
@@ -181,11 +167,7 @@ module.exports = {
 
     processImport: processImport,
 
-    stats: new MembersStats({
-        db: db,
-        settingsCache: settingsCache,
-        isSQLite: config.get('database:client') === 'sqlite3'
-    })
+    stats: membersStats
 
 };
 module.exports.middleware = require('./middleware');

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

@@ -103,7 +103,13 @@ function createSettingsInstance(config) {
 
     const getAdminRedirectLink = ({type}) => {
         const adminUrl = urlUtils.urlFor('admin', true);
-        return urlUtils.urlJoin(adminUrl, `#/settings/members-email/?${type}=success`);
+        if (type === 'fromAddressUpdate') {
+            return urlUtils.urlJoin(adminUrl, `#/settings/members-email/?${type}=success`);
+        } else if (type === 'supportAddressUpdate') {
+            return urlUtils.urlJoin(adminUrl, `#/settings/members/?${type}=success`);
+        } else {
+            return urlUtils.urlJoin(adminUrl, `#/site/`);
+        }
     };
 
     return {

package/core/server/web/admin/views/default-prod.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%2F%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%224.33%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%2F%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%224.34%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-1f0218f33e08f8d69b2159977d0c9318.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-b1d3e45166f2023dd56b35f720636979.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-d43620e98444a46441495445f4c155f8.js"></script>
-                <script src="assets/ghost.min-501554f903f29164473a5dc620caaddb.js"></script>
+                <script src="assets/vendor.min-079fa61c64e24f0984f2cd7d2ebbf3c3.js"></script>
+                <script src="assets/ghost.min-4886fb099a526cb6ca5b733bbfbb5d3a.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.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%2F%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%224.33%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%2F%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%224.34%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" />
@@ -38,7 +38,7 @@
 
     
                 <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-1f0218f33e08f8d69b2159977d0c9318.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-b1d3e45166f2023dd56b35f720636979.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-d43620e98444a46441495445f4c155f8.js"></script>
-                <script src="assets/ghost.min-501554f903f29164473a5dc620caaddb.js"></script>
+                <script src="assets/vendor.min-079fa61c64e24f0984f2cd7d2ebbf3c3.js"></script>
+                <script src="assets/ghost.min-4886fb099a526cb6ca5b733bbfbb5d3a.js"></script>
             
 </body>
 </html>

package/core/shared/labs.js

@@ -31,7 +31,8 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'tweetGridCard',
-    'membersActivityFeed'
+    'membersActivityFeed',
+    'tierWelcomePages'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.33.2",
+  "version": "4.34.3",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -54,17 +54,17 @@
   },
   "dependencies": {
     "@nexes/nql": "0.6.0",
-    "@sentry/node": "6.16.1",
+    "@sentry/node": "6.17.2",
     "@tryghost/adapter-manager": "0.2.27",
     "@tryghost/admin-api-schema": "2.7.0",
-    "@tryghost/bookshelf-plugins": "0.3.6",
+    "@tryghost/bookshelf-plugins": "0.3.7",
     "@tryghost/bootstrap-socket": "0.2.16",
     "@tryghost/color-utils": "0.1.6",
     "@tryghost/config-url-helpers": "0.1.4",
     "@tryghost/constants": "1.0.1",
     "@tryghost/custom-theme-settings-service": "0.3.1",
     "@tryghost/database-info": "0.1.0",
-    "@tryghost/debug": "0.1.10",
+    "@tryghost/debug": "0.1.11",
     "@tryghost/email-analytics-provider-mailgun": "1.0.7",
     "@tryghost/email-analytics-service": "1.0.5",
     "@tryghost/errors": "1.2.1",
@@ -78,33 +78,33 @@
     "@tryghost/kg-markdown-html-renderer": "5.1.1",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.2",
     "@tryghost/limit-service": "1.0.9",
-    "@tryghost/logging": "2.0.1",
+    "@tryghost/logging": "2.0.2",
     "@tryghost/magic-link": "1.0.17",
-    "@tryghost/members-api": "4.4.1",
-    "@tryghost/members-csv": "1.2.3",
-    "@tryghost/members-importer": "0.4.1",
-    "@tryghost/members-offers": "0.10.5",
-    "@tryghost/members-ssr": "1.0.18",
+    "@tryghost/members-api": "4.8.4",
+    "@tryghost/members-importer": "0.5.0",
+    "@tryghost/members-offers": "0.10.6",
+    "@tryghost/members-ssr": "1.0.19",
     "@tryghost/members-stripe-service": "0.6.5",
-    "@tryghost/metrics": "1.0.2",
+    "@tryghost/metrics": "1.0.3",
     "@tryghost/minifier": "0.1.10",
     "@tryghost/mw-error-handler": "0.1.2",
     "@tryghost/mw-session-from-token": "0.1.27",
-    "@tryghost/nodemailer": "0.3.9",
+    "@tryghost/nodemailer": "0.3.10",
     "@tryghost/package-json": "1.0.15",
     "@tryghost/promise": "0.1.14",
-    "@tryghost/request": "0.1.11",
-    "@tryghost/root-utils": "0.3.8",
+    "@tryghost/request": "0.1.12",
+    "@tryghost/root-utils": "0.3.9",
     "@tryghost/security": "0.2.14",
     "@tryghost/session-service": "0.1.37",
     "@tryghost/settings-path-manager": "0.1.3",
     "@tryghost/social-urls": "0.1.28",
     "@tryghost/string": "0.1.22",
-    "@tryghost/tpl": "0.1.9",
+    "@tryghost/tpl": "0.1.10",
     "@tryghost/update-check-service": "0.3.0",
     "@tryghost/url-utils": "2.0.5",
-    "@tryghost/validator": "0.1.10",
-    "@tryghost/version": "0.1.8",
+    "@tryghost/validator": "0.1.11",
+    "@tryghost/verification-trigger": "0.1.1",
+    "@tryghost/version": "0.1.9",
     "@tryghost/vhost-middleware": "1.0.20",
     "@tryghost/zip": "1.1.19",
     "amperize": "0.6.1",
@@ -184,9 +184,9 @@
     "@ethanresnick/chai-jest-snapshot": "3.0.0",
     "@lodder/grunt-postcss": "3.1.1",
     "c8": "7.11.0",
-    "chai": "4.3.4",
+    "chai": "4.3.6",
     "coffeescript": "2.6.1",
-    "cssnano": "5.0.15",
+    "cssnano": "5.0.16",
     "eslint": "7.32.0",
     "eslint-plugin-ghost": "2.12.0",
     "expect": "27.4.6",
@@ -202,7 +202,7 @@
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
     "jwks-rsa": "2.0.5",
-    "mocha": "9.1.4",
+    "mocha": "9.2.0",
     "mocha-slow-test-reporter": "0.1.2",
     "mock-knex": "0.4.10",
     "nock": "13.2.2",
@@ -215,7 +215,7 @@
     "tmp": "0.2.1"
   },
   "resolutions": {
-    "@tryghost/logging": "2.0.1",
+    "@tryghost/logging": "2.0.2",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }