ghost 4.22.3 → 4.22.4

package/core/frontend/src/cards/css/toggle.css

@@ -0,0 +1,47 @@
+.kg-toggle-card[data-kg-toggle-state="close"] .kg-toggle-content{
+    visibility: hidden;
+    opacity: 0;
+    height: 0;
+    padding: 0;
+}
+
+.kg-toggle-card[data-kg-toggle-state="close"] svg {
+    transform: unset;
+}
+
+.kg-toggle-card {
+    border: 1px solid rgba(127, 127, 127, 0.15);
+    border-radius: 4px;
+    padding: 20px;
+}
+
+.kg-toggle-heading {
+    font-size: 2rem;
+    font-weight: 600;
+    cursor: pointer;
+    display: flex;
+    justify-content: space-between;
+    align-items: flex-start;
+}
+
+.kg-toggle-card-icon {
+    height: 24px;
+    width: 24px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin-left: 16px;
+}
+
+.kg-toggle-heading svg {
+    width: 14px;
+    color: rgba(127, 127, 127, 0.4);
+    transition: transform 0.3s;
+    transform: rotate(180deg);
+}
+
+.kg-toggle-content {
+    display: flex;
+    transition: opacity 0.3s;
+    padding-top: 8px;
+}

package/core/frontend/src/cards/js/toggle.js

@@ -0,0 +1,16 @@
+const toggleHeadingElements = document.getElementsByClassName("kg-toggle-heading");
+
+const toggleFn = function(event) {
+    const targetElement = event.target;
+    const parentElement = targetElement.closest('.kg-toggle-card');
+    var toggleState = parentElement.getAttribute("data-kg-toggle-state");
+    if (toggleState === 'close') {
+        parentElement.setAttribute('data-kg-toggle-state', 'open');
+    } else {
+        parentElement.setAttribute('data-kg-toggle-state', 'close');
+    }
+};
+
+for (let i = 0; i < toggleHeadingElements.length; i++) {
+    toggleHeadingElements[i].addEventListener('click', toggleFn, false);
+}

package/core/frontend/web/middleware/serve-public-file.js

@@ -11,10 +11,16 @@ const messages = {
     fileNotFound: 'File not found'
 };
 
