diff --git a/core/server/public/members.js b/core/server/public/members.js index bec07224e8..7106ca2795 100644 --- a/core/server/public/members.js +++ b/core/server/public/members.js @@ -73,7 +73,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-plan]'), f errorEl.innerText = ''; } el.classList.add('loading'); - fetch('{{blog-url}}/members/ssr', { + fetch('{{blog-url}}/members/api/session', { credentials: 'same-origin' }).then(function (res) { if (!res.ok) { @@ -143,7 +143,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-edit-billi errorEl.innerText = ''; } el.classList.add('loading'); - fetch('{{blog-url}}/members/ssr', { + fetch('{{blog-url}}/members/api/session', { credentials: 'same-origin' }).then(function (res) { if (!res.ok) { @@ -151,7 +151,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-edit-billi } return res.text(); }).then(function (identity) { - return fetch('{{blog-url}}/members/api/create-stripe-setup-session/', { + return fetch('{{blog-url}}/members/api/create-stripe-update-session/', { method: 'POST', headers: { 'Content-Type': 'application/json' @@ -195,7 +195,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-signout]') event.preventDefault(); el.classList.remove('error'); el.classList.add('loading'); - fetch('{{blog-url}}/members/ssr', { + fetch('{{blog-url}}/members/api/session', { method: 'DELETE' }).then(function (res) { if (res.ok) { @@ -224,7 +224,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-cancel-sub errorEl.innerText = ''; } - return fetch('{{blog-url}}/members/ssr', { + return fetch('{{blog-url}}/members/api/session', { credentials: 'same-origin' }).then(function (res) { if (!res.ok) { @@ -274,7 +274,7 @@ Array.prototype.forEach.call(document.querySelectorAll('[data-members-continue-s errorEl.innerText = ''; } - return fetch('{{blog-url}}/members/ssr', { + return fetch('{{blog-url}}/members/api/session', { credentials: 'same-origin' }).then(function (res) { if (!res.ok) { diff --git a/core/server/public/members.min.js b/core/server/public/members.min.js index 51443ad146..8b86084c43 100644 --- a/core/server/public/members.min.js +++ b/core/server/public/members.min.js @@ -1 +1 @@ -Array.prototype.forEach.call(document.querySelectorAll("form[data-members-form]"),function(a){var c=a.querySelector("[data-members-error]");a.addEventListener("submit",function r(e){a.removeEventListener("submit",r),e.preventDefault(),c&&(c.innerText=""),a.classList.remove("success","invalid","error");for(var t=e.target.querySelector("input[data-members-email]").value,n=void 0,o=[],s=e.target.querySelectorAll("input[data-members-label]")||[],i=0;i membersService.api.middleware.sendMagicLink(req, res, next)); membersApp.post('/api/create-stripe-checkout-session', (req, res, next) => membersService.api.middleware.createCheckoutSession(req, res, next)); - membersApp.post('/api/create-stripe-setup-session', (req, res, next) => membersService.api.middleware.createCheckoutSetupSession(req, res, next)); + membersApp.post('/api/create-stripe-update-session', (req, res, next) => membersService.api.middleware.createCheckoutSetupSession(req, res, next)); membersApp.put('/api/subscriptions/:id', (req, res, next) => membersService.api.middleware.updateSubscription(req, res, next)); // API error handling diff --git a/test/frontend-acceptance/members_spec.js b/test/frontend-acceptance/members_spec.js index d015bd4640..abda23fdf1 100644 --- a/test/frontend-acceptance/members_spec.js +++ b/test/frontend-acceptance/members_spec.js @@ -45,23 +45,43 @@ describe('Basic Members Routes', function () { }); describe('Routes', function () { - it('should error when invalid member token is passed in to ssr', function () { - return request.get('/members/ssr') + it('should error serving webhook endpoint without any parameters', function () { + return request.post('/members/webhooks/stripe') + .expect(400); + }); + + it('should error when invalid member token is passed into session', function () { + return request.get('/members/api/session') .expect(400); }); it('should return no content when removing member sessions', function () { - return request.del('/members/ssr') + return request.del('/members/api/session') .expect(204); }); it('should error for invalid member token on member data endpoint', function () { - return request.get('/members/ssr/member') + return request.get('/members/api/member') .expect(400); }); - it('should error serving webhook endpoint without any parameters', function () { - return request.post('/members/webhooks/stripe') + it('should error for invalid data on member magic link endpoint', function () { + return request.post('/members/api/send-magic-link') + .expect(400); + }); + + it('should error for invalid data on members create checkout session endpoint', function () { + return request.post('/members/api/create-stripe-checkout-session') + .expect(400); + }); + + it('should error for invalid data on members create update session endpoint', function () { + return request.post('/members/api/create-stripe-update-session') + .expect(400); + }); + + it('should error for invalid data on members subscription endpoint', function () { + return request.put('/members/api/subscriptions/123') .expect(400); }); }); @@ -92,23 +112,43 @@ describe('Basic Members Routes', function () { }); describe('Routes', function () { - it('should not serve ssr endpoint', function () { - return request.get('/members/ssr') + it('should not serve webhook endpoint', function () { + return request.post('/members/webhooks/stripe') .expect(404); }); - it('should not serve ssr removal endpoint', function () { - return request.del('/members/ssr') + it('should not serve session endpoint', function () { + return request.get('/members/api/session') + .expect(404); + }); + + it('should not serve session removal endpoint', function () { + return request.del('/members/api/session') .expect(404); }); it('should not serve member data endpoint', function () { - return request.get('/members/ssr/member') + return request.get('/members/api/member') .expect(404); }); - it('should not serve webhook endpoint', function () { - return request.post('/members/webhooks/stripe') + it('should not serve member magic link endpoint', function () { + return request.post('/members/api/send-magic-link') + .expect(404); + }); + + it('should not serve members create checkout session endpoint', function () { + return request.post('/members/api/create-stripe-checkout-session') + .expect(404); + }); + + it('should not serve members create update session endpoint', function () { + return request.post('/members/api/create-stripe-update-session') + .expect(404); + }); + + it('should not serve members subscription endpoint', function () { + return request.put('/members/api/subscriptions/123') .expect(404); }); });