ghost 4.41.2 → 4.42.1

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

@@ -19,6 +19,7 @@ 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 DatabaseInfo = require('@tryghost/database-info');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',
@@ -37,7 +38,7 @@ const membersConfig = new MembersConfigProvider({
 const membersStats = new MembersStats({
     db: db,
     settingsCache: settingsCache,
-    isSQLite: config.get('database:client') === 'sqlite3'
+    isSQLite: DatabaseInfo.isSQLite(db.knex)
 });
 
 let membersApi;

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

@@ -5,19 +5,20 @@ const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
 const models = require('../../models');
 
-const redirectManager = new DynamicRedirectManager({
-    permanentMaxAge: config.get('caching:customRedirects:maxAge'),
-    getSubdirectoryURL: (pathname) => {
-        return urlUtils.urlJoin(urlUtils.getSubdir(), pathname);
-    }
-});
+let redirectManager;
 
 module.exports = {
     async init() {
+        redirectManager = new DynamicRedirectManager({
+            permanentMaxAge: config.get('caching:customRedirects:maxAge'),
+            getSubdirectoryURL: (pathname) => {
+                return urlUtils.urlJoin(urlUtils.getSubdir(), pathname);
+            }
+        });
         const offersModule = OffersModule.create({
             OfferModel: models.Offer,
             OfferRedemptionModel: models.OfferRedemption,
-            redirectManager: redirectManager
+            redirectManager
         });
 
         this.api = offersModule.api;
@@ -27,5 +28,7 @@ module.exports = {
 
     api: null,
 
-    middleware: redirectManager.handleRequest
+    get middleware() {
+        return redirectManager.handleRequest;
+    }
 };

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

@@ -0,0 +1 @@
+module.exports = require('./service');

package/core/server/services/stats/lib/members-stats-service.js

@@ -0,0 +1,165 @@
+const {DateTime} = require('luxon');
+
+class MembersStatsService {
+    constructor({db}) {
+        this.db = db;
+    }
+
+    /**
+     * Get the current total members grouped by status
+     * @returns {Promise<TotalMembersByStatus>}
+     */
+    async getCount() {
+        const knex = this.db.knex;
+        const rows = await knex('members')
+            .select('status')
+            .select(knex.raw('COUNT(id) AS total'))
+            .groupBy('status');
+        
+        const paidEvent = rows.find(c => c.status === 'paid');
+        const freeEvent = rows.find(c => c.status === 'free');
+        const compedEvent = rows.find(c => c.status === 'comped');
+
+        return {
+            paid: paidEvent ? paidEvent.total : 0,
+            free: freeEvent ? freeEvent.total : 0,
+            comped: compedEvent ? compedEvent.total : 0
+        };
+    }
+
+    /**
+     * Get the member deltas by status for all days (from new to old)
+     * @returns {Promise<MemberStatusDelta[]>} The deltas of paid, free and comped users per day, sorted from new to old
+     */
+    async fetchAllStatusDeltas() {
+        const knex = this.db.knex;
+        const rows = await knex('members_status_events')
+            .select(knex.raw('DATE(created_at) as date'))
+            .select(knex.raw(`SUM(
+                CASE WHEN to_status='paid' THEN 1
+                ELSE 0 END
+            ) as paid_subscribed`))
+            .select(knex.raw(`SUM(
+                CASE WHEN from_status='paid' THEN 1
+                ELSE 0 END
+            ) as paid_canceled`))
+            .select(knex.raw(`SUM(
+                CASE WHEN to_status='comped' THEN 1
+                WHEN from_status='comped' THEN -1
+                ELSE 0 END
+            ) as comped_delta`))
+            .select(knex.raw(`SUM(
+                CASE WHEN to_status='free' THEN 1
+                WHEN from_status='free' THEN -1
+                ELSE 0 END
+            ) as free_delta`))
+            .groupByRaw('DATE(created_at)')
+            .orderByRaw('DATE(created_at) DESC');
+        return rows;
+    }
+
+    /**
+     * Returns a list of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
+     * @returns {Promise<CountHistory>}
+     */
+    async getCountHistory() {
+        const rows = await this.fetchAllStatusDeltas();
+
+        // Fetch current total amounts and start counting from there
+        const totals = await this.getCount();
+        let {paid, free, comped} = totals;
+
+        // Get today in UTC (default timezone for Luxon)
+        const today = DateTime.local().toISODate();
+
+        const cumulativeResults = [];
+        for (const row of rows) {
+            // Convert JSDates to YYYY-MM-DD (in UTC)
+            const date = DateTime.fromJSDate(row.date).toISODate();
+            if (date > today) {
+                // Skip results that are in the future (fix for invalid events)
+                continue;
+            }
+            cumulativeResults.unshift({
+                date,
+                paid,
+                free,
+                comped,
+
+                // Deltas
+                paid_subscribed: row.paid_subscribed,
+                paid_canceled: row.paid_canceled
+            });
+
+            // Update current counts
+            paid = Math.max(0, paid - row.paid_subscribed + row.paid_canceled);
+            free = Math.max(0, free - row.free_delta);
+            comped = Math.max(0, comped - row.comped_delta);
+        }
+
+        // Always make sure we have at least one result
+        if (cumulativeResults.length === 0) {
+            cumulativeResults.push({
+                date: today,
+                paid,
+                free,
+                comped,
+
+                // Deltas
+                paid_subscribed: 0,
+                paid_canceled: 0
+            });
+        }
+
+        return {
+            data: cumulativeResults,
+            meta: {
+                pagination: {
+                    page: 1,
+                    limit: 'all',
+                    pages: 1,
+                    total: cumulativeResults.length,
+                    next: null,
+                    prev: null
+                },
+                totals
+            }
+        };
+    }
+}
+
+module.exports = MembersStatsService;
+
+/**
+ * @typedef MemberStatusDelta
+ * @type {Object}
+ * @property {Date} date
+ * @property {number} paid_subscribed Paid members that subscribed on this day
+ * @property {number} paid_canceled Paid members that canceled on this day
+ * @property {number} comped_delta Total net comped members on this day
+ * @property {number} free_delta Total net members on this day
+ */
+
+/**
+ * @typedef TotalMembersByStatus
+ * @type {Object}
+ * @property {number} paid Total paid members
+ * @property {number} free Total free members
+ * @property {number} comped Total comped members
+ */
+
+/**
+ * @typedef {Object} TotalMembersByStatusItem
+ * @property {string} date In YYYY-MM-DD format
+ * @property {number} paid Total paid members
+ * @property {number} free Total free members
+ * @property {number} comped Total comped members
+ * @property {number} paid_subscribed Paid members that subscribed on this day
+ * @property {number} paid_canceled Paid members that canceled on this day
+ */
+
+/**
+ * @typedef {Object} CountHistory
+ * @property {TotalMembersByStatusItem[]} data List of the total members by status for each day, including the paid deltas paid_subscribed and paid_canceled
+ * @property {Object} meta
+ */

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

@@ -0,0 +1,6 @@
+const db = require('../../data/db');
+const MemberStatsService = require('./lib/members-stats-service');
+
+module.exports = {
+    members: new MemberStatsService({db})
+};

package/core/server/services/themes/validate.js

@@ -22,26 +22,27 @@ const check = async function check(theme, isZip) {
     debug('Begin: Check');
     // gscan can slow down boot time if we require on boot, for now nest the require.
     const gscan = require('gscan');
+    const checkedVersion = 'v4';
     let checkedTheme;
 
     if (isZip) {
         debug('zip mode');
         checkedTheme = await gscan.checkZip(theme, {
             keepExtractedDir: true,
-            checkVersion: 'v4',
+            checkVersion: checkedVersion,
             labs: labs.getAll()
         });
     } else {
         debug('non-zip mode');
         checkedTheme = await gscan.check(theme.path, {
-            checkVersion: 'v4',
+            checkVersion: checkedVersion,
             labs: labs.getAll()
         });
     }
 
     checkedTheme = gscan.format(checkedTheme, {
         onlyFatalErrors: config.get('env') === 'production',
-        checkVersion: 'v4'
+        checkVersion: checkedVersion
     });
 
     debug('End: Check');

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

@@ -32,7 +32,9 @@ class WebhooksService {
             const newWebhook = await this.WebhookModel.add(data.webhooks[0], options);
             return newWebhook;
         } catch (error) {
-            if (error.errno === 1452 || (error.code === 'SQLITE_CONSTRAINT' && /SQLITE_CONSTRAINT: FOREIGN KEY constraint failed/.test(error.message))) {
+            if (error.errno === 1452
+                || (error.code === 'SQLITE_CONSTRAINT' && /SQLITE_CONSTRAINT: FOREIGN KEY constraint failed/.test(error.message))
+                || (error.code === 'SQLITE_CONSTRAINT_FOREIGNKEY')) {
                 throw new ValidationError({
                     message: tpl(messages.nonExistingIntegrationIdProvided.message, {
                         key: 'integration_id'

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

@@ -46,6 +46,14 @@ module.exports = function setupAdminApp() {
     // Finally, routing
     adminApp.get('*', require('./controller'));
 
+    adminApp.use((err, req, res, next) => {
+        if (err.statusCode && err.statusCode === 404) {
+            // Remove 404 errors for next middleware to inject
+            next();
+        } else {
+            next(err);
+        }
+    });
     adminApp.use(errorHandler.pageNotFound);
     adminApp.use(errorHandler.handleHTMLResponse(sentry));
 

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.41%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.42%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" />
@@ -37,8 +37,8 @@
     </style>
 
     
-                <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-09301e5bd933cf6d24368e98a4d898a9.css" title="light">
+                <link rel="stylesheet" href="assets/vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css">
+                <link rel="stylesheet" href="assets/ghost.min-ce35ef1b76d9a943ab912c076773b132.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-9094db77ba3190cb10876f8e42e1d90d.js"></script>
-                <script src="assets/ghost.min-8e2e6c7a01fde044c566c1650a36bfc2.js"></script>
+                <script src="assets/vendor.min-21f79c68a284acb1b70039f3f63e5507.js"></script>
+                <script src="assets/ghost.min-20096eef632760c3a2906e243adbd24b.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.41%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.42%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" />
@@ -37,8 +37,8 @@
     </style>
 
     
-                <link rel="stylesheet" href="assets/vendor.min-2c8ad32b7960bb605ebc20097fee5ebd.css">
-                <link rel="stylesheet" href="assets/ghost.min-09301e5bd933cf6d24368e98a4d898a9.css" title="light">
+                <link rel="stylesheet" href="assets/vendor.min-ba66b98f7c24fa40e061c7ffc94f4e23.css">
+                <link rel="stylesheet" href="assets/ghost.min-ce35ef1b76d9a943ab912c076773b132.css" title="light">
             
 
     
@@ -56,8 +56,8 @@
 <div id="ember-basic-dropdown-wormhole"></div>
 
 
-                <script src="assets/vendor.min-9094db77ba3190cb10876f8e42e1d90d.js"></script>
-                <script src="assets/ghost.min-8e2e6c7a01fde044c566c1650a36bfc2.js"></script>
+                <script src="assets/vendor.min-21f79c68a284acb1b70039f3f63e5507.js"></script>
+                <script src="assets/ghost.min-20096eef632760c3a2906e243adbd24b.js"></script>
             
 </body>
 </html>

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

@@ -113,8 +113,6 @@ module.exports = function apiRoutes() {
 
     router.get('/members/stats/count', mw.authAdminApi, http(api.members.memberStats));
     router.get('/members/stats/mrr', mw.authAdminApi, http(api.members.mrrStats));
-    router.get('/members/stats/subscribers', mw.authAdminApi, http(api.members.subscriberStats));
-    router.get('/members/stats/gross_volume', mw.authAdminApi, http(api.members.grossVolumeStats));
 
     router.get('/members/events', mw.authAdminApi, http(api.members.activityFeed));
 
@@ -139,6 +137,9 @@ module.exports = function apiRoutes() {
 
     router.get('/members/:id/signin_urls', mw.authAdminApi, http(api.memberSigninUrls.read));
 
+    // ## Stats
+    router.get('/stats/member_count', mw.authAdminApi, http(api.stats.memberCountHistory));
+
     // ## Labels
     router.get('/labels', mw.authAdminApi, http(api.labels.browse));
     router.get('/labels/:id', mw.authAdminApi, http(api.labels.read));
@@ -290,6 +291,7 @@ 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));
 
@@ -309,5 +311,9 @@ module.exports = function apiRoutes() {
     router.get('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.browse));
     router.put('/custom_theme_settings', mw.authAdminApi, http(api.customThemeSettings.edit));
 
+    router.get('/newsletters', mw.authAdminApi, http(api.newsletters.browse));
+    router.post('/newsletters', mw.authAdminApi, http(api.newsletters.add));
+    router.put('/newsletters/:id', mw.authAdminApi, http(api.newsletters.edit));
+
     return router;
 };

package/core/shared/config/defaults.json

@@ -128,8 +128,8 @@
         "emailAnalytics": true
     },
     "portal": {
-        "url": "https://unpkg.com/@tryghost/portal@~1.17.0/umd/portal.min.js",
-        "version": "1.17"
+        "url": "https://unpkg.com/@tryghost/portal@~1.18.0/umd/portal.min.js",
+        "version": "1.18"
     },
     "tenor": {
         "publicReadOnlyApiKey": null,

package/core/shared/config/env/config.development.json

@@ -0,0 +1,26 @@
+{
+    "url": "http://localhost:2368",
+    "database": {
+        "client": "sqlite3",
+        "connection": {
+            "filename": "content/data/ghost-dev.db"
+        },
+        "debug": false
+    },
+    "paths": {
+        "contentPath": "content/"
+    },
+    "privacy": {
+        "useRpcPing": false,
+        "useUpdateCheck": true
+    },
+    "useMinFiles": false,
+    "caching": {
+        "theme": {
+            "maxAge": 0
+        },
+        "admin": {
+            "maxAge": 0
+        }
+    }
+}

package/core/shared/config/env/config.production.json

@@ -0,0 +1,21 @@
+{
+    "database": {
+        "client": "mysql",
+        "connection": {
+            "host"     : "127.0.0.1",
+            "user"     : "root",
+            "password" : "",
+            "database" : "ghost"
+        }
+    },
+    "paths": {
+        "contentPath": "content/"
+    },
+    "logging": {
+        "level": "info",
+        "rotation": {
+            "enabled": true
+        },
+        "transports": ["file", "stdout"]
+    }
+}

package/core/shared/config/env/config.testing-mysql.json

@@ -0,0 +1,59 @@
+{
+    "url": "http://127.0.0.1:2369",
+    "server": {
+        "port": 2369
+    },
+    "database": {
+        "client": "mysql",
+        "connection": {
+            "host"     : "127.0.0.1",
+            "user"     : "root",
+            "password" : "",
+            "database" : "ghost_testing"
+        }
+    },
+    "logging": {
+        "level": "fatal"
+    },
+    "spam": {
+        "user_login": {
+            "minWait": 600000,
+            "maxWait": 604800000,
+            "freeRetries": 3
+        },
+        "user_reset": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries": 4
+        },
+        "global_reset": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":4
+        },
+        "global_block": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":4
+        },
+        "private_block": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":99
+        }
+    },
+    "privacy": {
+        "useTinfoil": true,
+        "useStructuredData": true
+    },
+    "useMinFiles": false,
+    "paths": {
+        "fixtures": "test/utils/fixtures/fixtures",
+        "defaultSettings": "test/utils/fixtures/default-settings.json",
+        "urlCache": "test/utils/fixtures/urls"
+    }
+}

package/core/shared/config/env/config.testing.json

@@ -0,0 +1,58 @@
+{
+    "url": "http://127.0.0.1:2369",
+    "database": {
+        "client": "sqlite3",
+        "connection": {
+            "filename": "/tmp/ghost-test.db"
+        },
+        "useNullAsDefault": true,
+        "debug": false
+    },
+    "server": {
+        "port": 2369
+    },
+    "logging": {
+        "level": "fatal"
+    },
+    "spam": {
+        "user_login": {
+            "minWait": 600000,
+            "maxWait": 604800000,
+            "freeRetries": 3
+        },
+        "user_reset": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries": 4
+        },
+        "global_reset": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":4
+        },
+        "global_block": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":4
+        },
+        "private_block": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":99
+        }
+    },
+    "privacy": {
+        "useTinfoil": true,
+        "useStructuredData": true
+    },
+    "useMinFiles": false,
+    "paths": {
+        "fixtures": "test/utils/fixtures/fixtures",
+        "defaultSettings": "test/utils/fixtures/default-settings.json",
+        "urlCache": "test/utils/fixtures/urls"
+    }
+}

package/core/shared/labs.js

@@ -35,7 +35,9 @@ const ALPHA_FEATURES = [
     'membersActivity',
     'urlCache',
     'beforeAfterCard',
-    'tweetGridCard'
+    'tweetGridCard',
+    'multipleNewsletters',
+    'dashboardV5'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

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

@@ -28,7 +28,7 @@ const doGet = (key, options) => {
 
     // Don't try to resolve to the value of the setting
     if (options && options.resolve === false) {
-        return settingsCache[key] || null;
+        return settingsCache[key];
     }
 
     // Default behaviour is to try to resolve the value and return that