ghost 4.37.0 → 4.39.0

package/core/server/services/auth/setup.js

@@ -3,6 +3,7 @@ const config = require('../../../shared/config');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
+const moment = require('moment');
 const models = require('../../models');
 const mail = require('../mail');
 
@@ -16,6 +17,11 @@ const messages = {
     failedThemeInstall: 'Theme {themeName} didn\'t install because of the error: {error}'
 };
 
+const postSetupFixtures = {
+    'coming-soon': '{"version":"0.3.1","atoms":[],"cards":[],"markups":[["a",["href","#/portal/"]]],"sections":[[1,"p",[[0,[],0,"This is {{site.title}}, a brand new site by {{author.name}} that\'s just getting started. Things will be up and running here shortly, but you can "],[0,[0],1,"subscribe"],[0,[],0," in the meantime if you\'d like to stay up to date and receive emails when new content is published!"]]]],"ghostVersion":"4.0"}',
+    about: '{"version":"0.3.1","atoms":[],"cards":[["hr",{}]],"markups":[["a",["href","https://ghost.org"]]],"sections":[[1,"p",[[0,[],0,"{{site.title}} is an independent publication launched in {{date}} by {{author.name}}. If you subscribe today, you\'ll get full access to the website as well as email newsletters about new content when it\'s available. Your subscription makes this site possible, and allows {{site.title}} to continue to exist. Thank you!"]]],[1,"h3",[[0,[],0,"Access all areas"]]],[1,"p",[[0,[],0,"By signing up, you\'ll get access to the full archive of everything that\'s been published before and everything that\'s still to come. Your very own private library."]]],[1,"h3",[[0,[],0,"Fresh content, delivered"]]],[1,"p",[[0,[],0,"Stay up to date with new content sent straight to your inbox! No more worrying about whether you missed something because of a pesky algorithm or news feed."]]],[1,"h3",[[0,[],0,"Meet people like you"]]],[1,"p",[[0,[],0,"Join a community of other subscribers who share the same interests."]]],[10,0],[1,"h3",[[0,[],0,"Start your own thing"]]],[1,"p",[[0,[],0,"Enjoying the experience? Get started for free and set up your very own subscription business using "],[0,[0],1,"Ghost"],[0,[],0,", the same platform that powers this website."]]]],"ghostVersion":"4.0"}'
+};
+
 /**
  * Returns setup status
  *
@@ -110,14 +116,15 @@ async function doProduct(data, productsAPI) {
         return user;
     }
     try {
-        const page = await productsAPI.browse({limit: 1});
+        const page = await productsAPI.browse({limit: 'all'});
+
+        const product = page.products.find(p => p.slug === 'default-product');
 
-        const [product] = page.products;
         if (!product) {
             return data;
         }
 
-        productsAPI.edit({products: [{name: blogTitle.trim()}]}, {context: context.context, id: product.id});
+        await productsAPI.edit({products: [{name: blogTitle.trim()}]}, {context: context.context, id: product.id});
     } catch (e) {
         return data;
     }
@@ -125,6 +132,22 @@ async function doProduct(data, productsAPI) {
     return data;
 }
 
+async function doFixtures(data) {
+    const date = moment().format('MMMM YYYY');
+
+    _.each(postSetupFixtures, async (mobiledoc, key) => {
+        // Using very simple find and replace because we control the fixtures
+        mobiledoc = mobiledoc.replace(/{{site.title}}/g, data.userData.blogTitle);
+        mobiledoc = mobiledoc.replace(/{{author.name}}/g, data.userData.name);
+        mobiledoc = mobiledoc.replace(/{{date}}/, date);
+
+        const post = await models.Post.findOne({slug: key});
+        await models.Post.edit({mobiledoc}, {id: post.id});
+    });
+
+    return data;
+}
+
 function sendWelcomeEmail(email, mailAPI) {
     if (config.get('sendWelcomeEmail')) {
         const data = {
@@ -164,6 +187,11 @@ async function installTheme(data, api) {
         return data;
     }
 
+    if (themeName.toLowerCase() === 'tryghost/casper') {
+        logging.warn('Skipping theme install as Casper is the default theme.');
+        return data;
+    }
+
     // Use the api instead of the services as the api performs extra logic
     try {
         const installResults = await api.themes.install({
@@ -180,14 +208,6 @@ async function installTheme(data, api) {
     } catch (error) {
         //Fallback to Casper by doing nothing as the theme setting update is the last step
         logging.warn(tpl(messages.failedThemeInstall, {themeName, error: error.message}));
-
-        await api.notifications.add({
-            notifications: [{
-                custom: true, //avoids update-check from deleting the notification
-                type: 'warn',
-                message: 'The installation of the theme you have selected wasn\'t successful.'
-            }]
-        }, {context: {internal: true}});
     }
 
     return data;
@@ -199,6 +219,7 @@ module.exports = {
     setupUser: setupUser,
     doSettings: doSettings,
     doProduct: doProduct,
-    sendWelcomeEmail: sendWelcomeEmail,
-    installTheme: installTheme
+    installTheme: installTheme,
+    doFixtures: doFixtures,
+    sendWelcomeEmail: sendWelcomeEmail
 };

package/core/server/services/email-analytics/lib/event-processor.js

@@ -1,5 +1,5 @@
 const {EventProcessor} = require('@tryghost/email-analytics-service');
-const moment = require('moment');
+const moment = require('moment-timezone');
 
 class GhostEventProcessor extends EventProcessor {
     constructor({db}) {
@@ -88,6 +88,23 @@ class GhostEventProcessor extends EventProcessor {
                 opened_at: this.db.knex.raw('COALESCE(opened_at, ?)', [moment.utc(event.timestamp).format('YYYY-MM-DD HH:mm:ss')])
             });
 
+        // Using the default timezone set in https://github.com/TryGhost/Ghost/blob/2c5643623db0fc4db390f6997c81a73dca7ccacd/core/server/data/schema/default-settings/default-settings.json#L105
+        let timezone = 'Etc/UTC';
+        const timezoneData = await this.db.knex('settings').first('value').where('key', 'timezone');
+        if (timezoneData && timezoneData.value) {
+            timezone = timezoneData.value;
+        }
+
+        await this.db.knex('members')
+            .where('email', '=', event.recipientEmail)
+            .andWhere(builder => builder
+                .where('last_seen_at', '<', moment.utc(event.timestamp).tz(timezone).startOf('day').utc().format('YYYY-MM-DD HH:mm:ss'))
+                .orWhereNull('last_seen_at')
+            )
+            .update({
+                last_seen_at: moment.utc(event.timestamp).format('YYYY-MM-DD HH:mm:ss')
+            });
+
         return updateResult > 0;
     }
 

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

@@ -249,14 +249,14 @@ const retryFailedEmail = async (emailModel) => {
 async function handleUnsubscribeRequest(req) {
     if (!req.url) {
         throw new errors.BadRequestError({
-            message: 'Unsubscribe failed! Could not find member'
+            message: 'Email address not found.'
         });
     }
 
     const {query} = url.parse(req.url, true);
     if (!query || !query.uuid) {
         throw new errors.BadRequestError({
-            message: (query.preview ? 'Unsubscribe preview' : 'Unsubscribe failed! Could not find member')
+            message: (query.preview ? 'Unsubscribe preview' : 'Email address not found.')
         });
     }
 
@@ -266,7 +266,7 @@ async function handleUnsubscribeRequest(req) {
 
     if (!member) {
         throw new errors.BadRequestError({
-            message: 'Unsubscribe failed! Could not find member'
+            message: 'Email address not found.'
         });
     }
 
@@ -276,7 +276,7 @@ async function handleUnsubscribeRequest(req) {
     } catch (err) {
         throw new errors.InternalServerError({
             err,
-            message: 'Failed to unsubscribe member'
+            message: 'Failed to unsubscribe this email address'
         });
     }
 }

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

@@ -1216,7 +1216,7 @@ ${ templateSettings.showBadge ? `
 
                                     ${ templateSettings.showBadge ? `
                                     <tr>
-                                        <td class="footer-powered"><a href="https://ghost.org/"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Publish with Ghost"></a></td>
+                                        <td class="footer-powered"><a href="https://ghost.org/"><img src="https://static.ghost.org/v4.0.0/images/powered.png" border="0" width="142" height="30" class="gh-powered" alt="Powered by Ghost"></a></td>
                                     </tr>
                                     ` : '' }
                                 </table>

package/core/server/services/members/content-gating.js

@@ -1,4 +1,4 @@
-const nql = require('@nexes/nql');
+const nql = require('@tryghost/nql');
 
 // @ts-check
 /** @typedef { boolean } AccessFlag */

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

