ghost 4.47.4 → 5.0.1

package/core/server/services/users.js

@@ -11,7 +11,7 @@ const path = require('path');
  * @prop {Object} Base
  * @prop {(callback: function) => Promise} Base.transaction
  * @prop {Object} Post
- * @prop {(frameOptions: Object) => Promise} Post.destroyByAuthor
+ * @prop {(frameOptions: Object) => Promise} Post.reassignByAuthor
  * @prop {Object} ApiKey
  * @prop {(Object) => Promise} ApiKey.destroy
  * @prop {Object} ApiKey.NotFoundError
@@ -76,7 +76,7 @@ class Users {
         return this.models.Base.transaction(async (t) => {
             frameOptions.transacting = t;
 
-            await this.models.Post.destroyByAuthor(frameOptions);
+            await this.models.Post.reassignByAuthor(frameOptions);
 
             try {
                 await this.models.ApiKey.destroy({

package/core/server/services/webhooks/listen.js

@@ -1,7 +1,9 @@
 const _ = require('lodash');
 const limitService = require('../../services/limits');
 const logging = require('@tryghost/logging');
-const trigger = require('./trigger');
+const WebhookTrigger = require('./trigger');
+const models = require('../../models');
+const payload = require('./payload');
 
 // The webhook system is fundamentally built on top of our model event system
 const events = require('../../lib/common/events');
@@ -55,6 +57,7 @@ const listen = async () => {
         }
     }
 
+    const webhookTrigger = new WebhookTrigger({models, payload});
     _.each(WEBHOOKS, (event) => {
         events.on(event, (model, options) => {
             // CASE: avoid triggering webhooks when importing
@@ -62,7 +65,7 @@ const listen = async () => {
                 return;
             }
 
-            trigger(event, model);
+            webhookTrigger.trigger(event, model);
         });
     });
 };

package/core/server/services/webhooks/serialize.js

@@ -1,9 +1,8 @@
 module.exports = (event, model) => {
     const _ = require('lodash');
     const {sequence} = require('@tryghost/promise');
-    const api = require('../../api');
-
-    const apiVersion = model.get('api_version') || 'v4';
+    const api = require('../../api').endpoints;
+    const apiShared = require('../../api').shared;
 
     const resourceName = event.match(/(\w+)\./)[1];
     const docName = `${resourceName}s`;
@@ -19,10 +18,10 @@ module.exports = (event, model) => {
                 frame.options.withRelated = ['tags', 'authors'];
             }
 
-            return api.shared
+            return apiShared
                 .serializers
                 .handle
-                .output(model, {docName: docName, method: 'read'}, api[apiVersion].serializers.output, frame)
+                .output(model, {docName: docName, method: 'read'}, api.serializers.output, frame)
                 .then(() => {
                     return frame.response[docName][0];
                 });
@@ -42,10 +41,10 @@ module.exports = (event, model) => {
                 frame.options.withRelated = ['tags', 'authors'];
             }
 
-            return api.shared
+            return apiShared
                 .serializers
                 .handle
-                .output(model, {docName: docName, method: 'read'}, api[apiVersion].serializers.output, frame)
+                .output(model, {docName: docName, method: 'read'}, api.serializers.output, frame)
                 .then(() => {
                     return frame.response[docName][0];
                 });

package/core/server/services/webhooks/trigger.js

@@ -1,19 +1,30 @@
-const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:webhooks:trigger');
 const logging = require('@tryghost/logging');
-const request = require('@tryghost/request');
-const models = require('../../models');
-const payload = require('./payload');
+const ghostVersion = require('@tryghost/version');
+
+class WebhookTrigger {
+    /**
+     *
+     * @param {Object} options
+     * @param {Object} options.models - Ghost models
+     * @param {Function} options.payload - Function to generate payload
+     * @param {Object} [options.request] - HTTP request handling library
+     */
+    constructor({models, payload, request}){
+        this.models = models;
+        this.payload = payload;
+
+        this.request = request ?? require('@tryghost/request');
+    }
 
-const webhooks = {
     getAll(event) {
-        return models
+        return this.models
             .Webhook
             .findAllByEvent(event, {context: {internal: true}});
-    },
+    }
 
     update(webhook, data) {
-        models
+        this.models
             .Webhook
             .edit({
                 last_triggered_at: Date.now(),
@@ -23,36 +34,34 @@ const webhooks = {
             .catch(() => {
                 logging.warn(`Unable to update "last_triggered" for webhook: ${webhook.id}`);
             });
-    },
+    }
 
     destroy(webhook) {
-        return models
+        return this.models
             .Webhook
             .destroy({id: webhook.id}, {context: {internal: true}})
             .catch(() => {
                 logging.warn(`Unable to destroy webhook ${webhook.id}.`);
             });
     }
-};
 
-const response = {
     onSuccess(webhook) {
         return (res) => {
-            webhooks.update(webhook, {
+            this.update(webhook, {
                 statusCode: res.statusCode
             });
         };
-    },
+    }
 
     onError(webhook) {
         return (err) => {
             if (err.statusCode === 410) {
                 logging.info(`Webhook destroyed (410 response) for "${webhook.get('event')}" with url "${webhook.get('target_url')}".`);
 
-                return webhooks.destroy(webhook);
+                return this.destroy(webhook);
             }
 
-            webhooks.update(webhook, {
+            this.update(webhook, {
                 statusCode: err.statusCode,
                 error: `Request failed: ${err.code || 'unknown'}`
             });
@@ -60,34 +69,40 @@ const response = {
             logging.warn(`Request to ${webhook.get('target_url') || null} failed because of: ${err.code || ''}.`);
         };
     }
-};
-
-module.exports = (event, model) => {
-    webhooks.getAll(event)
-        .then((hooks) => {
-            debug(`${hooks.models.length} webhooks found for ${event}.`);
-
-            _.each(hooks.models, (webhook) => {
-                payload(webhook.get('event'), model)
-                    .then((hookPayload) => {
-                        const reqPayload = JSON.stringify(hookPayload);
-                        const url = webhook.get('target_url');
-                        const opts = {
-                            body: reqPayload,
-                            headers: {
-                                'Content-Length': Buffer.byteLength(reqPayload),
-                                'Content-Type': 'application/json'
-                            },
-                            timeout: 2 * 1000,
-                            retry: 5
-                        };
-
-                        logging.info(`Triggering webhook for "${webhook.get('event')}" with url "${url}"`);
-
-                        request(url, opts)
-                            .then(response.onSuccess(webhook))
-                            .catch(response.onError(webhook));
-                    });
-            });
-        });
-};
+
+    async trigger(event, model) {
+        const response = {
+            onSuccess: this.onSuccess.bind(this),
+            onError: this.onError.bind(this)
+        };
+
+        const hooks = await this.getAll(event);
+
+        debug(`${hooks.models.length} webhooks found for ${event}.`);
+
+        for (const webhook of hooks.models) {
+            const hookPayload = await this.payload(webhook.get('event'), model);
+
+            const reqPayload = JSON.stringify(hookPayload);
+            const url = webhook.get('target_url');
+            const opts = {
+                body: reqPayload,
+                headers: {
+                    'Content-Length': Buffer.byteLength(reqPayload),
+                    'Content-Type': 'application/json',
+                    'Content-Version': `v${ghostVersion.safe}`
+                },
+                timeout: 2 * 1000,
+                retry: 5
+            };
+
+            logging.info(`Triggering webhook for "${webhook.get('event')}" with url "${url}"`);
+
+            await this.request(url, opts)
+                .then(response.onSuccess(webhook))
+                .catch(response.onError(webhook));
+        }
+    }
+}
+
+module.exports = WebhookTrigger;

package/core/server/update-check.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 
-const api = require('./api');
+const api = require('./api').endpoints;
 const config = require('../shared/config');
 const urlUtils = require('./../shared/url-utils');
 const jobsService = require('./services/jobs');

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

@@ -17,7 +17,7 @@ module.exports = function setupAdminApp() {
     // @TODO ensure this gets a local 404 error handler
     const configMaxAge = config.get('caching:admin:maxAge');
     adminApp.use('/assets', serveStatic(
-        config.get('paths').clientAssets,
+        config.get('paths').adminAssets,
         {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : constants.ONE_YEAR_MS, fallthrough: false}
     ));
 

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.47%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%225.0%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-ba66b98f7c24fa40e061c7ffc94f4e23.css">
-                <link rel="stylesheet" href="assets/ghost.min-4084931bc22e794fe3722139050a80b3.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-a40c7b301c702bd84c2fae19366ab5d7.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js"></script>
+                <script src="assets/vendor.min-2bca41946dea27dc292428db605d466d.js"></script>
+                <script src="assets/ghost.min-2cc3688ea6600a54e0cd83107a8577e8.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.47%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%225.0%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-ba66b98f7c24fa40e061c7ffc94f4e23.css">
-                <link rel="stylesheet" href="assets/ghost.min-4084931bc22e794fe3722139050a80b3.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-a40c7b301c702bd84c2fae19366ab5d7.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js"></script>
+                <script src="assets/vendor.min-2bca41946dea27dc292428db605d466d.js"></script>
+                <script src="assets/ghost.min-2cc3688ea6600a54e0cd83107a8577e8.js"></script>
             
 </body>
 </html>

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

@@ -1,7 +1,6 @@
 const debug = require('@tryghost/debug')('web:api:default:app');
 const config = require('../../../shared/config');
 const express = require('../../../shared/express');
-const urlUtils = require('../../../shared/url-utils');
 const sentry = require('../../../shared/sentry');
 const errorHandler = require('@tryghost/mw-error-handler');
 const APIVersionCompatibilityService = require('../../services/api-version-compatibility');
@@ -14,22 +13,11 @@ module.exports = function setupApiApp() {
         apiApp.use(require('./testmode')());
     }
 
+    apiApp.use(APIVersionCompatibilityService.versionRewrites);
     apiApp.use(APIVersionCompatibilityService.contentVersion);
 
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v2', type: 'content'}), require('./v2/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v2', type: 'admin'}), require('./v2/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v3', type: 'content'}), require('./v3/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v3', type: 'admin'}), require('./v3/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v4', type: 'content'}), require('./canary/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v4', type: 'admin'}), require('./canary/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v5', type: 'content'}), require('./canary/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'v5', type: 'admin'}), require('./canary/admin/app'));
-
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'canary', type: 'content'}), require('./canary/content/app'));
-    apiApp.lazyUse(urlUtils.getVersionPath({version: 'canary', type: 'admin'}), require('./canary/admin/app'));
+    apiApp.lazyUse('/content/', require('./canary/content/app'));
+    apiApp.lazyUse('/admin/', require('./canary/admin/app'));
 
     // Error handling for requests to non-existent API versions
     apiApp.use(errorHandler.resourceNotFound);

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

@@ -35,7 +35,7 @@ module.exports = function setupApiApp() {
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
     apiApp.use(APIVersionCompatibilityService.errorHandler);
-    apiApp.use(errorHandler.handleJSONResponseV2(sentry));
+    apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Admin API canary setup end');
 

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

@@ -31,11 +31,13 @@ const notImplemented = function (req, res, next) {
         members: ['GET', 'PUT', 'DELETE', 'POST'],
         tiers: ['GET', 'PUT', 'POST'],
         offers: ['GET', 'PUT', 'POST'],
+        newsletters: ['GET', 'PUT', 'POST'],
         config: ['GET'],
         schedules: ['PUT'],
         files: ['POST'],
         media: ['POST'],
-        db: ['POST']
+        db: ['POST'],
+        settings: ['GET']
     };
 
     const match = req.url.match(/^\/(\w+)\/?/);

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

@@ -1,5 +1,6 @@
 const express = require('../../../../../shared/express');
-const api = require('../../../../api').canary;
+const api = require('../../../../api').endpoints;
+const http = require('../../../../api').shared.http;
 const apiMw = require('../../middleware');
 const mw = require('./middleware');
 
@@ -13,8 +14,6 @@ module.exports = function apiRoutes() {
 
     router.use(apiMw.cors);
 
-    const http = api.http;
-
     // ## Public
     router.get('/site', mw.publicAdminApi, http(api.site.read));
 
@@ -59,7 +58,6 @@ module.exports = function apiRoutes() {
     );
 
     router.get('/settings', mw.authAdminApi, http(api.settings.browse));
-    router.get('/settings/:key', mw.authAdminApi, http(api.settings.read));
     router.put('/settings', mw.authAdminApi, http(api.settings.edit));
     router.get('/settings/members/email', http(api.settings.validateMembersEmailUpdate));
     router.post('/settings/members/email', mw.authAdminApi, http(api.settings.updateMembersEmail));
@@ -87,13 +85,6 @@ module.exports = function apiRoutes() {
     router.put('/tags/:id', mw.authAdminApi, http(api.tags.edit));
     router.del('/tags/:id', mw.authAdminApi, http(api.tags.destroy));
 
-    // Products
-    // TODO Remove
-    router.get('/products', mw.authAdminApi, http(api.products.browse));
-    router.post('/products', mw.authAdminApi, http(api.products.add));
-    router.get('/products/:id', mw.authAdminApi, http(api.products.read));
-    router.put('/products/:id', mw.authAdminApi, http(api.products.edit));
-
     // Tiers
     router.get('/tiers', mw.authAdminApi, http(api.tiers.browse));
     router.post('/tiers', mw.authAdminApi, http(api.tiers.add));
@@ -124,8 +115,6 @@ module.exports = function apiRoutes() {
         http(api.members.importCSV)
     );
 
-    router.get('/members/hasActiveStripeSubscriptions', mw.authAdminApi, http(api.members.hasActiveStripeSubscriptions));
-
     router.get('/members/stripe_connect', mw.authAdminApi, http(api.membersStripeConnect.auth));
 
     router.get('/members/:id', mw.authAdminApi, http(api.members.read));
@@ -202,10 +191,6 @@ module.exports = function apiRoutes() {
         http(api.db.backupContent)
     );
 
-    // ## Mail
-    router.post('/mail', mw.authAdminApi, http(api.mail.send));
-    router.post('/mail/test', mw.authAdminApi, http(api.mail.sendTest));
-
     // ## Slack
     router.post('/slack/test', mw.authAdminApi, http(api.slack.sendTest));
 
@@ -223,18 +208,18 @@ module.exports = function apiRoutes() {
     router.get('/identities', mw.authAdminApi, http(api.identities.read));
 
     // ## Authentication
-    router.post('/authentication/passwordreset',
+    router.post('/authentication/password_reset',
         shared.middleware.brute.globalReset,
         shared.middleware.brute.userReset,
         http(api.authentication.generateResetToken)
     );
-    router.put('/authentication/passwordreset', shared.middleware.brute.globalBlock, http(api.authentication.resetPassword));
+    router.put('/authentication/password_reset', shared.middleware.brute.globalBlock, http(api.authentication.resetPassword));
     router.post('/authentication/invitation', http(api.authentication.acceptInvitation));
     router.get('/authentication/invitation', http(api.authentication.isInvitation));
     router.post('/authentication/setup', http(api.authentication.setup));
     router.put('/authentication/setup', mw.authAdminApi, http(api.authentication.updateSetup));
     router.get('/authentication/setup', http(api.authentication.isSetup));
-    router.post('/authentication/reset_all_passwords', mw.authAdminApi, http(api.authentication.resetAllPasswords));
+    router.post('/authentication/global_password_reset', mw.authAdminApi, http(api.authentication.resetAllPasswords));
 
     // ## Images
     router.post('/images/upload',
@@ -293,9 +278,8 @@ module.exports = function apiRoutes() {
     router.get('/actions', mw.authAdminApi, http(api.actions.browse));
 
     // ## Email Preview
-    // @TODO: rename to email_previews in 5.0
-    router.get('/email_preview/posts/:id', mw.authAdminApi, http(api.email_preview.read));
-    router.post('/email_preview/posts/:id', mw.authAdminApi, http(api.email_preview.sendTestEmail));
+    router.get('/email_previews/posts/:id', mw.authAdminApi, http(api.email_previews.read));
+    router.post('/email_previews/posts/:id', mw.authAdminApi, http(api.email_previews.sendTestEmail));
 
     // ## Emails
     router.get('/emails', mw.authAdminApi, http(api.emails.browse));

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

@@ -6,8 +6,7 @@ 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');
+const apiVersionCompatibility = require('../../../../services/api-version-compatibility');
 
 module.exports = function setupApiApp() {
     debug('Content API canary setup start');
@@ -29,7 +28,7 @@ module.exports = function setupApiApp() {
 
     // API error handling
     apiApp.use(errorHandler.resourceNotFound);
-    apiApp.use(versionMissmatchHandler(APIVersionCompatibilityServiceInstance));
+    apiApp.use(apiVersionCompatibility.errorHandler);
     apiApp.use(errorHandler.handleJSONResponse(sentry));
 
     debug('Content API canary setup end');

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

@@ -1,6 +1,7 @@
 const express = require('../../../../../shared/express');
 const cors = require('cors');
-const api = require('../../../../api').canary;
+const api = require('../../../../api').endpoints;
+const http = require('../../../../api').shared.http;
 const mw = require('./middleware');
 
 module.exports = function apiRoutes() {
@@ -8,8 +9,6 @@ module.exports = function apiRoutes() {
 
     router.use(cors());
 
-    const http = api.http;
-
     // ## Posts
     router.get('/posts', mw.authenticatePublic, http(api.postsPublic.browse));
     router.get('/posts/:id', mw.authenticatePublic, http(api.postsPublic.read));
@@ -33,8 +32,10 @@ module.exports = function apiRoutes() {
     // ## Settings
     router.get('/settings', mw.authenticatePublic, http(api.publicSettings.browse));
 
-    router.get('/products', mw.authenticatePublic, http(api.productsPublic.browse));
+    // ## Members
+    router.get('/newsletters', mw.authenticatePublic, http(api.newslettersPublic.browse));
     router.get('/tiers', mw.authenticatePublic, http(api.tiersPublic.browse));
+    router.get('/offers/:id', mw.authenticatePublic, http(api.offersPublic.read));
 
     return router;
 };

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

@@ -38,13 +38,14 @@ module.exports = function setupMembersApp() {
     membersApp.get('/api/member/newsletters', middleware.getMemberNewsletters);
     membersApp.put('/api/member/newsletters', bodyParser.json({limit: '1mb'}), middleware.updateMemberNewsletters);
 
+    // Get and update member data
     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));
+
+    // Manage session
     membersApp.get('/api/session', middleware.getIdentityToken);
-    membersApp.get('/api/offers/:id', middleware.getOfferData);
     membersApp.delete('/api/session', middleware.deleteSession);
-    membersApp.get('/api/site', middleware.getMemberSiteData);
 
     // NOTE: this is wrapped in a function to ensure we always go via the getter
     membersApp.post('/api/send-magic-link', bodyParser.json(), shared.middleware.brute.membersAuth, (req, res, next) => membersService.api.middleware.sendMagicLink(req, res, next));
@@ -55,11 +56,11 @@ module.exports = function setupMembersApp() {
 
     // API error handling
     membersApp.use('/api', errorHandler.resourceNotFound);
-    membersApp.use('/api', errorHandler.handleJSONResponseV2(sentry));
+    membersApp.use('/api', errorHandler.handleJSONResponse(sentry));
 
     // Webhook error handling
     membersApp.use('/webhooks', errorHandler.resourceNotFound);
-    membersApp.use('/webhooks', errorHandler.handleJSONResponseV2(sentry));
+    membersApp.use('/webhooks', errorHandler.handleJSONResponse(sentry));
 
     debug('Members App setup end');
 

package/core/server/web/parent/backend.js

@@ -13,7 +13,6 @@ module.exports = () => {
     const backendApp = express('backend');
 
     backendApp.lazyUse(BASE_API_PATH, require('../api'));
-    backendApp.lazyUse('/ghost/oauth', require('../oauth'));
     backendApp.lazyUse('/ghost/.well-known', require('../well-known'));
 
     backendApp.use('/ghost', require('../../services/auth/session').createSessionFromToken, require('../admin')());

package/core/server/web/parent/frontend.js

@@ -1,25 +1,24 @@
 const debug = require('@tryghost/debug')('frontend');
 const express = require('../../../shared/express');
-
 const shared = require('../shared');
 
 /**
  *
- * @param {object} options
+ * @param {import('../../../frontend/services/routing/router-manager').RouterConfig} routerConfig
  * @returns {import('express').RequestHandler}
  */
-module.exports = (options) => {
-    debug('FrontendApp setup start', options);
+module.exports = (routerConfig) => {
+    debug('FrontendApp setup start', routerConfig);
 
     // FRONTEND
     const frontendApp = express('frontend');
 
     // Force SSL if blog url is set to https. The redirects handling must happen before asset and page routing,
-    // otherwise we serve assets/pages with http. This can cause mixed content warnings in the admin client.
+    // otherwise we serve assets/pages with http. This can cause mixed content warnings in the admin app.
     frontendApp.use(shared.middleware.urlRedirects.frontendSSLRedirect);
 
     frontendApp.lazyUse('/members', require('../members'));
-    frontendApp.use('/', require('../../../frontend/web')(options));
+    frontendApp.use('/', require('../../../frontend/web')(routerConfig));
 
     return frontendApp;
 };

package/core/server/web/parent/middleware/ghost-locals.js

@@ -1,5 +1,4 @@
 const ghostVersion = require('@tryghost/version');
-const bridge = require('../../../../bridge');
 
 // ### GhostLocals Middleware
 // Expose the standard locals that every request will need to have available
@@ -12,8 +11,6 @@ module.exports = function ghostLocals(req, res, next) {
     res.locals.safeVersion = ghostVersion.safe;
     // relative path from the URL
     res.locals.relativeUrl = req.path;
-    // make ghost api version available for the theme + routing
-    res.locals.apiVersion = bridge.getFrontendApiVersion();
 
     next();
 };

package/core/server/web/well-known.js

@@ -16,7 +16,20 @@ module.exports = function setupWellKnownApp() {
 
     wellKnownApp.get('/jwks.json', async (req, res) => {
         const jwks = await getSafePublicJWKS();
-        res.json(jwks);
+
+        // there's only one key in the store atm
+        // based on this setting all of the keys to have
+        // "use": "sig" property
+        const keys = jwks.keys
+            .map(key => ({
+                e: key.e,
+                kid: key.kid,
+                kty: key.kty,
+                n: key.n,
+                use: 'sig'
+            }));
+
+        res.json({keys});
     });
 
     return wellKnownApp;