ghost 5.56.1 → 5.57.0

package/core/built/admin/index.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%22cdnUrl%22%3A%22%22%2C%22rootURL%22%3A%22%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%225.56%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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%22cdnUrl%22%3A%22%22%2C%22rootURL%22%3A%22%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%225.57%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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" />
@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-16709e2a05d1300febb44b2e8f759976.js"></script>
 <script src="assets/chunk.757.ada6ed049fa8078cd416.js"></script>
-<script src="assets/chunk.143.c1167d2f8be23689e40b.js"></script>
-    <script src="assets/ghost-9081d01d86c90563530801b2304e1f1a.js"></script>
+<script src="assets/chunk.143.969cc9d1b97fdcbbed73.js"></script>
+    <script src="assets/ghost-45d3545b6462f7507da89cdc682ee99e.js"></script>
 </body>
 </html>

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

@@ -3,6 +3,7 @@ const BACKUP_TABLES = [
     'actions',
     'api_keys',
     'brute',
+    'donation_payment_events',
     'emails',
     'integrations',
     'invites',

package/core/server/data/migrations/versions/5.57/2023-07-26-12-44-stripe-products-nullable-product.js

@@ -0,0 +1,4 @@
+const {createSetNullableMigration} = require('../../utils');
+
+// We need to disable foreign key checks because if MySQL is missing the STRICT_TRANS_TABLES mode, we cannot revert the migration
+module.exports = createSetNullableMigration('stripe_products', 'product_id', {disableForeignKeyChecks: true});

package/core/server/data/migrations/versions/5.57/2023-07-27-11-47-49-create-donation-events.js

@@ -0,0 +1,19 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const {addTable} = require('../../utils');
+
+module.exports = addTable('donation_payment_events', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    name: {type: 'string', maxlength: 191, nullable: true},
+    email: {type: 'string', maxlength: 191, nullable: false, unique: false},
+    member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
+    amount: {type: 'integer', nullable: false},
+    currency: {type: 'string', maxlength: 50, nullable: false},
+    attribution_id: {type: 'string', maxlength: 24, nullable: true},
+    attribution_type: {type: 'string', maxlength: 50, nullable: true},
+    attribution_url: {type: 'string', maxlength: 2000, nullable: true},
+    referrer_source: {type: 'string', maxlength: 191, nullable: true},
+    referrer_medium: {type: 'string', maxlength: 191, nullable: true},
+    referrer_url: {type: 'string', maxlength: 2000, nullable: true},
+    created_at: {type: 'dateTime', nullable: false}
+});

package/core/server/data/schema/schema.js

@@ -738,9 +738,28 @@ module.exports = {
         },
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id', cascadeDelete: false}
     },
+    donation_payment_events: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        name: {type: 'string', maxlength: 191, nullable: true},
+        email: {type: 'string', maxlength: 191, nullable: false, unique: false, validations: {isEmail: true}},
+        member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
+        amount: {type: 'integer', nullable: false},
+        currency: {type: 'string', maxlength: 50, nullable: false},
+        attribution_id: {type: 'string', maxlength: 24, nullable: true},
+        attribution_type: {
+            type: 'string', maxlength: 50, nullable: true, validations: {
+                isIn: [['url', 'post', 'page', 'author', 'tag']]
+            }
+        },
+        attribution_url: {type: 'string', maxlength: 2000, nullable: true},
+        referrer_source: {type: 'string', maxlength: 191, nullable: true},
+        referrer_medium: {type: 'string', maxlength: 191, nullable: true},
+        referrer_url: {type: 'string', maxlength: 2000, nullable: true},
+        created_at: {type: 'dateTime', nullable: false}
+    },
     stripe_products: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        product_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'products.id'},
+        product_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'products.id'},
         stripe_product_id: {type: 'string', maxlength: 255, nullable: false, unique: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true}
@@ -755,7 +774,7 @@ module.exports = {
         // so we should decide whether we should reduce it down in the future
         currency: {type: 'string', maxlength: 191, nullable: false},
         amount: {type: 'integer', nullable: false},
-        type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'recurring', validations: {isIn: [['recurring', 'one_time']]}},
+        type: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'recurring', validations: {isIn: [['recurring', 'one_time', 'donation']]}},
         interval: {type: 'string', maxlength: 50, nullable: true},
         description: {type: 'string', maxlength: 191, nullable: true},
         created_at: {type: 'dateTime', nullable: false},