@@ -110,9 +110,13 @@ const getPortalProductPrices = async function () {
             monthlyPrice: product.monthlyPrice,
             yearlyPrice: product.yearlyPrice,
             benefits: product.benefits,
+            active: product.active,
             type: product.type,
+            visibility: product.visibility,
             prices: productPrices
         };
+    }).filter((product) => {
+        return !!product.active;
     });
     const defaultProduct = products.find((product) => {
         return product.type === 'paid';

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

@@ -16,6 +16,8 @@ const models = require('../../models');
 const {GhostMailer} = require('../mail');
 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 messages = {
@@ -139,7 +141,7 @@ module.exports = {
             sendVerificationEmail: ({subject, message, amountImported}) => {
                 const escalationAddress = config.get('hostSettings:emailVerification:escalationAddress');
                 const fromAddress = config.get('user_email');
-    
+
                 if (escalationAddress) {
                     ghostMailer.send({
                         subject,
@@ -158,6 +160,16 @@ module.exports = {
             eventRepository: membersApi.events
         });
 
+        new LastSeenAtUpdater({
+            models: {
+                Member: models.Member
+            },
+            services: {
+                domainEvents: DomainEvents,
+                settingsCache
+            }
+        });
+
         (async () => {
             try {
                 const collection = await models.SingleUseToken.fetchAll();

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

@@ -1,4 +1,4 @@
-const nql = require('@nexes/nql');
+const nql = require('@tryghost/nql');
 const {BadRequestError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 

package/core/server/services/url/UrlGenerator.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const nql = require('@nexes/nql');
+const nql = require('@tryghost/nql');
 const debug = require('@tryghost/debug')('services:url:generator');
 const localUtils = require('../../../shared/url-utils');
 

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

@@ -41,6 +41,8 @@ class WebhooksService {
                     help: messages.nonExistingIntegrationIdProvided.help
                 });
             }
+
+            throw error;
         }
     }
 }

package/core/server/views/maintenance.html

@@ -44,7 +44,7 @@ body {
     flex-direction: column;
     justify-content: center;
     max-width: 500px;
-    min-height: 500px;
+    min-height: 360px;
     margin: 0 0 4vmin;
     padding: 40px;
     text-align: center;
@@ -63,7 +63,7 @@ h1 {
     letter-spacing: -0.02em;
 }
 p {
-    margin: 0 0 40px;
+    margin: 0;
     opacity: 0.7;
     font-weight: 400;
 }

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.37%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.39%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-02a5f8954bd85fe28817b8c8b111b8aa.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-77b93478f83b0def6ddc5a4f23ce963e.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-6dc30be68238b5c55df0cdc1f2dc8b8d.js"></script>
-                <script src="assets/ghost.min-c1938f6ee696bf08bd6bf93cac341ea2.js"></script>
+                <script src="assets/vendor.min-c39476bced9adb98ee2b292d01c7a8f4.js"></script>
+                <script src="assets/ghost.min-e6559d901897066aa6a6d4145e3728ed.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.37%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.39%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-02a5f8954bd85fe28817b8c8b111b8aa.css" title="light">
+                <link rel="stylesheet" href="assets/ghost.min-77b93478f83b0def6ddc5a4f23ce963e.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-6dc30be68238b5c55df0cdc1f2dc8b8d.js"></script>
-                <script src="assets/ghost.min-c1938f6ee696bf08bd6bf93cac341ea2.js"></script>
+                <script src="assets/vendor.min-c39476bced9adb98ee2b292d01c7a8f4.js"></script>
+                <script src="assets/ghost.min-e6559d901897066aa6a6d4145e3728ed.js"></script>
             
 </body>
 </html>

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

@@ -25,6 +25,9 @@ module.exports = function setupApiApp() {
     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);
     apiApp.use(errorHandler.handleJSONResponse(sentry));

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

@@ -31,6 +31,8 @@ const notImplemented = function (req, res, next) {
         members: ['GET', 'PUT', 'DELETE', 'POST'],
         config: ['GET'],
         schedules: ['PUT'],
+        files: ['POST'],
+        media: ['POST'],
         db: ['POST']
     };
 

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

@@ -34,6 +34,7 @@ module.exports = function apiRoutes() {
     router.get('/settings', mw.authenticatePublic, http(api.publicSettings.browse));
 
     router.get('/products', mw.authenticatePublic, http(api.productsPublic.browse));
+    router.get('/tiers', mw.authenticatePublic, http(api.tiersPublic.browse));
 
     return router;
 };

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

@@ -39,7 +39,7 @@ module.exports = function setupMembersApp() {
     membersApp.get('/api/session', middleware.getIdentityToken);
     membersApp.get('/api/offers/:id', middleware.getOfferData);
     membersApp.delete('/api/session', middleware.deleteSession);
-    membersApp.get('/api/site', shared.middleware.cacheControl('public', {maxAge: 30}), middleware.getMemberSiteData);
+    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));

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

@@ -1,5 +1,6 @@
 const debug = require('@tryghost/debug')('web:backend');
 const express = require('../../../shared/express');
+const {BASE_API_PATH} = require('../../../shared/url-utils');
 
 /**
  *
@@ -11,7 +12,7 @@ module.exports = () => {
     // Wrap the admin and API apps into a single express app for use with vhost
     const backendApp = express('backend');
 
-    backendApp.lazyUse('/ghost/api', require('../api'));
+    backendApp.lazyUse(BASE_API_PATH, require('../api'));
     backendApp.lazyUse('/ghost/oauth', require('../oauth'));
     backendApp.lazyUse('/ghost/.well-known', require('../well-known'));
 

package/core/server/web/shared/middleware/uncapitalise.js

@@ -27,13 +27,14 @@ const uncapitalise = (req, res, next) => {
     let decodedURI;
 
     const isSignupOrReset = pathToTest.match(/^(.*\/ghost\/(signup|reset)\/)/i);
-    const isAPI = pathToTest.match(/^(.*\/ghost\/api\/(v[\d.]+|canary)\/.*?\/)/i);
+    const isAPIRegExp = new RegExp(`^(.*${urlUtils.BASE_API_PATH}(/(v[\\d.]+|canary))?/.*?/)`, 'i');
+    const isAPI = pathToTest.match(isAPIRegExp);
 
     if (isSignupOrReset) {
         pathToTest = isSignupOrReset[1];
     }
 
-    // Do not lowercase anything after e.g. /api/v{X}/ to protect :key/:slug
+    // Do not lowercase anything after e.g. /ghost/api(/v{X})?/ to protect :key/:slug
     if (isAPI) {
         pathToTest = isAPI[1];
     }

package/core/shared/config/defaults.json

@@ -128,8 +128,8 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.14.0/umd/portal.min.js",
-        "version": "1.14"
+        "url": "https://unpkg.com/@tryghost/portal@~1.16.0/umd/portal.min.js",
+        "version": "1.16"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,

package/core/shared/config/utils.js

@@ -54,9 +54,13 @@ const checkUrlProtocol = function checkUrlProtocol(url) {
  * https://github.com/indexzero/nconf/issues/235#issuecomment-257606507
  */
 const sanitizeDatabaseProperties = function sanitizeDatabaseProperties(nconf) {
+    if (nconf.get('database:client') === 'mysql') {
+        nconf.set('database:client', 'mysql2');
+    }
+
     const database = nconf.get('database');
 
-    if (nconf.get('database:client') === 'mysql') {
+    if (nconf.get('database:client') === 'mysql2') {
         delete database.connection.filename;
     } else {
         delete database.connection.host;

package/core/shared/labs.js

@@ -15,13 +15,18 @@ const messages = {
 
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
+    'multipleProducts',
+    'tierWelcomePages',
+    'tierName',
+    'selectablePortalLinks',
+    'membersTableStatus',
+    'improvedOnboarding'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
 //       input for the "labs" setting value
 const BETA_FEATURES = [
-    'activitypub',
-    'multipleProducts'
+    'activitypub'
 ];
 
 const ALPHA_FEATURES = [
@@ -30,13 +35,7 @@ const ALPHA_FEATURES = [
     'urlCache',
     'beforeAfterCard',
     'tweetGridCard',
-    'membersActivityFeed',
-    'improvedOnboarding',
-    'tierWelcomePages',
-    'tierName',
-    'membersTableStatus',
-    'membersLastSeenFilter',
-    'selectablePortalLinks'
+    'membersActivityFeed'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/core/shared/url-utils.js

@@ -1,6 +1,8 @@
 const UrlUtils = require('@tryghost/url-utils');
 const config = require('./config');
 
+const BASE_API_PATH = '/ghost/api';
+
 const urlUtils = new UrlUtils({
     getSubdir: config.getSubdir,
     getSiteUrl: config.getSiteUrl,
@@ -9,7 +11,8 @@ const urlUtils = new UrlUtils({
     defaultApiVersion: config.get('api:versions:default'),
     slugs: config.get('slugs').protected,
     redirectCacheMaxAge: config.get('caching:301:maxAge'),
-    baseApiPath: '/ghost/api'
+    baseApiPath: BASE_API_PATH
 });
 
 module.exports = urlUtils;
+module.exports.BASE_API_PATH = BASE_API_PATH;