From 87e8298ca74f1183de033c4c2d5725fc966f0f41 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Fri, 21 Aug 2020 15:14:37 +0530
Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20unable=20to=20delete?=
 =?UTF-8?q?=20member=20when=20stripe=20is=20connected?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/TryGhost/Ghost/issues/12150

- The `destroy` method on members-api method was called incorrectly with not enough params
- It expects both `data` and `options` passed down [here](https://github.com/TryGhost/Members/blob/master/packages/members-api/lib/users.js#L14)
- Missing `options` in method call throws error as we read `cancelStripeSubscriptions` property on options if stripe is connected
- Fix passes both data and options to the destroy method
---
 core/server/api/canary/members.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/core/server/api/canary/members.js b/core/server/api/canary/members.js
index 020492d6f8..cc17e4006e 100644
--- a/core/server/api/canary/members.js
+++ b/core/server/api/canary/members.js
@@ -385,14 +385,15 @@ module.exports = {
             frame.options.require = true;
             frame.options.cancelStripeSubscriptions = frame.options.cancel;
 
-            await Promise.resolve(membersService.api.members.destroy(frame.options))
-                .catch(models.Member.NotFoundError, () => {
-                    throw new errors.NotFoundError({
-                        message: i18n.t('errors.api.resource.resourceNotFound', {
-                            resource: 'Member'
-                        })
-                    });
+            await Promise.resolve(membersService.api.members.destroy({
+                id: frame.options.id
+            }, frame.options)).catch(models.Member.NotFoundError, () => {
+                throw new errors.NotFoundError({
+                    message: i18n.t('errors.api.resource.resourceNotFound', {
+                        resource: 'Member'
+                    })
                 });
+            });
 
             return null;
         }

From acd34c9bcb598ef560b5ae476909c5e8b25246e5 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Fri, 21 Aug 2020 16:18:01 +0530
Subject: [PATCH 2/3] Bumbed @tryghost/members-api to 0.28.1

refs https://github.com/TryGhost/Ghost/issues/12150

- Fixes incorrect stripe cancellation method for member `destroy` call
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c917d004b0..ede738c1df 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "@tryghost/kg-markdown-html-renderer": "2.0.2",
     "@tryghost/kg-mobiledoc-html-renderer": "3.0.1",
     "@tryghost/magic-link": "0.4.13",
-    "@tryghost/members-api": "0.27.2",
+    "@tryghost/members-api": "0.28.1",
     "@tryghost/members-csv": "0.3.0",
     "@tryghost/members-ssr": "0.8.5",
     "@tryghost/mw-session-from-token": "0.1.7",

From 7177da6a4e39a3ef3fe0bcbf0ed922e4f7594734 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Fri, 21 Aug 2020 16:23:37 +0530
Subject: [PATCH 3/3] Bumped @tryghost/members-api to 0.28.1 in lockfile

refs https://github.com/TryGhost/Ghost/issues/12150

- Adds the updated lockfile for previous commit which bumps members-api to 0.28.1
---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4b6f4bb799..07e44968eb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -495,10 +495,10 @@
     jsonwebtoken "^8.5.1"
     lodash "^4.17.15"
 
-"@tryghost/members-api@0.27.2":
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-api/-/members-api-0.27.2.tgz#ada8ca87fb930318f9bd4fa0301faf7189421348"
-  integrity sha512-tcUHHUXW7i9Nx8RTuDkB8mS8DAxNrSrV8qzJZuSdZbqgrlXSK2udnqv4oimppmkmQWPz7VfLoY9vdE7GW4S0Bg==
+"@tryghost/members-api@0.28.1":
+  version "0.28.1"
+  resolved "https://registry.npmjs.org/@tryghost/members-api/-/members-api-0.28.1.tgz#508ad5883cb1772194297beb693924d5592097cc"
+  integrity sha512-yy1wLZlb12to2QisnBfwUmUBEefDJ9pd7s1eDqpjJmE/FhSApUgHpKcGgKI+tEUkqfcfmCP/+0FbvJD15Rpyqg==
   dependencies:
     "@tryghost/magic-link" "^0.4.13"
     bluebird "^3.5.4"