package/core/server/models/donation-payment-event.js

@@ -0,0 +1,34 @@
+const errors = require('@tryghost/errors');
+const ghostBookshelf = require('./base');
+
+const DonationPaymentEvent = ghostBookshelf.Model.extend({
+    tableName: 'donation_payment_events',
+
+    member() {
+        return this.belongsTo('Member', 'member_id', 'id');
+    },
+
+    postAttribution() {
+        return this.belongsTo('Post', 'attribution_id', 'id');
+    },
+
+    userAttribution() {
+        return this.belongsTo('User', 'attribution_id', 'id');
+    },
+
+    tagAttribution() {
+        return this.belongsTo('Tag', 'attribution_id', 'id');
+    }
+}, {
+    async edit() {
+        throw new errors.IncorrectUsageError({message: 'Cannot edit DonationPaymentEvent'});
+    },
+
+    async destroy() {
+        throw new errors.IncorrectUsageError({message: 'Cannot destroy DonationPaymentEvent'});
+    }
+});
+
+module.exports = {
+    DonationPaymentEvent: ghostBookshelf.model('DonationPaymentEvent', DonationPaymentEvent)
+};

package/core/server/services/donations/DonationServiceWrapper.js

@@ -0,0 +1,19 @@
+const {DonationPaymentEvent: DonationPaymentEventModel} = require('../../models');
+
+class DonationServiceWrapper {
+    repository;
+
+    init() {
+        if (this.repository) {
+            return;
+        }
+
+        const {DonationBookshelfRepository} = require('@tryghost/donations');
+
+        this.repository = new DonationBookshelfRepository({
+            DonationPaymentEventModel
+        });
+    }
+}
+
+module.exports = DonationServiceWrapper;

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

@@ -0,0 +1,3 @@
+const DonationServiceWrapper = require('./DonationServiceWrapper');
+
+module.exports = new DonationServiceWrapper();

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

@@ -214,7 +214,8 @@ function createApiInstance(config) {
         labsService: labsService,
         newslettersService: newslettersService,
         memberAttributionService: memberAttributionService.service,
-        emailSuppressionList
+        emailSuppressionList,
+        settingsCache
     });
 
     return membersApiInstance;

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

@@ -258,20 +258,28 @@ const createSessionFromMagicLink = async function (req, res, next) {
             }
         }
 
-        if (action === 'signin') {
-            const referrer = req.query.r;
-            const siteUrl = urlUtils.getSiteUrl();
+        // If a custom referrer/redirect was passed, redirect the user to that URL
+        const referrer = req.query.r;
+        const siteUrl = urlUtils.getSiteUrl();
 
-            if (referrer && referrer.startsWith(siteUrl)) {
-                const redirectUrl = new URL(referrer);
-                redirectUrl.searchParams.set('success', true);
+        if (referrer && referrer.startsWith(siteUrl)) {
+            const redirectUrl = new URL(referrer);
+
+            // Copy search params
+            searchParams.forEach((value, key) => {
+                redirectUrl.searchParams.set(key, value);
+            });
+            redirectUrl.searchParams.set('success', 'true');
+
+            if (action === 'signin') {
+                // Not sure if we can delete this, this is a legacy param
                 redirectUrl.searchParams.set('action', 'signin');
-                return res.redirect(redirectUrl.href);
             }
+            return res.redirect(redirectUrl.href);
         }
 
         // Do a standard 302 redirect to the homepage, with success=true
-        searchParams.set('success', true);
+        searchParams.set('success', 'true');
         res.redirect(`${urlUtils.getSubdir()}/?${searchParams.toString()}`);
     } catch (err) {
         logging.warn(err.message);

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

@@ -9,6 +9,7 @@ const events = require('../../lib/common/events');
 const models = require('../../models');
 const {getConfig} = require('./config');
 const settingsHelpers = require('../settings-helpers');
+const donationService = require('../donations');
 
 async function configureApi() {
     const cfg = getConfig({settingsHelpers, config, urlUtils});
@@ -54,7 +55,8 @@ module.exports = new StripeService({
                 value: data.secret
             }]);
         }
-    }
+    },
+    donationService
 });
 
 module.exports.init = async function init() {

package/core/shared/labs.js

@@ -38,7 +38,6 @@ const ALPHA_FEATURES = [
     'emailCustomization',
     'collections',
     'adminXSettings',
-    'pageImprovements',
     'flatUrls',
     'mailEvents',
     'collectionsCard',