Merge pull request #56 from agility/ali

stackpath work

Author: James Vidler

package.json

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

src/api-client.js

@@ -52,6 +52,27 @@ function buildEnvConfig() {
     return envConfig;
 }
 
+function buildBaseUrl(guid) {
+
+    let baseUrlSuffixes = {
+        u: '',
+        c: '-ca',
+        e: '-eu',
+        d: '-dev'
+    }
+
+    let suffix = guid.substr(guid.length - 2, 2);
+    let env = suffix.substr(1);
+    // New format of guid
+    if (suffix.startsWith('-') && baseUrlSuffixes.hasOwnProperty(env)) {
+        return `https://api${baseUrlSuffixes[env]}.aglty.io/${guid}`
+    }
+    else {
+        //use default url
+        return `https://${guid}-api.agilitycms.cloud`;
+    }
+}
+
 export default function createClient(userConfig) {
 
     let envConfig = buildEnvConfig();
@@ -65,8 +86,7 @@ export default function createClient(userConfig) {
 
     //compute the base Url
     if (!config.baseUrl) {
-        //use default url
-        config.baseUrl = `https://${config.guid}-api.agilitycms.cloud`;
+        config.baseUrl = buildBaseUrl(config.guid);
     } else {
         //we are using a custom url, make sure we include the guid in the headers
         config.requiresGuidInHeaders = true;

test/apiClients.config.js

@@ -14,6 +14,13 @@ function createApiClient() {
     return api;
 }
 
+function createApiClientWithNewCdn() {
+    var api = agility.getApi({
+        guid: '2b64a4d8-d',
+        apiKey: 'JSSDK.e27e61f56d4c9b58ab98961aaf86a0d3c544dfe7d0eb385ece42123dad5d1af7'
+    });
+    return api;
+}
 
 function createCachedApiClient() {
     var api = agility.getApi({
@@ -38,5 +45,6 @@ function createPreviewApiClient() {
 export {
     createApiClient,
     createCachedApiClient,
-    createPreviewApiClient
+    createPreviewApiClient,
+    createApiClientWithNewCdn
 }

test/getApi.tests.js

@@ -85,6 +85,50 @@ describe('getApi:', function() {
         done();
     });
 
+    it('should return an api client with new stackpath baseUrl based on canada', function(done) {
+        const baseUrl = 'https://api-ca.aglty.io/some-guid-c';
+        const api = agility.getApi({
+            guid: 'some-guid-c',
+            apiKey: 'some-access-token',
+            baseUrl: null
+        });
+        assert.strictEqual(api.config.baseUrl, baseUrl);
+        done();
+    });
+
+    it('should return an api client with new stackpath baseUrl based on usa', function(done) {
+        const baseUrl = 'https://api.aglty.io/some-guid-u';
+        const api = agility.getApi({
+            guid: 'some-guid-u',
+            apiKey: 'some-access-token',
+            baseUrl: null
+        });
+        assert.strictEqual(api.config.baseUrl, baseUrl);
+        done();
+    });
+
+    it('should return an api client with new stackpath baseUrl based on dev', function(done) {
+        const baseUrl = 'https://api-dev.aglty.io/some-guid-d';
+        const api = agility.getApi({
+            guid: 'some-guid-d',
+            apiKey: 'some-access-token',
+            baseUrl: null
+        });
+        assert.strictEqual(api.config.baseUrl, baseUrl);
+        done();
+    });
+
+    it('should return an api client with legacy stackpath baseUrl', function(done) {
+        const baseUrl = 'https://some-guid-api.agilitycms.cloud';
+        const api = agility.getApi({
+            guid: 'some-guid',
+            apiKey: 'some-access-token',
+            baseUrl: null
+        });
+        assert.strictEqual(api.config.baseUrl, baseUrl);
+        done();
+    });
+
     // TESTING EXCEPTIONS ----------------------------------------------------
 
     it('should throw an error if guid is not passed-in', function(done) {

test/getContentItem.tests.js

@@ -2,7 +2,12 @@ import chai from 'chai'
 const assert = chai.assert;
 const expect = chai.expect;
 
-import { createApiClient, createPreviewApiClient, createCachedApiClient } from './apiClients.config'
+import {
+    createApiClient,
+    createPreviewApiClient,
+    createCachedApiClient,
+    createApiClientWithNewCdn
+} from './apiClients.config'
 
 /* 
     This file contains static references to content from the instance configured in the apiClient.config file.
@@ -178,5 +183,18 @@ describe('getContentItem:', function() {
         .catch(done);
     })
 
+    it('should be able to fetch an item using global cdn site', function(done) {
+        var api = createApiClientWithNewCdn();
+        api.getContentItem({
+            contentID: 4, //item within jssdklist
+            languageCode: 'en-us',
+        })
+            .then(function(contentItem) {
+                assert.strictEqual(contentItem.fields.title, 'JS SDK Item - DO NOT DELETE');
+                done();
+            })
+            .catch(done);
+    })
+
 });
 

test/getContentList.tests.js

@@ -1,7 +1,12 @@
 import chai from 'chai'
 const assert = chai.assert;
 const expect = chai.expect;
-import { createApiClient, createPreviewApiClient, createCatchedApiClient } from './apiClients.config'
+import {
+    createApiClient,
+    createPreviewApiClient,
+    createCachedApiClient,
+    createApiClientWithNewCdn
+} from './apiClients.config'
 
 /*
     This file contains static references to content from the instance configured in the apiClient.config file.
@@ -350,4 +355,18 @@ describe('getContentList:', function() {
         })
         .catch(done);
     })
+
+    it('should be able to fetch a list using global cdn site', function(done) {
+        var api = createApiClientWithNewCdn();
+        let referenceName = 'jssdklist';
+        api.getContentList({
+            referenceName: referenceName,
+            languageCode: 'en-us'
+        })
+            .then(function(contentList) {
+                assert.strictEqual(contentList.items[0].properties.referenceName, referenceName);
+                done();
+            })
+            .catch(done);
+    })
 });