ghost 4.44.0 → 4.46.1

package/core/server/web/api/canary/admin/routes.js

@@ -140,6 +140,7 @@ module.exports = function apiRoutes() {
     // ## Stats
     router.get('/stats/member_count', mw.authAdminApi, http(api.stats.memberCountHistory));
     router.get('/stats/mrr', mw.authAdminApi, http(api.stats.mrr));
+    router.get('/stats/subscriptions', mw.authAdminApi, http(api.stats.subscriptions));
 
     // ## Labels
     router.get('/labels', mw.authAdminApi, http(api.labels.browse));
@@ -313,7 +314,9 @@ module.exports = function apiRoutes() {
     router.put('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.edit));
 
     router.get('/newsletters', mw.authAdminApi, http(api.newsletters.browse));
+    router.get('/newsletters/:id', mw.authAdminApi, http(api.newsletters.read));
     router.post('/newsletters', mw.authAdminApi, http(api.newsletters.add));
+    router.put('/newsletters/verifications/', mw.authAdminApi, http(api.newsletters.verifyPropertyUpdate));
     router.put('/newsletters/:id', mw.authAdminApi, http(api.newsletters.edit));
 
     return router;

package/core/server/web/api/canary/content/app.js

@@ -6,6 +6,8 @@ const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
+const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
+const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Content API canary setup start');
@@ -27,6 +29,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
     apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API canary setup end');

package/core/server/web/api/middleware/cors.js

@@ -72,7 +72,7 @@ function handleCORS(req, cb) {
         return cb(null, DISABLE_CORS);
     }
 
-    // Origin matches whitelist
+    // Origin matches allowlist
     if (getAllowlist().indexOf(url.parse(origin).hostname) > -1) {
         return cb(null, ENABLE_CORS);
     }

package/core/server/web/api/v2/admin/app.js

@@ -7,6 +7,8 @@ const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
+const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
+const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Admin API v2 setup start');
@@ -33,6 +35,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
     apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API v2 setup end');

package/core/server/web/api/v2/content/app.js

@@ -6,6 +6,8 @@ const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
+const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
+const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Content API v2 setup start');
@@ -27,6 +29,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
     apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API v2 setup end');

package/core/server/web/api/v3/admin/app.js

@@ -7,6 +7,8 @@ const shared = require('../../../shared');
 const apiMw = require('../../middleware');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
+const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
+const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Admin API v3 setup start');
@@ -33,6 +35,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
     apiApp.use(errorHandler.handleJSONResponseV2(sentry));
 
     debug('Admin API v3 setup end');

package/core/server/web/api/v3/content/app.js

@@ -6,6 +6,8 @@ const sentry = require('../../../../../shared/sentry');
 const shared = require('../../../shared');
 const routes = require('./routes');
 const errorHandler = require('@tryghost/mw-error-handler');
+const versionMissmatchHandler = require('@tryghost/mw-api-version-mismatch');
+const {APIVersionCompatibilityServiceInstance} = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Content API v3 setup start');
@@ -27,6 +29,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
+    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
     apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API v3 setup end');

package/core/server/web/members/app.js

@@ -33,6 +33,11 @@ module.exports = function setupMembersApp() {
 
     // Initializes members specific routes as well as assigns members specific data to the req/res objects
     // We don't want to add global bodyParser middleware as that interfers with stripe webhook requests on - `/webhooks`.
+
+    // Manage newsletter subscription via unsubscribe link
+    membersApp.get('/api/member/newsletters', middleware.getMemberNewsletters);
+    membersApp.put('/api/member/newsletters', bodyParser.json({limit: '1mb'}), middleware.updateMemberNewsletters);
+
     membersApp.get('/api/member', middleware.getMemberData);
     membersApp.put('/api/member', bodyParser.json({limit: '1mb'}), middleware.updateMemberData);
     membersApp.post('/api/member/email', bodyParser.json({limit: '1mb'}), (req, res) => membersService.api.middleware.updateEmailAddress(req, res));

package/core/shared/config/defaults.json

@@ -128,7 +128,7 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.20.0/umd/portal.min.js",
+        "url": "https://unpkg.com/@tryghost/portal@~1.22.0/umd/portal.min.js",
         "version": "1.20"
     },
     "tenor": {

package/core/shared/labs.js

@@ -21,12 +21,14 @@ const GA_FEATURES = [
     'selectablePortalLinks',
     'membersTableStatus',
     'improvedOnboarding',
+    'multipleNewsletters',
     'membersActivityFeed'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
+    'multipleNewslettersUI',
     'activitypub'
 ];
 
@@ -36,8 +38,8 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'tweetGridCard',
-    'multipleNewsletters',
-    'dashboardV5'
+    'dashboardV5',
+    'publishingFlow'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/core/shared/settings-cache/public.js

@@ -3,7 +3,7 @@
  * This has been misused - unsplash and slack are incorrectly stored there
  * https://github.com/TryGhost/Ghost/issues/10318
  *
- * This file acts as a new whitelist for "public" settings
+ * This file acts as an allowlist for "public" settings
  */
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.44.0",
+  "version": "4.46.1",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -51,67 +51,71 @@
     "fix": "yarn fix:client && yarn fix:server"
   },
   "engines": {
-    "node": "^12.22.1 || ^14.17.0 || ^16.13.0",
+    "node": "^14.17.0 || ^16.13.0",
     "cli": "^1.17.0"
   },
   "dependencies": {
-    "@sentry/node": "6.19.6",
-    "@tryghost/adapter-manager": "0.2.28",
+    "@sentry/node": "6.19.7",
+    "@tryghost/adapter-manager": "0.2.29",
     "@tryghost/admin-api-schema": "2.14.0",
-    "@tryghost/bookshelf-plugins": "0.3.18",
-    "@tryghost/bootstrap-socket": "0.2.17",
-    "@tryghost/color-utils": "0.1.12",
-    "@tryghost/config-url-helpers": "0.1.5",
-    "@tryghost/constants": "1.0.2",
+    "@tryghost/api-version-compatibility-service": "0.1.1",
+    "@tryghost/bookshelf-plugins": "0.4.1",
+    "@tryghost/bootstrap-socket": "0.2.18",
+    "@tryghost/color-utils": "0.1.13",
+    "@tryghost/config-url-helpers": "0.1.6",
+    "@tryghost/constants": "1.0.3",
     "@tryghost/custom-theme-settings-service": "0.3.2",
-    "@tryghost/database-info": "0.3.1",
-    "@tryghost/debug": "0.1.14",
-    "@tryghost/domain-events": "0.1.9",
+    "@tryghost/database-info": "0.3.3",
+    "@tryghost/debug": "0.1.16",
+    "@tryghost/domain-events": "0.1.10",
     "@tryghost/email-analytics-provider-mailgun": "1.0.8",
     "@tryghost/email-analytics-service": "1.0.6",
-    "@tryghost/errors": "1.2.10",
-    "@tryghost/express-dynamic-redirects": "0.2.8",
-    "@tryghost/helpers": "1.1.63",
-    "@tryghost/image-transform": "1.0.29",
-    "@tryghost/job-manager": "0.8.21",
+    "@tryghost/errors": "1.2.12",
+    "@tryghost/express-dynamic-redirects": "0.2.9",
+    "@tryghost/helpers": "1.1.64",
+    "@tryghost/image-transform": "1.0.30",
+    "@tryghost/job-manager": "0.8.22",
     "@tryghost/kg-card-factory": "3.1.3",
     "@tryghost/kg-default-atoms": "3.1.2",
     "@tryghost/kg-default-cards": "5.16.2",
     "@tryghost/kg-markdown-html-renderer": "5.1.5",
     "@tryghost/kg-mobiledoc-html-renderer": "5.3.5",
-    "@tryghost/limit-service": "1.0.10",
-    "@tryghost/logging": "2.1.5",
-    "@tryghost/magic-link": "1.0.21",
-    "@tryghost/member-events": "0.4.1",
-    "@tryghost/members-api": "5.9.1",
-    "@tryghost/members-events-service": "0.3.3",
-    "@tryghost/members-importer": "0.5.8",
-    "@tryghost/members-offers": "0.10.9",
-    "@tryghost/members-ssr": "1.0.23",
-    "@tryghost/members-stripe-service": "0.10.0",
-    "@tryghost/metrics": "1.0.8",
-    "@tryghost/minifier": "0.1.12",
-    "@tryghost/mw-error-handler": "0.2.0",
-    "@tryghost/mw-session-from-token": "0.1.28",
-    "@tryghost/nodemailer": "0.3.20",
-    "@tryghost/nql": "0.9.1",
-    "@tryghost/package-json": "1.0.18",
-    "@tryghost/promise": "0.1.15",
-    "@tryghost/request": "0.1.24",
-    "@tryghost/root-utils": "0.3.12",
-    "@tryghost/security": "0.2.15",
-    "@tryghost/session-service": "0.1.38",
-    "@tryghost/settings-path-manager": "0.1.4",
+    "@tryghost/limit-service": "1.1.0",
+    "@tryghost/logging": "2.1.8",
+    "@tryghost/magic-link": "1.0.22",
+    "@tryghost/member-events": "0.4.2",
+    "@tryghost/members-api": "6.2.3",
+    "@tryghost/members-events-service": "0.3.4",
+    "@tryghost/members-importer": "0.5.10",
+    "@tryghost/members-offers": "0.11.2",
+    "@tryghost/members-ssr": "1.0.24",
+    "@tryghost/members-stripe-service": "0.10.1",
+    "@tryghost/metrics": "1.0.11",
+    "@tryghost/minifier": "0.1.13",
+    "@tryghost/mw-api-version-mismatch": "0.1.1",
+    "@tryghost/mw-error-handler": "0.2.2",
+    "@tryghost/mw-session-from-token": "0.1.30",
+    "@tryghost/nodemailer": "0.3.22",
+    "@tryghost/nql": "0.9.2",
+    "@tryghost/package-json": "1.0.19",
+    "@tryghost/promise": "0.1.16",
+    "@tryghost/request": "0.1.26",
+    "@tryghost/root-utils": "0.3.14",
+    "@tryghost/security": "0.2.16",
+    "@tryghost/session-service": "0.1.40",
+    "@tryghost/settings-path-manager": "0.1.5",
     "@tryghost/social-urls": "0.1.29",
+    "@tryghost/stats-service": "0.2.1",
     "@tryghost/string": "0.1.23",
-    "@tryghost/tpl": "0.1.14",
+    "@tryghost/tpl": "0.1.16",
     "@tryghost/update-check-service": "0.3.2",
     "@tryghost/url-utils": "2.1.0",
-    "@tryghost/validator": "0.1.22",
-    "@tryghost/verification-trigger": "0.2.0",
-    "@tryghost/version": "0.1.12",
-    "@tryghost/vhost-middleware": "1.0.22",
-    "@tryghost/zip": "1.1.22",
+    "@tryghost/validator": "0.1.24",
+    "@tryghost/verification-trigger": "0.2.1",
+    "@tryghost/version": "0.1.14",
+    "@tryghost/version-notifications-data-service": "0.1.0",
+    "@tryghost/vhost-middleware": "1.0.24",
+    "@tryghost/zip": "1.1.23",
     "amperize": "0.6.1",
     "analytics-node": "6.0.0",
     "bluebird": "3.7.2",
@@ -127,16 +131,16 @@
     "cookie-session": "2.0.0",
     "cors": "2.8.5",
     "downsize": "0.0.8",
-    "express": "4.17.3",
+    "express": "4.18.0",
     "express-brute": "1.0.1",
     "express-hbs": "2.4.0",
-    "express-jwt": "6.1.1",
+    "express-jwt": "7.5.2",
     "express-lazy-router": "1.0.4",
     "express-query-boolean": "2.0.0",
     "express-session": "1.17.2",
-    "fs-extra": "10.0.1",
+    "fs-extra": "10.1.0",
     "ghost-storage-base": "1.0.0",
-    "glob": "7.2.0",
+    "glob": "8.0.1",
     "got": "9.6.0",
     "gscan": "4.27.0",
     "html-to-text": "5.1.1",
@@ -148,10 +152,10 @@
     "jsonwebtoken": "8.5.1",
     "juice": "8.0.0",
     "keypair": "1.0.4",
-    "knex": "1.0.7",
-    "knex-migrator": "4.2.6",
+    "knex": "2.0.0",
+    "knex-migrator": "4.2.8",
     "lodash": "4.17.21",
-    "luxon": "2.3.1",
+    "luxon": "2.3.2",
     "mailgun-js": "0.22.0",
     "metascraper": "5.29.3",
     "metascraper-author": "5.29.3",
@@ -183,20 +187,20 @@
   },
   "optionalDependencies": {
     "@tryghost/html-to-mobiledoc": "1.8.6",
-    "@vscode/sqlite3": "5.0.8"
+    "sqlite3": "5.0.6"
   },
   "devDependencies": {
     "@lodder/grunt-postcss": "3.1.1",
-    "@playwright/test": "1.20.2",
-    "@tryghost/express-test": "0.8.3",
-    "c8": "7.11.0",
-    "coffeescript": "2.6.1",
+    "@playwright/test": "1.21.1",
+    "@tryghost/express-test": "0.10.0",
+    "c8": "7.11.2",
+    "coffeescript": "2.7.0",
     "cssnano": "5.1.7",
-    "eslint": "8.13.0",
+    "eslint": "8.14.0",
     "eslint-plugin-ghost": "2.13.0",
     "grunt": "1.5.2",
     "grunt-bg-shell": "2.3.3",
-    "grunt-contrib-clean": "2.0.0",
+    "grunt-contrib-clean": "2.0.1",
     "grunt-contrib-compress": "2.0.0",
     "grunt-contrib-copy": "1.0.0",
     "grunt-contrib-symlink": "1.0.0",
@@ -205,21 +209,21 @@
     "grunt-shell": "4.0.0",
     "grunt-subgrunt": "1.3.0",
     "grunt-update-submodules": "0.4.1",
-    "jwks-rsa": "2.0.5",
+    "jwks-rsa": "2.1.0",
     "mocha": "9.2.2",
     "mocha-slow-test-reporter": "0.1.2",
-    "mock-knex": "TryGhost/mock-knex#master",
+    "mock-knex": "TryGhost/mock-knex#8ecb8c227bf463c991c3d820d33f59efc3ab9682",
     "nock": "13.2.4",
     "papaparse": "5.3.2",
     "postcss": "8.4.12",
     "rewire": "6.0.0",
     "should": "13.2.3",
-    "sinon": "13.0.1",
-    "supertest": "6.2.2",
+    "sinon": "13.0.2",
+    "supertest": "6.2.3",
     "tmp": "0.2.1"
   },
   "resolutions": {
-    "@tryghost/logging": "2.1.5",
+    "@tryghost/logging": "2.1.8",
     "moment": "2.24.0",
     "moment-timezone": "0.5.23"
   }