From e291e7075b679a9299596a7777724e2d80fb4524 Mon Sep 17 00:00:00 2001
From: Rish <zrishabhgarg@gmail.com>
Date: Fri, 1 May 2020 17:00:52 +0530
Subject: [PATCH] Updated api endpoints to use new member endpoints on site

refs https://github.com/TryGhost/members.js/issues/25

- Members endpoints were refactored in core to exist directly on site as `<SITE>/members/api/<RESOURCE>`
- All endpoints needed are now directly on SITE and removes the need for AdminURL
- Init method is updated to read site data from fixtures for local development, as no admin endpoint exists now

Core Refs:
https://github.com/TryGhost/Ghost/commit/0cba02b370a7d0d073d1030eda368292829037ed
https://github.com/TryGhost/Ghost/commit/fa4dfa1b2103b5904d0ce6f108ac31ba0c2f225f
https://github.com/TryGhost/Ghost/commit/c70c49258e48c1683c054a8c43eedc491d6302ad
---
 ghost/portal/src/utils/api.js | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/ghost/portal/src/utils/api.js b/ghost/portal/src/utils/api.js
index 5d25c81d3a..4319f46a44 100644
--- a/ghost/portal/src/utils/api.js
+++ b/ghost/portal/src/utils/api.js
@@ -1,19 +1,12 @@
 import * as Fixtures from './fixtures';
 
-function setupGhostApi({adminUrl}) {
-    const ghostPath = 'ghost';
-    const ssrPath = 'members/ssr';
-    const version = 'v3';
-    adminUrl = adminUrl.replace(/\/$/, '');
-    let siteUrl = window.location.origin;
+function setupGhostApi() {
+    const apiPath = 'members/api';
+    const siteUrl = window.location.origin;
 
     function endpointFor({type, resource}) {
         if (type === 'members') {
-            return `${adminUrl}/${ghostPath}/api/${version}/members/${resource}/`;
-        } else if (type === 'admin') {
-            return `${adminUrl}/${ghostPath}/api/${version}/admin/${resource}/`;
-        } else if (type === 'ssr') {
-            return resource ? `${siteUrl}/${ssrPath}/${resource}/` : `${siteUrl}/${ssrPath}/`;
+            return `${siteUrl}/${apiPath}/${resource}/`;
         }
     }
 
@@ -30,7 +23,7 @@ function setupGhostApi({adminUrl}) {
 
     api.site = {
         read() {
-            const url = endpointFor({type: 'admin', resource: 'site'});
+            const url = endpointFor({type: 'members', resource: 'site'});
             return makeRequest({
                 url,
                 method: 'GET',
@@ -49,7 +42,7 @@ function setupGhostApi({adminUrl}) {
 
     api.member = {
         identity() {
-            const url = endpointFor({type: 'ssr'});
+            const url = endpointFor({type: 'members', resource: 'session'});
             return makeRequest({
                 url,
                 credentials: 'same-origin'
@@ -62,7 +55,7 @@ function setupGhostApi({adminUrl}) {
         },
 
         sessionData() {
-            const url = endpointFor({type: 'ssr', resource: 'member'});
+            const url = endpointFor({type: 'members', resource: 'member'});
             return makeRequest({
                 url,
                 credentials: 'same-origin'
@@ -97,7 +90,7 @@ function setupGhostApi({adminUrl}) {
         },
 
         signout() {
-            const url = endpointFor({type: 'ssr'});
+            const url = endpointFor({type: 'members', resource: 'session'});
             return makeRequest({
                 url,
                 method: 'DELETE'
@@ -149,16 +142,14 @@ function setupGhostApi({adminUrl}) {
     };
 
     api.init = async () => {
-        const {site} = await api.site.read();
-        // Update site url from site data instead of default window.location.origin
-        siteUrl = site.url.replace(/\/$/, '');
-
         // Load member from fixtures for local development
         if (process.env.NODE_ENV === 'development') {
-            return {site, member: Fixtures.member.free};
+            return {site: Fixtures.site, member: Fixtures.member.free};
         }
 
+        const {site} = await api.site.read();
         const member = await api.member.sessionData();
+
         return {site, member};
     };