-function createPublicFileMiddleware(file, type, maxAge) {
+function createPublicFileMiddleware(location, file, mime, maxAge) {
     let content;
-    const publicFilePath = config.get('paths').publicFilePath;
-    const filePath = file.match(/^public/) ? path.join(publicFilePath, file.replace(/^public/, '')) : path.join(publicFilePath, file);
+    // These files are provided by Ghost, and therefore live inside of the core folder
+    const staticFilePath = config.get('paths').publicFilePath;
+    // These files are built on the fly, and must be saved in the content folder
+    const builtFilePath = config.getContentPath('public');
+
+    let locationPath = location === 'static' ? staticFilePath : builtFilePath;
+
+    const filePath = file.match(/^public/) ? path.join(locationPath, file.replace(/^public/, '')) : path.join(locationPath, file);
     const blogRegex = /(\{\{blog-url\}\})/g;
 
     return function servePublicFileMiddleware(req, res, next) {
@@ -24,7 +30,7 @@ function createPublicFileMiddleware(file, type, maxAge) {
         }
 
         // send image files directly and let express handle content-length, etag, etc
-        if (type.match(/^image/)) {
+        if (mime.match(/^image/)) {
             return res.sendFile(filePath, (err) => {
                 if (err && err.status === 404) {
                     // ensure we're triggering basic asset 404 and not a templated 404
@@ -57,13 +63,13 @@ function createPublicFileMiddleware(file, type, maxAge) {
 
             let str = buf.toString();
 
-            if (type === 'text/xsl' || type === 'text/plain' || type === 'application/javascript') {
+            if (mime === 'text/xsl' || mime === 'text/plain' || mime === 'application/javascript') {
                 str = str.replace(blogRegex, urlUtils.urlFor('home', true).replace(/\/$/, ''));
             }
 
             content = {
                 headers: {
-                    'Content-Type': type,
+                    'Content-Type': mime,
                     'Content-Length': Buffer.from(str).length,
                     ETag: `"${crypto.createHash('md5').update(str, 'utf8').digest('hex')}"`,
                     'Cache-Control': `public, max-age=${maxAge}`
@@ -78,8 +84,8 @@ function createPublicFileMiddleware(file, type, maxAge) {
 
 // ### servePublicFile Middleware
 // Handles requests to robots.txt and favicon.ico (and caches them)
-function servePublicFile(file, type, maxAge) {
-    const publicFileMiddleware = createPublicFileMiddleware(file, type, maxAge);
+function servePublicFile(location, file, type, maxAge) {
+    const publicFileMiddleware = createPublicFileMiddleware(location, file, type, maxAge);
 
     return function servePublicFileMiddleware(req, res, next) {
         if (req.path === '/' + file) {

package/core/frontend/web/site.js

@@ -104,15 +104,15 @@ module.exports = function setupSiteApp(options = {}) {
     siteApp.use(mw.serveFavicon());
 
     // Serve sitemap.xsl file
-    siteApp.use(mw.servePublicFile('sitemap.xsl', 'text/xsl', constants.ONE_DAY_S));
+    siteApp.use(mw.servePublicFile('static', 'sitemap.xsl', 'text/xsl', constants.ONE_DAY_S));
 
     // Serve stylesheets for default templates
-    siteApp.use(mw.servePublicFile('public/ghost.css', 'text/css', constants.ONE_HOUR_S));
-    siteApp.use(mw.servePublicFile('public/ghost.min.css', 'text/css', constants.ONE_YEAR_S));
+    siteApp.use(mw.servePublicFile('static', 'public/ghost.css', 'text/css', constants.ONE_HOUR_S));
+    siteApp.use(mw.servePublicFile('static', 'public/ghost.min.css', 'text/css', constants.ONE_YEAR_S));
 
     // Card assets
-    siteApp.use(mw.servePublicFile('public/cards.min.css', 'text/css', constants.ONE_YEAR_S));
-    siteApp.use(mw.servePublicFile('public/cards.min.js', 'text/js', constants.ONE_YEAR_S));
+    siteApp.use(mw.servePublicFile('built', 'public/cards.min.css', 'text/css', constants.ONE_YEAR_S));
+    siteApp.use(mw.servePublicFile('built', 'public/cards.min.js', 'text/js', constants.ONE_YEAR_S));
 
     // Serve blog images using the storage adapter
     siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, storage.getStorage('images').serve());
@@ -147,26 +147,26 @@ module.exports = function setupSiteApp(options = {}) {
     debug('Themes done');
 
     // Serve robots.txt if not found in theme
-    siteApp.use(mw.servePublicFile('robots.txt', 'text/plain', constants.ONE_HOUR_S));
+    siteApp.use(mw.servePublicFile('static', 'robots.txt', 'text/plain', constants.ONE_HOUR_S));
 
     // site map - this should probably be refactored to be an internal app
     sitemapHandler(siteApp);
     debug('Internal apps done');
 
     // send 503 error page in case of maintenance
-    siteApp.use(shared.middlewares.maintenance);
+    siteApp.use(shared.middleware.maintenance);
 
     // Add in all trailing slashes & remove uppercase
     // must happen AFTER asset loading and BEFORE routing
-    siteApp.use(shared.middlewares.prettyUrls);
+    siteApp.use(shared.middleware.prettyUrls);
 
     // ### Caching
     siteApp.use(function (req, res, next) {
         // Site frontend is cacheable UNLESS request made by a member or blog is in private mode
         if (req.member || res.isPrivateBlog) {
-            return shared.middlewares.cacheControl('private')(req, res, next);
+            return shared.middleware.cacheControl('private')(req, res, next);
         } else {
-            return shared.middlewares.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next);
+            return shared.middleware.cacheControl('public', {maxAge: config.get('caching:frontend:maxAge')})(req, res, next);
         }
     });
 
@@ -179,7 +179,7 @@ module.exports = function setupSiteApp(options = {}) {
     siteApp.use(SiteRouter);
 
     // ### Error handlers
-    siteApp.use(shared.middlewares.errorHandler.pageNotFound);
+    siteApp.use(shared.middleware.errorHandler.pageNotFound);
     config.get('apps:internal').forEach((appName) => {
         const app = require(path.join(config.get('paths').internalAppPath, appName));
 
@@ -187,7 +187,7 @@ module.exports = function setupSiteApp(options = {}) {
             app.setupErrorHandling(siteApp);
         }
     });
-    siteApp.use(shared.middlewares.errorHandler.handleThemeResponse);
+    siteApp.use(shared.middleware.errorHandler.handleThemeResponse);
 
     debug('Site setup end');
 

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

@@ -163,7 +163,7 @@ module.exports = {
                     options = Object.assign(options, {context: {internal: true}});
                     return auth.passwordreset.doReset(options, tokenParts, api.settings)
                         .then((params) => {
-                            web.shared.middlewares.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
+                            web.shared.middleware.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
                             return params;
                         });
                 });

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

@@ -22,7 +22,7 @@ module.exports = {
         ];
 
         if (labs.isSet('gifsCard')) {
-            keys.push('tenorApiKey');
+            keys.push('tenor');
         }
 
         frame.response = {

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

@@ -145,7 +145,7 @@ module.exports = {
                     options = Object.assign(options, {context: {internal: true}});
                     return auth.passwordreset.doReset(options, tokenParts, api.settings)
                         .then((params) => {
-                            web.shared.middlewares.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
+                            web.shared.middleware.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
                             return params;
                         });
                 });

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

@@ -146,7 +146,7 @@ module.exports = {
                     options = Object.assign(options, {context: {internal: true}});
                     return auth.passwordreset.doReset(options, tokenParts, api.settings)
                         .then((params) => {
-                            web.shared.middlewares.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
+                            web.shared.middleware.api.spamPrevention.userLogin().reset(frame.options.ip, `${tokenParts.email}login`);
                             return params;
                         });
                 });

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

@@ -17,6 +17,13 @@ function configure(dbConfig) {
         dbConfig.pool = {
             afterCreate(conn, cb) {
                 conn.run('PRAGMA foreign_keys = ON', cb);
+
+                // These two are meant to improve performance at the cost of reliability
+                // Should be safe for tests. We add them here and leave them on
+                if (config.get('env').startsWith('testing')) {
+                    conn.run('PRAGMA synchronous = OFF;');
+                    conn.run('PRAGMA journal_mode = TRUNCATE;');
+                }
             }
         };
 

package/core/server/data/importer/importers/data/data-importer.js

@@ -112,7 +112,7 @@ DataImporter = {
                 });
             });
 
-            sequence(ops)
+            return sequence(ops)
                 .then(function () {
                     results.forEach(function (promise) {
                         if (!promise.isFulfilled()) {
@@ -121,9 +121,9 @@ DataImporter = {
                     });
 
                     if (errors.length === 0) {
-                        transacting.commit();
+                        return;
                     } else {
-                        transacting.rollback(errors);
+                        throw errors;
                     }
                 });
         }).then(function () {

package/core/server/data/migrations/init/2-create-fixtures.js

@@ -1,26 +1,9 @@
-const Promise = require('bluebird');
-const _ = require('lodash');
-const fixtures = require('../../schema/fixtures');
-const logging = require('@tryghost/logging');
+const {fixtureManager} = require('../../schema/fixtures');
 
 module.exports.config = {
     transaction: true
 };
 
-module.exports.up = async (options) => {
-    const localOptions = _.merge({
-        context: {internal: true},
-        migrating: true
-    }, options);
-
-    await Promise.mapSeries(fixtures.models, async (model) => {
-        logging.info('Model: ' + model.name);
-
-        await fixtures.utils.addFixturesForModel(model, localOptions);
-    });
-
-    await Promise.mapSeries(fixtures.relations, async (relation) => {
-        logging.info('Relation: ' + relation.from.model + ' to ' + relation.to.model);
-        await fixtures.utils.addFixturesForRelation(relation, localOptions);
-    });
+module.exports.up = async function insertFixtures(options) {
+    return await fixtureManager.addAllFixtures(options);
 };

package/core/server/data/migrations/versions/1.21/1-add-contributor-role.js

@@ -1,19 +1,19 @@
 const merge = require('lodash/merge');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 const models = require('../../../../models');
 const permissions = require('../../../../services/permissions');
 const logging = require('@tryghost/logging');
 const _private = {};
 
 _private.addRole = function addRole(options) {
-    const contributorRole = utils.findModelFixtureEntry('Role', {name: 'Contributor'});
+    const contributorRole = fixtureManager.findModelFixtureEntry('Role', {name: 'Contributor'});
     const message = 'Adding "Contributor" role to roles table';
 
     return models.Role.findOne({name: contributorRole.name}, options)
         .then((role) => {
             if (!role) {
                 logging.info(message);
-                return utils.addFixturesForModel({name: 'Role', entries: [contributorRole]}, options);
+                return fixtureManager.addFixturesForModel({name: 'Role', entries: [contributorRole]}, options);
             }
 
             logging.warn(message);
@@ -22,10 +22,10 @@ _private.addRole = function addRole(options) {
 };
 
 _private.addContributorPermissions = function getPermissions(options) {
-    const relations = utils.findRelationFixture('Role', 'Permission');
+    const relations = fixtureManager.findRelationFixture('Role', 'Permission');
     const message = 'Adding permissions_roles fixtures for the contributor role';
 
-    return utils.addFixturesForRelation({
+    return fixtureManager.addFixturesForRelation({
         from: relations.from,
         to: relations.to,
         entries: {

package/core/server/data/migrations/versions/2.15/2-insert-zapier-integration.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addZapierIntegration = (options) => {
     const message = 'Adding "Zapier" integration';
-    const fixtureIntegration = utils.findModelFixtureEntry('Integration', {slug: 'zapier'});
+    const fixtureIntegration = fixtureManager.findModelFixtureEntry('Integration', {slug: 'zapier'});
 
     return models.Integration.findOne({slug: fixtureIntegration.slug}, options)
         .then((integration) => {
             if (!integration) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Integration',
                     entries: [fixtureIntegration]
                 }, options).then(result => _private.printResult(result, message));

package/core/server/data/migrations/versions/2.2/3-insert-admin-integration-role.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addApiKeyRole = (options) => {
     const message = 'Adding "Admin Integration" role to roles table';
-    const apiKeyRole = utils.findModelFixtureEntry('Role', {name: 'Admin Integration'});
+    const apiKeyRole = fixtureManager.findModelFixtureEntry('Role', {name: 'Admin Integration'});
 
     return models.Role.findOne({name: apiKeyRole.name}, options)
         .then((role) => {
             if (!role) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Role',
                     entries: [apiKeyRole]
                 }, options).then(result => _private.printResult(result, message));
@@ -32,9 +32,9 @@ _private.addApiKeyRole = (options) => {
 
 _private.addApiKeyPermissions = (options) => {
     const message = 'Adding permissions for the "Admin Integration" role';
-    const relations = utils.findRelationFixture('Role', 'Permission');
+    const relations = fixtureManager.findRelationFixture('Role', 'Permission');
 
-    return utils.addFixturesForRelation({
+    return fixtureManager.addFixturesForRelation({
         from: relations.from,
         to: relations.to,
         entries: {

package/core/server/data/migrations/versions/2.27/1-insert-ghost-db-backup-role.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addApiKeyRole = (options) => {
     const message = 'Adding "DB Backup Integration" role to roles table';
-    const apiKeyRole = utils.findModelFixtureEntry('Role', {name: 'DB Backup Integration'});
+    const apiKeyRole = fixtureManager.findModelFixtureEntry('Role', {name: 'DB Backup Integration'});
 
     return models.Role.findOne({name: apiKeyRole.name}, options)
         .then((role) => {
             if (!role) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Role',
                     entries: [apiKeyRole]
                 }, options).then(result => _private.printResult(result, message));
@@ -32,9 +32,9 @@ _private.addApiKeyRole = (options) => {
 
 _private.addApiKeyPermissions = (options) => {
     const message = 'Adding permissions for the "DB Backup Integration" role';
-    const relations = utils.findRelationFixture('Role', 'Permission');
+    const relations = fixtureManager.findRelationFixture('Role', 'Permission');
 
-    return utils.addFixturesForRelation({
+    return fixtureManager.addFixturesForRelation({
         from: relations.from,
         to: relations.to,
         entries: {
@@ -81,4 +81,3 @@ module.exports.down = (options) => {
 
     return _private.removeApiKeyPermissionsAndRole(localOptions);
 };
-

package/core/server/data/migrations/versions/2.27/2-insert-db-backup-integration.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addGhostBackupIntegration = (options) => {
     const message = 'Adding "Ghost Backup DB" integration';
-    const fixtureIntegration = utils.findModelFixtureEntry('Integration', {slug: 'ghost-backup'});
+    const fixtureIntegration = fixtureManager.findModelFixtureEntry('Integration', {slug: 'ghost-backup'});
 
     return models.Integration.findOne({slug: fixtureIntegration.slug}, options)
         .then((integration) => {
             if (!integration) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Integration',
                     entries: [fixtureIntegration]
                 }, options).then(result => _private.printResult(result, message));
@@ -67,4 +67,3 @@ module.exports.down = (options) => {
 
     return _private.removeGhostBackupIntegration(localOptions);
 };
-

package/core/server/data/migrations/versions/2.28/3-insert-ghost-scheduler-role.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const resource = 'post';
 const _private = {};
@@ -16,12 +16,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addSchedulerRole = (options) => {
     const message = 'Adding "Scheduler Integration" role to roles table';
-    const apiKeyRole = utils.findModelFixtureEntry('Role', {name: 'Scheduler Integration'});
+    const apiKeyRole = fixtureManager.findModelFixtureEntry('Role', {name: 'Scheduler Integration'});
 
     return models.Role.findOne({name: apiKeyRole.name}, options)
         .then((role) => {
             if (!role) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Role',
                     entries: [apiKeyRole]
                 }, options).then(result => _private.printResult(result, message));
@@ -32,19 +32,19 @@ _private.addSchedulerRole = (options) => {
 };
 
 _private.addPublishPermission = (options) => {
-    const modelToAdd = utils.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
+    const modelToAdd = fixtureManager.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
 
-    return utils.addFixturesForModel(modelToAdd, options)
+    return fixtureManager.addFixturesForModel(modelToAdd, options)
         .then(result => _private.printResult(result, `Adding "publish" permissions fixtures for ${resource}s`));
 };
 
 _private.removeApiKeyPermissionsAndRole = (options) => {
     const message = 'Rollback: Removing "Scheduler Integration" role and permissions';
 
-    const modelToRemove = utils.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
+    const modelToRemove = fixtureManager.findModelFixtures('Permission', {object_type: resource, action_type: 'publish'});
 
     // permission model automatically cleans up permissions_roles on .destroy()
-    return utils.removeFixturesForModel(modelToRemove, options)
+    return fixtureManager.removeFixturesForModel(modelToRemove, options)
         .then(result => _private.printResult(result, `Removing "publish" permissions fixtures for ${resource}s`))
         .then(() => models.Role.findOne({name: 'Scheduler Integration'}, options))
         .then((role) => {

package/core/server/data/migrations/versions/2.28/4-insert-scheduler-integration.js

@@ -1,7 +1,7 @@
 const logging = require('@tryghost/logging');
 const merge = require('lodash/merge');
 const models = require('../../../../models');
-const utils = require('../../../schema/fixtures/utils');
+const {fixtureManager} = require('../../../schema/fixtures');
 
 const _private = {};
 
@@ -15,12 +15,12 @@ _private.printResult = function printResult(result, message) {
 
 _private.addGhostSchedulerIntegration = (options) => {
     const message = 'Adding "Ghost Scheduler" integration';
-    const fixtureIntegration = utils.findModelFixtureEntry('Integration', {slug: 'ghost-scheduler'});
+    const fixtureIntegration = fixtureManager.findModelFixtureEntry('Integration', {slug: 'ghost-scheduler'});
 
     return models.Integration.findOne({slug: fixtureIntegration.slug}, options)
         .then((integration) => {
             if (!integration) {
-                return utils.addFixturesForModel({
+                return fixtureManager.addFixturesForModel({
                     name: 'Integration',
                     entries: [fixtureIntegration]
                 }, options).then(result => _private.printResult(result, message));