major update to fix breaking changes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agility/content-fetch",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "JavaScript library for the Agility Fetch API (node and browser)",
   "main": "dist/agility-content-fetch.node.js",
   "scripts": {

src/api-client.js

@@ -7,33 +7,36 @@ import getContentList from './methods/getContentList'
 import getPage from './methods/getPage'
 
 const defaultConfig = {
-    fetchBaseUrl: 'https://fetch.agilitycms.cloud',
-    previewBaseUrl: 'https://preview.agilitycms.cloud',
     baseUrl: null,
     isPreview: false,
     instanceID: null,
     accessToken: null,
     languageCode: null,
+    headers: {},
+    requiresGuidInHeaders: false,
     caching: {
         maxAge: 0 //caching disabled by default
     }
 };
 
 export default function createClient(userConfig) {
 
-    //set default baseUrl
-    if(userConfig.isPreview) {
-        defaultConfig.baseUrl = defaultConfig.previewBaseUrl
-    } else {
-        defaultConfig.baseUrl = defaultConfig.fetchBaseUrl
-    }
 
     //merge our config - user values will override our defaults
-    const config = {
+    let config = {
         ...defaultConfig,
         ...userConfig
     };
 
+    //compute the base Url
+    if(!config.baseUrl) {
+        //use default url
+        config.baseUrl = `https://${config.instanceID}-api.agilitycms.cloud`;
+    } else {
+        //we are using a custom url, make sure we include the instanceID/Guid in the headers
+        config.requiresGuidInHeaders = true;
+    }
+
     let adapter = null;
 
     //should we turn on caching?

src/utils.js

@@ -1,13 +1,31 @@
 function buildRequestUrlPath(config, languageCode) {
     let urlPath = null;
-    urlPath = `${config.baseUrl}/${config.instanceID}/${languageCode}`;
+    let apiFetchOrPreview = null;
+
+    if(config.isPreview) {
+        apiFetchOrPreview  = 'preview';
+    } else {
+        apiFetchOrPreview = 'fetch';
+    }
+
+    urlPath = `${config.baseUrl}/${apiFetchOrPreview}/${languageCode}`;
     return urlPath;
 }
 
 function buildAuthHeader(config) {
-    return {
+    let defaultAuthHeaders = {
         'APIKey': config.accessToken
+    };
+
+    if(config.requiresGuidInHeaders) {
+        defaultAuthHeaders.Guid = config.instanceID;
     }
+
+    return {
+        ...defaultAuthHeaders,
+        ...config.headers
+    }
+
 }
 
 function isHttps(url) {

test/apiClients.config.js

@@ -1,15 +1,15 @@
 import agility from '../src/content-fetch'
 
-// Agiliy Instance = 'Headless Integration Testing'
+// Agility Instance = 'Headless Integration Testing'
 const instanceID = 'c741222b-1080-45f6-9a7f-982381c5a485';
-const accessTokenFetch = 'mn16Ui.a70c306e57eb682bf6dc5e42325dd77b06ddde33f5a8e46530e680ad334c7e6d';
-const accessTokenPreview = 'tR95Pt.3c66512540fbbb00944602c9be1ca913fe3d83f41fbec172fa005ef10d9d1273';
+const accessTokenFetch = 'UnitTestsFetch.2ace650991363fbcffa6776d411d1b0d616b8e3424ce842b81cba7af0039197e';
+const accessTokenPreview = 'UnitTestsPreview.69e6bca345ced0b7ca5ab358b351ea5c870790a5945c25d749a865332906b124';
 
 function createApiClient() {
     var api = agility.getApi({
         instanceID: instanceID,
         accessToken: accessTokenFetch,
-        isPreview: false
+        baseUrl: 'https://agility-fetch-api-dev.azurewebsites.net'
     });
     return api;
 }
@@ -18,10 +18,10 @@ function createCachedApiClient() {
     var api = agility.getApi({
         instanceID: instanceID,
         accessToken: accessTokenFetch,
-        isPreview: false,
         caching: {
             maxAge: 5 * 60 * 1000 //==5mins
-        }
+        },
+        baseUrl: 'https://agility-fetch-api-dev.azurewebsites.net'
     });
     return api;
 }
@@ -30,7 +30,8 @@ function createPreviewApiClient() {
     var api = agility.getApi({
         instanceID: instanceID,
         accessToken: accessTokenPreview,
-        isPreview: true
+        isPreview: true,
+        baseUrl: 'https://agility-fetch-api-dev.azurewebsites.net'
     });
     return api;
 }