ghost 4.37.0 → 4.39.0

package/core/frontend/views/unsubscribe.hbs

@@ -5,8 +5,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>
-        {{#if member}}Successfully Unsubscribed{{/if}}
-        {{#if error}}Unsubscribe Failed{{/if}}
+        {{#if error}}
+            Unsubscribe Failed
+        {{else}}
+            Successfully Unsubscribed
+        {{/if}}
     </title>
     <link rel="stylesheet" href="{{asset "public/ghost.css" hasMinFile="true"}}" />
 </head>
@@ -15,42 +18,34 @@
         <div class="gh-viewport">
             <main class="gh-main" role="main">
                 <div class="gh-flow">
-                    <header class="gh-flow-head gh-flow-head-unsubscribe">
-                        <nav class="gh-flow-nav">
-                            <a href="{{@site.url}}" class="gh-flow-back-plain">
-                                <!--?xml version="1.0" encoding="UTF-8" standalone="no"?-->
-                                <svg width="17px" height="27px" viewBox="0 0 17 27" version="1.1"
-                                    xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-                                    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"
-                                        stroke-linecap="round" stroke-linejoin="round">
-                                        <g id="Stroke-42" transform="translate(2.000000, 2.000000)" stroke-width="3"
-                                            stroke="#7d878a">
-                                            <polyline points="13.5401 0.4256 0.3971 11.9256 13.5401 23.4256"></polyline>
-                                        </g>
-                                    </g>
-                                </svg>
-                                Back to {{@site.title}}
-                            </a>
-                        </nav>
-                    </header>
-
                     <div class="gh-flow-content-wrap">
-                        <section class="gh-flow-content gh-flow-content-unsubscribe">
+                        {{#if @site.icon}}
+                            <img class="site-icon" src="{{img_url @site.icon absolute="true"}}" layout="fixed">
+                        {{/if}}
+                        <section class="gh-flow-content unsubscribe">
                             {{#if error}}
+                                <h1>Unsubscribe failed.</h1>
                                 <p>{{error}}</p>
-                            {{else}}
-                                {{#if member}}
-                                    <p>
-                                        <span class="gh-flow-em">{{member.email}}</span> has been successfully unsubscribed from emails.
-                                        {{#match member.status "!=" "free"}}
-                                            <br>
-                                            Don't worry, this will not cancel your paid subscription to {{@site.title}}.
-                                        {{/match}}
-                                    </p>
-                                    <p>Didn't mean to do this? Manage your account <a href="{{@site.url}}/#/portal/account">here</a>.</p>
-                                {{/if}}
+                            {{else if member}}
+                                <h1>Successfully unsubscribed.</h1>
+                                <p>
+                                    <span class="gh-flow-em">{{member.email}}</span> will no longer receive this newsletter.
+                                    {{#match member.status "!=" "free"}}
+                                        This will not cancel your paid subscription{{#if @site.title}} to {{@site.title}}{{/if}}.
+                                    {{/match}}
+                                </p>
                             {{/if}}
                         </section>
+                        <div class="unsubscribe-footer">
+                            {{#unless error}}
+                                <p>Didn't mean to do this? Manage your account <a href="{{@site.url}}/#/portal/account">here</a>.</p>
+                            {{/unless}}
+                            {{#if @site.title}}
+                                <a href="{{@site.url}}">{{@site.title}}</a>
+                            {{else}}
+                                <a href="{{@site.url}}">Visit site</a>
+                            {{/if}}
+                        </div>
                     </div>
                 </div>
             </main>

package/core/frontend/web/middleware/error-handler.js

@@ -84,10 +84,10 @@ const themeErrorRenderer = (err, req, res, next) => {
 };
 
 module.exports.handleThemeResponse = [
-    // Make sure the error can be served
-    prepareError,
     // Handle the error in Sentry
     sentry.errorHandler,
+    // Make sure the error can be served
+    prepareError,
     // Render the error using theme template
     themeErrorRenderer
 ];

package/core/frontend/web/site.js

@@ -4,6 +4,8 @@ const express = require('../../shared/express');
 const cors = require('cors');
 const {URL} = require('url');
 const errors = require('@tryghost/errors');
+const DomainEvents = require('@tryghost/domain-events');
+const {MemberPageViewEvent} = require('@tryghost/member-events');
 
 // App requires
 const config = require('../../shared/config');
@@ -171,6 +173,14 @@ module.exports = function setupSiteApp(options = {}) {
         }
     });
 
+    siteApp.use(function (req, res, next) {
+        if (req.member) {
+            // This event needs memberLastSeenAt to avoid doing un-necessary database queries when updating `last_seen_at`
+            DomainEvents.dispatch(MemberPageViewEvent.create({url: req.url, memberId: req.member.id, memberLastSeenAt: req.member.last_seen_at}, new Date()));
+        }
+        next();
+    });
+
     debug('General middleware done');
 
     router = siteRoutes(options);

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

@@ -49,6 +49,13 @@ module.exports = {
 
                     return auth.setup.setupUser(setupDetails);
                 })
+                .then((data) => {
+                    try {
+                        return auth.setup.doFixtures(data, api.products);
+                    } catch (e) {
+                        return data;
+                    }
+                })
                 .then((data) => {
                     try {
                         return auth.setup.doProduct(data, api.products);

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

@@ -207,5 +207,9 @@ module.exports = {
 
     get productsPublic() {
         return shared.pipeline(require('./products-public'), localUtils, 'content');
+    },
+
+    get tiersPublic() {
+        return shared.pipeline(require('./tiers-public'), localUtils, 'content');
     }
 };

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

@@ -54,10 +54,17 @@ module.exports = {
             'order',
             'debug',
             'page',
-            'search'
+            'search',
+            'include'
         ],
         permissions: true,
-        validation: {},
+        validation: {
+            options: {
+                include: {
+                    values: allowedIncludes
+                }
+            }
+        },
         async query(frame) {
             const page = await membersService.api.memberBREADService.browse(frame.options);
 

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

@@ -93,7 +93,9 @@ module.exports = {
         options: [
             'id'
         ],
-        headers: {},
+        headers: {
+            cacheInvalidate: true
+        },
         validation: {
             options: {
                 id: {
@@ -108,11 +110,6 @@ module.exports = {
                 frame.options
             );
 
-            if (model.wasChanged()) {
-                this.headers.cacheInvalidate = true;
-            } else {
-                this.headers.cacheInvalidate = false;
-            }
             return model;
         }
     }

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

@@ -0,0 +1,34 @@
+// NOTE: We must not cache references to membersService.api
+// as it is a getter and may change during runtime.
+const membersService = require('../../services/members');
+
+const allowedIncludes = ['monthly_price', 'yearly_price', 'benefits'];
+
+module.exports = {
+    docName: 'tiers',
+
+    browse: {
+        options: [
+            'limit',
+            'fields',
+            'include',
+            'filter',
+            'order',
+            'debug',
+            'page'
+        ],
+        permissions: true,
+        validation: {
+            options: {
+                include: {
+                    values: allowedIncludes
+                }
+            }
+        },
+        async query(frame) {
+            const page = await membersService.api.productRepository.list(frame.options);
+
+            return page;
+        }
+    }
+};

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

@@ -54,7 +54,9 @@ module.exports = {
                 }
             }
         },
-        permissions: true,
+        permissions: {
+            docName: 'products'
+        },
         async query(frame) {
             const model = await membersService.api.productRepository.get(frame.data, frame.options);
 
@@ -95,7 +97,9 @@ module.exports = {
         options: [
             'id'
         ],
-        headers: {},
+        headers: {
+            cacheInvalidate: true
+        },
         validation: {
             options: {
                 id: {
@@ -112,11 +116,6 @@ module.exports = {
                 frame.options
             );
 
-            if (model.wasChanged()) {
-                this.headers.cacheInvalidate = true;
-            } else {
-                this.headers.cacheInvalidate = false;
-            }
             return model;
         }
     }

package/core/server/api/canary/utils/serializers/input/pages.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:pages');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');

package/core/server/api/canary/utils/serializers/input/posts.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:input:posts');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');

package/core/server/api/canary/utils/serializers/output/email-posts.js

@@ -1,9 +1,15 @@
 const mapper = require('./utils/mapper');
 const gating = require('./utils/post-gating');
+const membersService = require('../../../../../services/members');
 
 module.exports = {
     async read(model, apiConfig, frame) {
-        const emailPost = await mapper.mapPost(model, frame);
+        const tiersModels = await membersService.api.productRepository.list({
+            withRelated: ['monthlyPrice', 'yearlyPrice']
+        });
+        const tiers = tiersModels.data && tiersModels.data.map(tierModel => tierModel.toJSON());
+
+        const emailPost = await mapper.mapPost(model, frame, {tiers});
         gating.forPost(emailPost, frame);
 
         frame.response = {

package/core/server/api/canary/utils/serializers/output/pages.js

@@ -1,5 +1,6 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:pages');
 const mapper = require('./utils/mapper');
+const membersService = require('../../../../../services/members');
 
 module.exports = {
     async all(models, apiConfig, frame) {
@@ -10,9 +11,15 @@ module.exports = {
             return;
         }
         let pages = [];
+
+        const tiersModels = await membersService.api.productRepository.list({
+            withRelated: ['monthlyPrice', 'yearlyPrice']
+        });
+        const tiers = tiersModels.data ? tiersModels.data.map(tierModel => tierModel.toJSON()) : [];
+
         if (models.meta) {
             for (let model of models.data) {
-                let page = await mapper.mapPage(model, frame);
+                let page = await mapper.mapPage(model, frame, {tiers});
                 pages.push(page);
             }
             frame.response = {
@@ -22,7 +29,7 @@ module.exports = {
 
             return;
         }
-        let page = await mapper.mapPage(models, frame);
+        let page = await mapper.mapPage(models, frame, {tiers});
         frame.response = {
             pages: [page]
         };

package/core/server/api/canary/utils/serializers/output/posts.js

@@ -1,5 +1,6 @@
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:posts');
 const mapper = require('./utils/mapper');
+const membersService = require('../../../../../services/members');
 
 module.exports = {
     async all(models, apiConfig, frame) {
@@ -10,9 +11,14 @@ module.exports = {
             return;
         }
         let posts = [];
+
+        const tiersModels = await membersService.api.productRepository.list({
+            withRelated: ['monthlyPrice', 'yearlyPrice']
+        });
+        const tiers = tiersModels.data ? tiersModels.data.map(tierModel => tierModel.toJSON()) : [];
         if (models.meta) {
             for (let model of models.data) {
-                let post = await mapper.mapPost(model, frame);
+                let post = await mapper.mapPost(model, frame, {tiers});
                 posts.push(post);
             }
             frame.response = {
@@ -22,7 +28,7 @@ module.exports = {
 
             return;
         }
-        let post = await mapper.mapPost(models, frame);
+        let post = await mapper.mapPost(models, frame, {tiers});
         frame.response = {
             posts: [post]
         };

package/core/server/api/canary/utils/serializers/output/preview.js

@@ -1,8 +1,14 @@
 const mapper = require('./utils/mapper');
+const membersService = require('../../../../../services/members');
 
 module.exports = {
     async all(model, apiConfig, frame) {
-        const data = await mapper.mapPost(model, frame);
+        const tiersModels = await membersService.api.productRepository.list({
+            withRelated: ['monthlyPrice', 'yearlyPrice']
+        });
+        const tiers = tiersModels.data ? tiersModels.data.map(tierModel => tierModel.toJSON()) : [];
+
+        const data = await mapper.mapPost(model, frame, {tiers});
         frame.response = {
             preview: [data]
         };

package/core/server/api/canary/utils/serializers/output/products.js

@@ -1,6 +1,7 @@
 //@ts-check
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:products');
 const _ = require('lodash');
+const utils = require('../../../../shared/utils');
 
 const allowedIncludes = ['stripe_prices', 'monthly_price', 'yearly_price'];
 
@@ -22,7 +23,7 @@ module.exports = {
  */
 function paginatedProducts(page, _apiConfig, frame) {
     const requestedQueryIncludes = frame.original && frame.original.query && frame.original.query.include && frame.original.query.include.split(',') || [];
-    const requestedOptionsIncludes = frame.original && frame.original.options && frame.original.options.include || [];
+    const requestedOptionsIncludes = utils.options.trimAndLowerCase(frame.original && frame.original.options && frame.original.options.include || []);
     return {
         products: page.data.map((model) => {
             return cleanIncludes(
@@ -74,6 +75,7 @@ function serializeProduct(product, options, apiType) {
         description: json.description,
         slug: json.slug,
         active: json.active,
+        visibility: json.visibility,
         type: json.type,
         welcome_page_url: json.welcome_page_url,
         created_at: json.created_at,

package/core/server/api/canary/utils/serializers/output/tiers.js

@@ -3,6 +3,7 @@ const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:ti
 const _ = require('lodash');
 
 const allowedIncludes = ['monthly_price', 'yearly_price'];
+const utils = require('../../../../shared/utils');
 
 module.exports = {
     browse: createSerializer('browse', paginatedTiers),
@@ -22,7 +23,7 @@ module.exports = {
  */
 function paginatedTiers(page, _apiConfig, frame) {
     const requestedQueryIncludes = frame.original && frame.original.query && frame.original.query.include && frame.original.query.include.split(',') || [];
-    const requestedOptionsIncludes = frame.original && frame.original.options && frame.original.options.include || [];
+    const requestedOptionsIncludes = utils.options.trimAndLowerCase(frame.original && frame.original.options && frame.original.options.include || []);
     return {
         tiers: page.data.map((model) => {
             return cleanIncludes(
@@ -81,7 +82,8 @@ function serializeTier(tier, options, apiType) {
         stripe_prices: json.stripePrices ? json.stripePrices.map(price => serializeStripePrice(price, hideStripeData)) : null,
         monthly_price: serializeStripePrice(json.monthlyPrice, hideStripeData),
         yearly_price: serializeStripePrice(json.yearlyPrice, hideStripeData),
-        benefits: json.benefits || null
+        benefits: json.benefits || null,
+        visibility: json.visibility
     };
 
     return serialized;

package/core/server/api/canary/utils/serializers/output/utils/mapper.js

@@ -31,7 +31,8 @@ const mapTag = (model, frame) => {
     return jsonModel;
 };
 
-const mapPost = async (model, frame) => {
+const mapPost = async (model, frame, options = {}) => {
+    const {tiers: tiersData} = options || {};
     const extendedOptions = Object.assign(_.cloneDeep(frame.options), {
         extraProperties: ['canonical_url']
     });
@@ -45,12 +46,21 @@ const mapPost = async (model, frame) => {
     // Attach tiers to custom nql visibility filter
     if (labsService.isSet('multipleProducts')
         && jsonModel.visibility
-        && !['members', 'public', 'paid', 'tiers'].includes(jsonModel.visibility)
     ) {
-        const tiers = await postsService.getProductsFromVisibilityFilter(jsonModel.visibility);
+        if (['members', 'public'].includes(jsonModel.visibility) && jsonModel.tiers) {
+            jsonModel.tiers = tiersData || [];
+        }
+
+        if (jsonModel.visibility === 'paid' && jsonModel.tiers) {
+            jsonModel.tiers = tiersData ? tiersData.filter(t => t.type === 'paid') : [];
+        }
 
-        jsonModel.visibility = 'tiers';
-        jsonModel.tiers = tiers;
+        if (!['members', 'public', 'paid', 'tiers'].includes(jsonModel.visibility)) {
+            const tiers = await postsService.getProductsFromVisibilityFilter(jsonModel.visibility);
+
+            jsonModel.visibility = 'tiers';
+            jsonModel.tiers = tiers;
+        }
     }
 
     if (utils.isContentAPI(frame)) {
@@ -103,8 +113,8 @@ const mapPost = async (model, frame) => {
     return jsonModel;
 };
 
-const mapPage = async (model, frame) => {
-    const jsonModel = await mapPost(model, frame);
+const mapPage = async (model, frame, options) => {
+    const jsonModel = await mapPost(model, frame, options);
 
     delete jsonModel.email_subject;
     delete jsonModel.email_recipient_filter;

package/core/server/api/shared/serializers/handle.js

@@ -21,11 +21,11 @@ module.exports.input = (apiConfig, apiSerializers, frame) => {
     const tasks = [];
     const sharedSerializers = require('./input');
 
-    if (!apiSerializers) {
+    if (!apiConfig) {
         return Promise.reject(new errors.IncorrectUsageError());
     }
 
-    if (!apiConfig) {
+    if (!apiSerializers) {
         return Promise.reject(new errors.IncorrectUsageError());
     }
 

package/core/server/api/v2/utils/serializers/input/pages.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:pages');
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const url = require('./utils/url');

package/core/server/api/v2/utils/serializers/input/posts.js

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const debug = require('@tryghost/debug')('api:v2:utils:serializers:input:posts');
 const url = require('./utils/url');
 const localUtils = require('../../index');

package/core/server/api/v3/utils/serializers/input/pages.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:pages');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');

package/core/server/api/v3/utils/serializers/input/posts.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('api:v3:utils:serializers:input:posts');
-const mapNQLKeyValues = require('@nexes/nql').utils.mapKeyValues;
+const mapNQLKeyValues = require('@tryghost/nql').utils.mapKeyValues;
 const url = require('./utils/url');
 const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');

package/core/server/data/db/connection.js

@@ -32,9 +32,10 @@ function configure(dbConfig) {
         process.env.BTHREADS_BACKEND = 'child_process';
     }
 
-    if (client === 'mysql') {
-        dbConfig.connection.timezone = 'UTC';
+    if (client === 'mysql2') {
+        dbConfig.connection.timezone = 'Z';
         dbConfig.connection.charset = 'utf8mb4';
+        dbConfig.connection.decimalNumbers = true;
 
         // NOTE: disabled so that worker processes can use the db without
         // requiring logging and causing file desriptor leaks.