Merge pull request #121 from agility/adding-us2-region

Adding US2 region to the Fetch SDK

Author: AaronAgility

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agility/content-fetch",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "JS/TS library for the Agility Fetch API",
   "repository": {
     "type": "git",

src/api-client.ts

@@ -60,24 +60,29 @@ const defaultConfig: Config = {
 
 function buildBaseUrl(guid: string) {
 
-	let baseUrlSuffixes = {
+	const baseUrlSuffixes: { [key: string]: string } = {
 		u: '',
 		c: '-ca',
 		e: '-eu',
 		a: '-aus',
-		d: '-dev'
+		d: '-dev',
+		us2: '-usa2'
+	};
+
+	// Match for -us2, -c, -u, -e, -a, -d at the end of the guid
+	const match = guid.match(/-(us2|[ucead])$/);
+
+	if (match) {
+		const env = match[1];
+		if (baseUrlSuffixes.hasOwnProperty(env)) {
+			const url = `https://api${baseUrlSuffixes[env]}.aglty.io/${guid}`;
+			return url;
+		}
 	}
 
-	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`;
-	}
+	// use default url
+	const legacyUrl = `https://${guid}-api.agilitycms.cloud`;
+	return legacyUrl;
 }
 
 function validateConfigParams(configParams: Config) {

test/getApi.tests.ts

@@ -100,6 +100,17 @@ describe('getApi:', function () {
         done();
     });
 
+    it('should return an api client with new stackpath baseUrl based on us2', function (done) {
+        const baseUrl = 'https://api-usa2.aglty.io/someguid-us2';
+        const api = agilityFetch.getApi({
+            guid: 'someguid-us2',
+            apiKey: 'some-access-token',
+            baseUrl: null
+        });
+        expect(api.config.baseUrl).toBe(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 = agilityFetch.getApi({