ghost 4.47.4 → 4.48.2

package/core/built/assets/{ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js → ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js}

@@ -4354,6 +4354,6 @@ var i=t.default.create({properties:["name","event","targetUrl"],name(e){Ember.is
 e.default=i})),define("ghost-admin/views/application",["exports"],(function(e){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 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(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.47",name:"ghost-admin"})
+return Object.defineProperty(n,"__esModule",{value:!0}),n}catch(i){throw new Error('Could not read config from meta tag with name "'+e+'".')}})),runningTests||require("ghost-admin/app").default.create({version:"4.48",name:"ghost-admin"})
 
-//# sourceMappingURL=ghost.min-a2a47979b0b61d15a3914042a7b1cd20.map
+//# sourceMappingURL=ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.map

package/core/frontend/helpers/date.js

@@ -45,7 +45,9 @@ module.exports = function (...attrs) {
     // i18n: Making dates, including month names, translatable to any language.
     // Documentation: http://momentjs.com/docs/#/i18n/
     // Locales: https://github.com/moment/moment/tree/develop/locale
-    dateMoment.locale(locale);
+    if (locale && locale.match('^[^/\\\\]*$') !== null) {
+        dateMoment.locale(locale);
+    }
 
     if (timeago) {
         date = dateMoment.tz(timezone).from(timeNow);

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

@@ -5,7 +5,6 @@ const moment = require('moment-timezone');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
 const membersService = require('../../services/members');
-const labsService = require('../../../shared/labs');
 
 const settingsCache = require('../../../shared/settings-cache');
 const tpl = require('@tryghost/tpl');
@@ -362,16 +361,9 @@ module.exports = {
         },
         validation: {},
         async query(frame) {
-            frame.options.withRelated = ['labels', 'stripeSubscriptions', 'stripeSubscriptions.customer'];
-            if (labsService.isSet('multipleProducts')) {
-                frame.options.withRelated.push('products');
-            }
-            if (labsService.isSet('multipleNewsletters')) {
-                frame.options.withRelated.push('newsletters');
-            }
-            const page = await membersService.api.members.list(frame.options);
-
-            return page;
+            return {
+                data: await membersService.export(frame.options)
+            };
         }
     },
 

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

@@ -79,18 +79,13 @@ function bulkAction(bulkActionResult, _apiConfig, frame) {
 /**
  * @template PageMeta
  *
- * @param {{data: import('bookshelf').Model[], meta: PageMeta}} page
- * @param {APIConfig} _apiConfig
- * @param {Frame} frame
+ * @param {{data: any[]}} data
  *
  * @returns {string} - A CSV string
  */
-function exportCSV(page, _apiConfig, frame) {
+function exportCSV(data) {
     debug('exportCSV');
-
-    const members = page.data.map(model => serializeMember(model, frame.options));
-
-    return unparse(members);
+    return unparse(data.data);
 }
 
 /**

package/core/server/data/exporter/index.js

@@ -1,5 +1,8 @@
+const {BACKUP_TABLES, TABLES_ALLOWLIST} = require('./table-lists');
+
 module.exports = {
     doExport: require('./exporter'),
     fileName: require('./export-filename'),
-    BACKUP_TABLES: require('./table-lists').BACKUP_TABLES
+    BACKUP_TABLES,
+    TABLES_ALLOWLIST
 };

package/core/server/data/exporter/table-lists.js

@@ -10,25 +10,17 @@ const BACKUP_TABLES = [
     'members',
     'members_labels',
     'members_products',
-    'posts_products',
     'members_stripe_customers',
     'members_stripe_customers_subscriptions',
     'migrations',
     'migrations_lock',
-    'newsletters',
     'oauth',
     'permissions',
     'permissions_roles',
     'permissions_users',
-    'products',
-    'benefits',
-    'products_benefits',
     'webhooks',
-    'snippets',
     'tokens',
     'sessions',
-    'stripe_products',
-    'stripe_prices',
     'mobiledoc_revisions',
     'email_batches',
     'email_recipients',
@@ -40,9 +32,8 @@ const BACKUP_TABLES = [
     'members_paid_subscription_events',
     'members_subscribe_events',
     'members_product_events',
-    'members_newsletters',
-    'offers',
-    'offer_redemptions'
+    'members_newsletters'
+
 ];
 
 // NOTE: exposing only tables which are going to be included in a "default" export file
@@ -58,7 +49,17 @@ const TABLES_ALLOWLIST = [
     'settings',
     'custom_theme_settings',
     'tags',
-    'users'
+    'users',
+    'products',
+    'stripe_products',
+    'stripe_prices',
+    'posts_products',
+    'newsletters',
+    'benefits',
+    'products_benefits',
+    'offers',
+    'offer_redemptions',
+    'snippets'
 ];
 
 // NOTE: these are settings keys which should never end up in the export file

package/core/server/services/members/exporter/query.js

@@ -0,0 +1,88 @@
+const models = require('../../../models');
+const {knex} = require('../../../data/db');
+const moment = require('moment');
+
+module.exports = async function (options) {
+    const hasFilter = options.limit !== 'all' || options.filter || options.search;
+
+    let ids = null;
+    if (hasFilter) {
+        // do a very minimal query, only to fetch the ids of the filtered values
+        // should be quite fast
+        options.withRelated = [];
+        options.columns = ['id'];
+
+        const page = await models.Member.findPage(options);
+        ids = page.data.map(d => d.id);
+
+        /*
+        const filterOptions = _.pick(options, ['transacting', 'context']);
+
+        if (all !== true) {
+            // Include mongoTransformer to apply subscribed:{true|false} => newsletter relation mapping
+            Object.assign(filterOptions, _.pick(options, ['filter', 'search', 'mongoTransformer']));
+        }
+        
+        const memberRows = await models.Member.getFilteredCollectionQuery(filterOptions)
+            .select('members.id')
+            .distinct();
+
+        ids = memberRows.map(row => row.id);
+        */
+    }
+
+    const allProducts = await models.Product.fetchAll();
+    const allLabels = await models.Label.fetchAll();
+
+    let query = knex('members')
+        .select('id', 'email', 'name', 'note', 'status', 'created_at')
+        .select(knex.raw(`
+            (CASE WHEN EXISTS (SELECT 1 FROM members_newsletters n WHERE n.member_id = members.id)
+                    THEN TRUE ELSE FALSE
+            END) as subscribed
+        `))
+        .select(knex.raw(`
+            (SELECT GROUP_CONCAT(product_id) FROM members_products f WHERE f.member_id = members.id) as products
+        `))
+        .select(knex.raw(`
+            (SELECT GROUP_CONCAT(label_id) FROM members_labels f WHERE f.member_id = members.id) as labels
+        `))
+        .select(knex.raw(`
+            (SELECT customer_id FROM members_stripe_customers f WHERE f.member_id = members.id limit 1) as stripe_customer_id
+        `));
+
+    if (hasFilter) {
+        query = query.whereIn('id', ids);
+    }
+
+    const rows = await query;
+    for (const row of rows) {
+        const productIds = row.products ? row.products.split(',') : [];
+        const products = productIds.map((id) => {
+            const product = allProducts.find(p => p.id === id);
+            return {
+                name: product.get('name')
+            };
+        });
+        row.products = products;
+
+        const labelIds = row.labels ? row.labels.split(',') : [];
+        const labels = labelIds.map((id) => {
+            const label = allLabels.find(l => l.id === id);
+            return {
+                name: label.get('name')
+            };
+        });
+        row.labels = labels;
+    }
+
+    for (const member of rows) {
+        // Note: we don't modify the array or change/duplicate objects
+        // to increase performance
+        member.subscribed = !!member.subscribed;
+        member.comped = member.status === 'comped';
+        member.created_at = moment(member.created_at).toISOString();
+    }
+
+    return rows;
+};

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

@@ -202,7 +202,7 @@ module.exports = {
 
     processImport: processImport,
 
-    stats: membersStats
-
+    stats: membersStats,
+    export: require('./exporter/query')
 };
 module.exports.middleware = require('./middleware');

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.47%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.48%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" />
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js"></script>
+                <script src="assets/ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.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.47%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.48%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" />
@@ -57,7 +57,7 @@
 
 
                 <script src="assets/vendor.min-97fd438f4772c5ec6bb30ad779b8530e.js"></script>
-                <script src="assets/ghost.min-a2a47979b0b61d15a3914042a7b1cd20.js"></script>
+                <script src="assets/ghost.min-10ba0de3ecb93d63d62bb43ac11c740f.js"></script>
             
 </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "4.47.4",
+  "version": "4.48.2",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -152,8 +152,8 @@
     "jsonwebtoken": "8.5.1",
     "juice": "8.0.0",
     "keypair": "1.0.4",
-    "knex": "2.0.0",
-    "knex-migrator": "4.2.8",
+    "knex": "2.1.0",
+    "knex-migrator": "4.2.11",
     "lodash": "4.17.21",
     "luxon": "2.3.2",
     "mailgun-js": "0.22.0",

package/yarn.lock

@@ -1876,6 +1876,11 @@
   resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.3.tgz#dbe27b1fd8d97d5ac4a867eb0accd6d7229048b0"
   integrity sha512-nEJYo2RLS7FJoXIaWWpgT3h6N/4FsTtAz2Wm5wvMxk6dVx8LKbZ0D25H069IsrVqqEItJ9kBYcCLmv+6qoPSmw==
 
+"@tryghost/database-info@0.3.5":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@tryghost/database-info/-/database-info-0.3.5.tgz#81b77dc976142a8bbbec81f58d56e89c05a1ecdc"
+  integrity sha512-pRWpmQmdg/KOQdkEHDpOAwYvNNc4nrhQ5X8HEVmvqC5ALEKMS6ghKavQGXSnCfUn6Bu8+GXEZ789mE7YOk32jQ==
+
 "@tryghost/debug@0.1.11":
   version "0.1.11"
   resolved "https://registry.yarnpkg.com/@tryghost/debug/-/debug-0.1.11.tgz#cc21e55ac610190426c366a7c69067c5d53117ad"
@@ -8061,31 +8066,31 @@ kind-of@^6.0.0, kind-of@^6.0.2:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-knex-migrator@4.2.8:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-4.2.8.tgz#ef797def311f265ca4bc873494d711ce75469da2"
-  integrity sha512-KUMS9DU95pE56w+8NOSZlQKYeSgW/7XqWQnzviyDhejGEbYqXw2IHWQWat8asqs4WWZLregWeqoL8L0KcYAljQ==
+knex-migrator@4.2.11:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/knex-migrator/-/knex-migrator-4.2.11.tgz#8e80098039f92210840f9932a024b13db7322bbb"
+  integrity sha512-eQDFuiF645g3qL9UyA2kl8V4oOJfn0Kn6o7vNXj/YA/3Z64BHBzw1syparYKzNhxkb+Cl/VepOXt+1wtaQSv+A==
   dependencies:
-    "@tryghost/database-info" "0.3.3"
+    "@tryghost/database-info" "0.3.5"
     "@tryghost/logging" "2.1.8"
     bluebird "3.7.2"
     commander "5.1.0"
     compare-ver "2.0.2"
     debug "4.3.4"
     ghost-ignition "4.6.3"
-    knex "2.0.0"
+    knex "2.1.0"
     lodash "4.17.21"
     moment "2.24.0"
     mysql2 "2.3.3"
     nconf "0.12.0"
     resolve "1.22.0"
   optionalDependencies:
-    sqlite3 "5.0.6"
+    sqlite3 "5.0.8"
 
-knex@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/knex/-/knex-2.0.0.tgz#84296ced7ef27e0f3b954302ac7d9da67c28b5d3"
-  integrity sha512-LchC8/GLfreMz8d4kCwh/ymXttsoJG8zO1O0AJBjnxdyr2oT/k2ik77hP1PpZkZH9mDQrq6WsQcIu18Pnqppzg==
+knex@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/knex/-/knex-2.1.0.tgz#9348aace3a08ff5be26eb1c8e838416ddf1aa216"
+  integrity sha512-vVsnD6UJdSJy55TvCXfFF9syfwyXNxfE9mvr2hJL/4Obciy2EPGoqjDpgRSlMruHuPWDOeYAG25nyrGvU+jJog==
   dependencies:
     colorette "2.0.16"
     commander "^9.1.0"
@@ -11599,6 +11604,17 @@ sqlite3@5.0.6:
   optionalDependencies:
     node-gyp "8.x"
 
+sqlite3@5.0.8:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/sqlite3/-/sqlite3-5.0.8.tgz#b4b7eab7156debec80866ef492e01165b4688272"
+  integrity sha512-f2ACsbSyb2D1qFFcqIXPfFscLtPVOWJr5GmUzYxf4W+0qelu5MWrR+FAQE1d5IUArEltBrzSDxDORG8P/IkqyQ==
+  dependencies:
+    "@mapbox/node-pre-gyp" "^1.0.0"
+    node-addon-api "^4.2.0"
+    tar "^6.1.11"
+  optionalDependencies:
+    node-gyp "8.x"
+
 sqlstring@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"