Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Fixed replacement strings showing when viewing sent emails

Browse source 
refs https://github.com/TryGhost/Ghost/pull/12232

When viewing sent emails in Ghost's admin area, it displays the `html` field directly from the `email` relation loaded with the post. Since the `mega` refactor we now store raw content in that field rather than sanitized "preview" content so it's necessary to modify the API output to match the old behaviour.

- use the API output serializers to parse replacements in email content and replace with the desired fallback or empty string
This commit is contained in:
Kevin Ansfield 2020-09-29 17:38:46 +01:00
parent 474e6c4c45
commit 932def7e6d
2 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/server/api/canary/utils/serializers/output/emails.js
View file

@ -1,7 +1,9 @@
const mapper = require('./utils/mapper');
module.exports = {
read(email, apiConfig, frame) {
frame.response = {
emails: [email.toJSON(frame.options)]
emails: [mapper.mapEmail(email, frame)]
};
},

22
core/server/api/canary/utils/serializers/output/utils/mapper.js
View file

@ -7,6 +7,7 @@ const clean = require('./clean');
const extraAttrs = require('./extra-attrs');
const postsMetaSchema = require('../../../../../../data/schema').tables.posts_meta;
const config = require('../../../../../../../shared/config');
const mega = require('../../../../../../services/mega');
const mapUser = (model, frame) => {
const jsonModel = model.toJSON ? model.toJSON(frame.options) : model;
@ -62,6 +63,10 @@ const mapPost = (model, frame) => {
jsonModel.authors = jsonModel.authors.map(author => mapUser(author, frame));
}
if (relation === 'email' && jsonModel.email) {
jsonModel.email = mapEmail(jsonModel.email, frame);
}
if (relation === 'email' && _.isEmpty(jsonModel.email)) {
jsonModel.email = null;
}
@ -159,6 +164,22 @@ const mapLabel = (model, frame) => {
return jsonModel;
};
const mapEmail = (model, frame) => {
const jsonModel = model.toJSON ? model.toJSON(frame.options) : model;
// Ensure we're not outputting unwanted replacement strings when viewing email contents
// TODO: extract this to a utility, it's duplicated in the email-preview API controller
const replacements = mega.postEmailSerializer.parseReplacements(jsonModel);
replacements.forEach((replacement) => {
jsonModel[replacement.format] = jsonModel[replacement.format].replace(
replacement.match,
replacement.fallback || ''
);
});
return jsonModel;
};
module.exports.mapPost = mapPost;
module.exports.mapPage = mapPage;
module.exports.mapUser = mapUser;
@ -169,3 +190,4 @@ module.exports.mapSettings = mapSettings;
module.exports.mapImage = mapImage;
module.exports.mapAction = mapAction;
module.exports.mapMember = mapMember;
module.exports.mapEmail = mapEmail;