ghost 4.20.0 → 4.20.4

package/core/built/assets/{ghost.min-26e427944e719b616b8dc7fbb3bbd2f9.js → ghost.min-07b6a50c54b3e2e190332c28c7255d2f.js}

@@ -3094,7 +3094,7 @@ var t=Ember.Service.extend(Ember.Evented,{publish(){return this.trigger(...argum
 e.default=t})),define("ghost-admin/services/feature",["exports","jquery"],(function(e,t){function n(e,t={}){let{user:n,onChange:r}=t,i=n?[`accessibility.${e}`]:[`config.${e}`,`labs.${e}`]
 return Ember.computed.apply(Ember,i.concat({get(){let r=!1
 return r=n?this.get(`accessibility.${e}`):this.get(`config.${e}`)?this.get(`config.${e}`):this.get(`labs.${e}`)||!1,t.developer&&(r=r&&this.get("config.enableDeveloperExperiments")),r},set(e,n){return this.update(e,n,t),r&&this.get(r).bind(this)(n),n}}))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0,e.feature=n
-var r=Ember.Service.extend({store:Ember.inject.service(),config:Ember.inject.service(),session:Ember.inject.service(),settings:Ember.inject.service(),notifications:Ember.inject.service(),lazyLoader:Ember.inject.service(),emailAnalytics:n("emailAnalytics"),nightShift:n("nightShift",{user:!0,onChange:"_setAdminTheme"}),launchComplete:n("launchComplete",{user:!0}),multipleProducts:n("multipleProducts"),offers:n("offers",{developer:!0}),oauthLogin:n("oauthLogin",{developer:!0}),customThemeSettings:n("customThemeSettings",{developer:!0}),membersActivity:n("membersActivity",{developer:!0}),_user:null,labs:Ember.computed("settings.labs",(function(){let e=this.get("settings.labs")
+var r=Ember.Service.extend({store:Ember.inject.service(),config:Ember.inject.service(),session:Ember.inject.service(),settings:Ember.inject.service(),notifications:Ember.inject.service(),lazyLoader:Ember.inject.service(),emailAnalytics:n("emailAnalytics"),nightShift:n("nightShift",{user:!0,onChange:"_setAdminTheme"}),launchComplete:n("launchComplete",{user:!0}),multipleProducts:n("multipleProducts"),offers:n("offers"),oauthLogin:n("oauthLogin",{developer:!0}),customThemeSettings:n("customThemeSettings"),membersActivity:n("membersActivity",{developer:!0}),_user:null,labs:Ember.computed("settings.labs",(function(){let e=this.get("settings.labs")
 try{return JSON.parse(e)||{}}catch(t){return{}}})),accessibility:Ember.computed("_user.accessibility",(function(){let e=this.get("_user.accessibility")
 try{return JSON.parse(e)||{}}catch(t){return{}}})),fetch(){return this.settings.fetch().then((()=>(this.set("_user",this.session.user),this._setAdminTheme().then((()=>!0)))))},update(e,t,n={}){let r=n.user?"accessibility":"labs",i=this.get(n.user?"_user":"settings"),a=this.get(r)
 return Ember.set(a,e,t),n.requires&&!0===t&&n.requires.forEach((e=>{Ember.set(a,e,!0)})),i.set(r,JSON.stringify(a)),i.save().then((()=>(this.notifyPropertyChange(r),this.get(`${r}.${e}`)))).catch((t=>{if(i.rollbackAttributes(),this.notifyPropertyChange(r),!t)throw new Ember.Error(`Validation of the feature service ${n.user?"user":"settings"} model failed when updating ${r}.`)
@@ -3679,4 +3679,4 @@ var t=Ember.Component.extend({})
 e.default=t})),define("ghost-admin/config/environment",[],(function(){try{var e="ghost-admin/config/environment",t=document.querySelector('meta[name="'+e+'"]').getAttribute("content"),n={default:JSON.parse(decodeURIComponent(t))}
 return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(r){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.20",name:"ghost-admin"})
 
-//# sourceMappingURL=ghost.min-26e427944e719b616b8dc7fbb3bbd2f9.map
+//# sourceMappingURL=ghost.min-07b6a50c54b3e2e190332c28c7255d2f.map

package/core/frontend/services/routing/router-manager.js

@@ -108,9 +108,11 @@ class RouterManager {
         this.siteRouter.mountRouter(unsubscribeRouter.router());
         this.registry.setRouter('unsubscribeRouter', unsubscribeRouter);
 
-        const emailRouter = new EmailRouter(RESOURCE_CONFIG);
-        this.siteRouter.mountRouter(emailRouter.router());
-        this.registry.setRouter('emailRouter', emailRouter);
+        if (RESOURCE_CONFIG.QUERY.email) {
+            const emailRouter = new EmailRouter(RESOURCE_CONFIG);
+            this.siteRouter.mountRouter(emailRouter.router());
+            this.registry.setRouter('emailRouter', emailRouter);
+        }
 
         const previewRouter = new PreviewRouter(RESOURCE_CONFIG);
         this.siteRouter.mountRouter(previewRouter.router());

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

@@ -55,9 +55,8 @@ module.exports = {
         this.browse(...arguments);
     },
 
-    edit(models, apiConfig, frame) {
-        const settingsKeyedJSON = _.keyBy(_.invokeMap(models, 'toJSON'), 'key');
-        this.browse(settingsKeyedJSON, apiConfig, frame);
+    edit() {
+        this.browse(...arguments);
     },
 
     download(bytes, apiConfig, frame) {

package/core/server/api/v3/utils/serializers/output/settings.js

@@ -55,9 +55,8 @@ module.exports = {
         this.browse(...arguments);
     },
 
-    edit(models, apiConfig, frame) {
-        const settingsKeyedJSON = _.keyBy(_.invokeMap(models, 'toJSON'), 'key');
-        this.browse(settingsKeyedJSON, apiConfig, frame);
+    edit() {
+        this.browse(...arguments);
     },
 
     download(bytes, apiConfig, frame) {

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

@@ -4,6 +4,7 @@
  */
 const events = require('../../lib/common/events');
 const models = require('../../models');
+const labs = require('../../../shared/labs');
 const SettingsCache = require('../../../shared/settings-cache');
 const SettingsBREADService = require('./settings-bread-service');
 const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./settings-utils');
@@ -14,7 +15,8 @@ const {obfuscatedSetting, isSecretSetting, hideValueIfSecret} = require('./setti
 const getSettingsBREADServiceInstance = () => {
     return new SettingsBREADService({
         SettingsModel: models.Settings,
-        settingsCache: SettingsCache
+        settingsCache: SettingsCache,
+        labsService: labs
     });
 };
 

package/core/server/services/settings/settings-bread-service.js

@@ -14,10 +14,12 @@ class SettingsBREADService {
      * @param {Object} options
      * @param {Object} options.SettingsModel
      * @param {Object} options.settingsCache - SettingsCache instance
+     * @param {Object} options.labsService - labs service instance
      */
-    constructor({SettingsModel, settingsCache}) {
+    constructor({SettingsModel, settingsCache, labsService}) {
         this.SettingsModel = SettingsModel;
         this.settingsCache = settingsCache;
+        this.labs = labsService;
     }
 
     /**
@@ -28,24 +30,7 @@ class SettingsBREADService {
     browse(context) {
         let settings = this.settingsCache.getAll();
 
-        // CASE: no context passed (functional call)
-        if (!context) {
-            return Promise.resolve(settings.filter((setting) => {
-                return setting.group === 'site';
-            }));
-        }
-
-        if (!context.internal) {
-            // CASE: omit core settings unless internal request
-            settings = _.filter(settings, (setting) => {
-                const isCore = setting.group === 'core';
-                return !isCore;
-            });
-            // CASE: omit secret settings unless internal request
-            settings = settings.map(hideValueIfSecret);
-        }
-
-        return settings;
+        return this._formatBrowse(settings, context);
     }
 
     /**
@@ -86,6 +71,12 @@ class SettingsBREADService {
             }));
         }
 
+        // NOTE: Labs flags can exist outside of the DB when they are forced on/off
+        //       so we grab them from the labs service instead as that's source-of-truth
+        if (setting.key === 'labs') {
+            setting.value = JSON.stringify(this.labs.getAll());
+        }
+
         setting = hideValueIfSecret(setting);
 
         return {
@@ -161,7 +152,9 @@ class SettingsBREADService {
             });
         }
 
-        return this.SettingsModel.edit(filteredSettings, options);
+        return this.SettingsModel.edit(filteredSettings, options).then((result) => {
+            return this._formatBrowse(_.keyBy(_.invokeMap(result, 'toJSON'), 'key'), options.context);
+        });
     }
 
     /**
@@ -183,6 +176,35 @@ class SettingsBREADService {
             }
         }
     }
+
+    _formatBrowse(inputSettings, context) {
+        let settings = _.values(inputSettings);
+        // CASE: no context passed (functional call)
+        if (!context) {
+            return Promise.resolve(settings.filter((setting) => {
+                return setting.group === 'site';
+            }));
+        }
+
+        if (!context.internal) {
+            // CASE: omit core settings unless internal request
+            settings = _.filter(settings, (setting) => {
+                const isCore = setting.group === 'core';
+                return !isCore;
+            });
+            // CASE: omit secret settings unless internal request
+            settings = settings.map(hideValueIfSecret);
+        }
+
+        // NOTE: Labs flags can exist outside of the DB when they are forced on/off
+        //       so we grab them from the labs service instead as that's source-of-truth
+        const labsSetting = settings.find(setting => setting.key === 'labs');
+        if (labsSetting) {
+            labsSetting.value = JSON.stringify(this.labs.getAll());
+        }
+
+        return settings;
+    }
 }
 
 module.exports = SettingsBREADService;

package/core/server/web/admin/views/default-prod.html

@@ -60,7 +60,7 @@
 
 
                 <script src="assets/vendor.min-af502ac4142871500fc424f6a5a254ec.js"></script>
-                <script src="assets/ghost.min-26e427944e719b616b8dc7fbb3bbd2f9.js"></script>
+                <script src="assets/ghost.min-07b6a50c54b3e2e190332c28c7255d2f.js"></script>
             
 </body>
 </html>

package/core/server/web/admin/views/default.html

@@ -60,7 +60,7 @@
 
 
                 <script src="assets/vendor.min-af502ac4142871500fc424f6a5a254ec.js"></script>
-                <script src="assets/ghost.min-26e427944e719b616b8dc7fbb3bbd2f9.js"></script>
+                <script src="assets/ghost.min-07b6a50c54b3e2e190332c28c7255d2f.js"></script>
             
 </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.20.0",
+  "version": "4.20.4",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -62,7 +62,7 @@
     "@tryghost/color-utils": "0.1.2",
     "@tryghost/config-url-helpers": "0.1.3",
     "@tryghost/constants": "0.1.12",
-    "@tryghost/custom-theme-settings-service": "0.3.0",
+    "@tryghost/custom-theme-settings-service": "0.3.1",
     "@tryghost/debug": "0.1.9",
     "@tryghost/email-analytics-provider-mailgun": "1.0.4",
     "@tryghost/email-analytics-service": "1.0.3",
@@ -128,7 +128,7 @@
     "ghost-storage-base": "0.0.6",
     "glob": "7.2.0",
     "got": "9.6.0",
-    "gscan": "4.9.0",
+    "gscan": "4.9.3",
     "html-to-text": "5.1.1",
     "image-size": "1.0.0",
     "intl": "1.2.5",
@@ -158,7 +158,7 @@
     "mysql": "2.18.1",
     "nconf": "0.11.3",
     "node-jose": "2.0.0",
-    "oembed-parser": "1.4.8",
+    "oembed-parser": "1.4.9",
     "passport": "0.5.0",
     "passport-google-oauth": "2.0.0",
     "path-match": "1.2.4",

package/yarn.lock

@@ -1270,10 +1270,10 @@
   resolved "https://registry.yarnpkg.com/@tryghost/constants/-/constants-0.1.12.tgz#17efd5dbb5d0bfbf11de1ceaaed347d165e63b1f"
   integrity sha512-nQPov2XnfnWxMf330JVLRGUJUqupgvBGWrUU31GJYQRTheKS0N6DSBCKJaO0euGEsWfvJ+BsWVbAJp0vxsUDzg==
 
-"@tryghost/custom-theme-settings-service@0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/custom-theme-settings-service/-/custom-theme-settings-service-0.3.0.tgz#dfe937666c4eb9b134d78d2d1a6bb95def6004f5"
-  integrity sha512-iNy9Bv/u76R1uMNcCpxfU9uWESi/cqZRPXh1uAFctBDijlI7yMkZvWIAvTn3DOplg3gMeq3xkGhL+0fNY20p9A==
+"@tryghost/custom-theme-settings-service@0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/custom-theme-settings-service/-/custom-theme-settings-service-0.3.1.tgz#46de63a136775a4124e8593d295bc61f3d852674"
+  integrity sha512-2Qum40bKQGV2Lt8kcRtVDjacZsNtkQf+iAqohZ8e7RHWsjuYSlOTsH/lF5epBDusDkTSqd+21Npfef5VT1IfyA==
   dependencies:
     "@tryghost/debug" "^0.1.5"
     "@tryghost/errors" "^0.2.14"
@@ -1671,10 +1671,10 @@
     fs-extra "^10.0.0"
     lodash "^4.17.21"
 
-"@tryghost/pretty-cli@1.2.21":
-  version "1.2.21"
-  resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.21.tgz#abd9c01e80325a624b68d2605ad3c4e73993ea82"
-  integrity sha512-hmFqacvmAtCWxMz5vUTw0tSGDs89+0tRIeVSdL4WjFsZnc8WoDgj0wUi3YLxp0VI4uaVyhCAZxOOBlYwqNdcQg==
+"@tryghost/pretty-cli@1.2.22":
+  version "1.2.22"
+  resolved "https://registry.yarnpkg.com/@tryghost/pretty-cli/-/pretty-cli-1.2.22.tgz#dfc3356c842569003f5e0cd6114b3811c2a4911b"
+  integrity sha512-y5k/bT3zhuYGDbPUNcgAPt9OSk4rZjtEjIjrqbo1nES14kp66uq+aLldqPyMAR/1a17AFnwMEiEZwkRL3KSAhQ==
   dependencies:
     chalk "^4.1.0"
     sywac "^1.3.0"
@@ -1839,16 +1839,6 @@
   resolved "https://registry.yarnpkg.com/@tryghost/vhost-middleware/-/vhost-middleware-1.0.19.tgz#8988196fee745353aa4ca4393874bc0b236429d4"
   integrity sha512-wZU1mmPlomSQK2Z0Y0GT8oGm8XsOQZhn39J1cr/ULBWf/JmQTTMRkAxeeARFvvN3u6b+/RlJAaO6OdLkk0dROQ==
 
-"@tryghost/zip@1.1.17":
-  version "1.1.17"
-  resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.17.tgz#8665655fbbde0f421180d012ca7769bd133a7482"
-  integrity sha512-ZyjJsQaVSBUqsJ3iBU9hV6G1P7kTSfi83u+g26ZcSjfx4y3FvpYiDbCc2WTKj5xDS0p3NbQ7ZVOi6E73oXVlDg==
-  dependencies:
-    archiver "^4.0.2"
-    bluebird "^3.7.2"
-    extract-zip "2.0.1"
-    fs-extra "^9.1.0"
-
 "@tryghost/zip@1.1.18":
   version "1.1.18"
   resolved "https://registry.yarnpkg.com/@tryghost/zip/-/zip-1.1.18.tgz#1afcf07d1c5404ab38bc42ef9b400eafc4052edc"
@@ -5533,14 +5523,14 @@ grunt@1.4.1:
     nopt "~3.0.6"
     rimraf "~3.0.2"
 
-gscan@4.9.0:
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.9.0.tgz#1e9c7aeb1cced58c5e9006b0a969908bd6395f78"
-  integrity sha512-4aaQ5rd3vqlqzhCSpf1EtuMqD7CA31LBjKWLqMeOzZJF4hr9Ngxayxix5tZeVT4gn2gQqPMyXhFxARc/0g1FgA==
+gscan@4.9.3:
+  version "4.9.3"
+  resolved "https://registry.yarnpkg.com/gscan/-/gscan-4.9.3.tgz#2f7674f11ee2bf8a4805210c24b72264df480d32"
+  integrity sha512-+iMshoaR7RJB/+IRJ984BCtkyerQ8Lgf7OoJzM0xdYsXM8jgVUN5Zrrn0SD/XQsNycDLABtG4A2cxBhkFRKPiQ==
   dependencies:
     "@sentry/node" "6.13.3"
-    "@tryghost/pretty-cli" "1.2.21"
-    "@tryghost/zip" "1.1.17"
+    "@tryghost/pretty-cli" "1.2.22"
+    "@tryghost/zip" "1.1.18"
     bluebird "3.7.2"
     chalk "4.1.2"
     common-tags "1.8.0"
@@ -8446,10 +8436,10 @@ object.pick@^1.2.0, object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-oembed-parser@1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/oembed-parser/-/oembed-parser-1.4.8.tgz#a7961756358db0121c9bea1d66df889f9839f08f"
-  integrity sha512-9CKgXRcxg2geW/SgMJDHLZ/CTAfvdQNcBmbEvBkYX3CxvE/DFR2f/bW/PCmDWBonJ4bIJnN+dKJ46ZO+VFwNeQ==
+oembed-parser@1.4.9:
+  version "1.4.9"
+  resolved "https://registry.yarnpkg.com/oembed-parser/-/oembed-parser-1.4.9.tgz#d23127c96185dfa2d998b8567e6c7df164f3d824"
+  integrity sha512-RCOjuv20IMm9XekZB1ZefdYPc+x5qe8IyCeY/xcN71I2z70vQl+L420eI5Mjyy/NQFLv+QPEgj/aYh1vptO83w==
   dependencies:
     cross-fetch "^3.1.4"