Updated members-theme-bindings & public/members.js

no-issue

This updates Ghost to inject the exact urls we want to use for both the
static members pages and the ssr endpoints we've configured for the
frontend. This allows us to changes these without having to update the
members repository, and gives a cleaner split between the two.

core/server/public/members-theme-bindings.js

@@ -778,8 +778,10 @@ var each = require('lodash/each');
 var browserAuth = require('@tryghost/members-browser-auth');
 module.exports.init = init;
 function init($__0) {
-  var siteUrl = $__0.siteUrl;
-  var auth = browserAuth({membersUrl: siteUrl + '/members'});
+  var $__1 = $__0,
+      membersUrl = $__1.membersUrl,
+      ssrUrl = $__1.ssrUrl;
+  var auth = browserAuth({membersUrl: membersUrl});
   var $__2 = window.location.hash.match(/^#([^?]+)\??(.*)$/) || [],
       hashMatch = $__2[0],
       hash = $__2[1],
@@ -797,21 +799,21 @@ function init($__0) {
   }
   auth.on('signedin', function() {
     auth.getSSRToken({fresh: true}).then(function(token) {
-      createSession(token);
+      createSession(token, ssrUrl);
     });
   });
   auth.on('signedout', function() {
     destroySession();
   });
   function signout() {
     auth.signout().then((function() {
-      return destroySession();
+      return destroySession(ssrUrl);
     })).then(reload);
   }
   function signin() {
     auth.signin().then((function() {
       return auth.getSSRToken({fresh: true}).then(function(token) {
-        return createSession(token);
+        return createSession(token, ssrUrl);
       });
     })).then(reload);
   }
@@ -821,14 +823,14 @@ function init($__0) {
         coupon = ($__6 = $__5.coupon) === void 0 ? '' : $__6;
     auth.signup({coupon: coupon}).then((function() {
       return auth.getSSRToken({fresh: true}).then(function(token) {
-        return createSession(token);
+        return createSession(token, ssrUrl);
       });
     })).then(reload);
   }
   function upgrade() {
     auth.upgrade().then((function() {
       return auth.getSSRToken({fresh: true}).then(function(token) {
-        return createSession(token);
+        return createSession(token, ssrUrl);
       });
     })).then(reload);
   }
@@ -867,17 +869,17 @@ function reload(success) {
     window.location.reload();
   }
 }
-function createSession(token) {
-  return fetch('/members/ssr', {
+function createSession(token, ssrUrl) {
+  return fetch(ssrUrl, {
     method: 'post',
     credentials: 'include',
     body: token
   }).then(function(res) {
     return !!res.ok;
   });
 }
-function destroySession() {
-  return fetch('/members/ssr', {method: 'delete'}).then(function(res) {
+function destroySession(ssrUrl) {
+  return fetch(ssrUrl, {method: 'delete'}).then(function(res) {
     return !!res.ok;
   });
 }

core/server/public/members.js

@@ -1 +1 @@
-MembersThemeBindings.init({siteUrl: "{{blog-url}}"});
+MembersThemeBindings.init({ssrUrl: "{{blog-url}}/members/ssr", membersUrl: "{{blog-url}}/members"});

package.json

@@ -44,7 +44,7 @@
     "@tryghost/members-api": "0.1.1",
     "@tryghost/members-auth-pages": "0.2.1",
     "@tryghost/members-ssr": "0.1.5",
-    "@tryghost/members-theme-bindings": "^0.1.0",
+    "@tryghost/members-theme-bindings": "0.2.1",
     "@tryghost/social-urls": "0.1.0",
     "@tryghost/string": "^0.1.3",
     "@tryghost/url-utils": "0.1.2",

yarn.lock

@@ -156,28 +156,28 @@
     preact-compat "^3.17.0"
     react-stripe-elements "^2.0.3"
 
-"@tryghost/members-browser-auth@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-browser-auth/-/members-browser-auth-0.1.1.tgz#f68fcca2b551c3af1dcdc78ed00c75df7456d943"
-  integrity sha512-RwhZxEUgVcZFrTZPnPdTSypkdSxgsnfx3/NZ+ZyLxgS2HuyI3ApQb8m/thwdUDu//LZrmlIvVryXu3eV3JzKNg==
+"@tryghost/members-browser-auth@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-browser-auth/-/members-browser-auth-0.1.2.tgz#49a9346ce2c44e27cc7b58fe354941c865051a63"
+  integrity sha512-9Fa0C1iCBdp7BAPSR1GZrNS5ke2ynSLkJED82uZ2tPZqD5saRMwHSPMnoLJJwOvwLLSEWtnAvijXzsKiDael1w==
   dependencies:
-    "@tryghost/members-gateway-api" "^0.1.2"
+    "@tryghost/members-gateway-api" "^0.1.3"
     bluebird "^3.5.4"
     ghost-ignition "^3.1.0"
     lodash "^4.17.11"
 
-"@tryghost/members-gateway-api@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-gateway-api/-/members-gateway-api-0.1.2.tgz#7955ccfe096834283fe219d37ec13cb616a38c9e"
-  integrity sha512-ZLlinu5+e5mIrBFRTzB7+0LaNYomc+rogEuqxS4gFzQAn9Qh23U+82c8JSVlnL33o4rQb077gl3rx8dqWIU+LQ==
+"@tryghost/members-gateway-api@^0.1.3":
+  version "0.1.3"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-gateway-api/-/members-gateway-api-0.1.3.tgz#c0f30534a821c566c69a39849449d5bc61409d7b"
+  integrity sha512-aWXPguGvGSA+Ly0j4C76bDPqsMe/Nzq8O8ytXrWdVmEhh7eXU631swGwrb3rCc8VHOSQvNUn6xPtx6+AMWPXVQ==
   dependencies:
-    "@tryghost/members-gateway-protocol" "^0.1.1"
+    "@tryghost/members-gateway-protocol" "^0.1.2"
     bluebird "^3.5.4"
     ghost-ignition "^3.1.0"
     lodash "^4.17.11"
     minivents "^2.2.0"
 
-"@tryghost/members-gateway-protocol@^0.1.0", "@tryghost/members-gateway-protocol@^0.1.1":
+"@tryghost/members-gateway-protocol@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@tryghost/members-gateway-protocol/-/members-gateway-protocol-0.1.1.tgz#90fa1f5774ea5967c800fbbbce55cba310149a23"
   integrity sha512-dv5fjZs/L2vMIGdxOUSatVyMvAHoUwUlnFUNdd0SnZ2fBZt5+JpBCsxnDyP43AkxD5R+Lc1cuo4QipAN5Tn9ZA==
@@ -186,6 +186,15 @@
     ghost-ignition "^3.1.0"
     lodash "^4.17.11"
 
+"@tryghost/members-gateway-protocol@^0.1.2":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-gateway-protocol/-/members-gateway-protocol-0.1.2.tgz#afd004bd91b5e403ebb9e130d3208046ce621bc2"
+  integrity sha512-lZVJ5tKqAiGZhZ+JD+dSjHKN9q04W7JkWPVl/+zOl2FuVbMiIOvlcmrHWug++hZhAyYHcWjnRPM/paRkiR/KBQ==
+  dependencies:
+    bluebird "^3.5.4"
+    ghost-ignition "^3.1.0"
+    lodash "^4.17.11"
+
 "@tryghost/members-ssr@0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@tryghost/members-ssr/-/members-ssr-0.1.5.tgz#531a36233ac4d7e23b2582ec2e48698aba739c00"
@@ -198,12 +207,12 @@
     jsonwebtoken "^8.5.1"
     lodash "^4.17.11"
 
-"@tryghost/members-theme-bindings@^0.1.0":
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/@tryghost/members-theme-bindings/-/members-theme-bindings-0.1.0.tgz#4b4c46573d09446819f8bf4cccc1fc59b7398001"
-  integrity sha512-nC3Rq8cAtVfr58l7ukASXU1yb051goow0TpI2zoDCnPwrzZ3b9oiuaTglot1pQKqSGxyhbcdFSCBuU3p0082Xg==
+"@tryghost/members-theme-bindings@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@tryghost/members-theme-bindings/-/members-theme-bindings-0.2.1.tgz#cf49a2b1d35f676c5f11e1d2f107182231a9204e"
+  integrity sha512-pwrHDp+Vvo/0JeHpcmmRvUNOPTREwSgIq3wRRj+bUR75yFr6YXEOrX4QTppoM0MuzwG7ejO/hKHyRaSl1gRNjg==
   dependencies:
-    "@tryghost/members-browser-auth" "^0.1.1"
+    "@tryghost/members-browser-auth" "^0.1.2"
     bluebird "^3.5.4"
     ghost-ignition "^3.1.0"
     lodash "^4.17.11"