stackpath work

Author: Ali Tahir

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/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) {