Add v3.31.4

core/server/models/member.js

@@ -209,9 +209,9 @@ const Member = ghostBookshelf.Model.extend({
                     this.on(
                         'members_stripe_customers.customer_id',
                         'members_stripe_customers_subscriptions.customer_id'
-                    ).andOn(
+                    ).onIn(
                         'members_stripe_customers_subscriptions.status',
-                        ghostBookshelf.knex.raw('?', ['active'])
+                        ['active', 'trialed']
                     );
                 }
             );

core/server/services/mega/mega.js

@@ -177,7 +177,8 @@ async function handleUnsubscribeRequest(req) {
     }
 
     try {
-        return await membersService.api.members.update({subscribed: false}, {id: member.id});
+        const memberModel = await membersService.api.members.update({subscribed: false}, {id: member.id});
+        return memberModel.toJSON();
     } catch (err) {
         throw new errors.InternalServerError({
             message: 'Failed to unsubscribe member'

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "3.31.3",
+  "version": "3.31.4",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",