Merge pull request #451 from contentstack/development

Development

Author: harshithad0703

lib/contentstack.js

@@ -164,7 +164,8 @@ export function client (params = {}) {
   let defaultHostName = getRegionEndpoint('na')
 
   if (params.region) {
-    defaultHostName = getRegionEndpoint(params.region.toLowerCase())
+    params.region = params.region.toLowerCase()
+    defaultHostName = getRegionEndpoint(params.region)
   }
 
   const defaultParameter = {

lib/core/contentstackHTTPClient.js

@@ -68,9 +68,27 @@ export default function contentstackHttpClient (options) {
     config.basePath = `/${config.basePath.split('/').filter(Boolean).join('/')}`
   }
   const baseURL = config.endpoint || `${protocol}://${hostname}:${port}${config.basePath}/{api-version}`
-  const region = config.region || 'na'
-  const uiHostName = getRegionEndpoint(region, 'application')
-  const developerHubBaseUrl = getRegionEndpoint(region, 'developerHub').replace(/^/, 'https://')
+
+  let region = config.region || 'na'
+  if (!config.region && config.host) {
+    const hostRegionMatch = config.host.match(/^([a-z]+-?[a-z]*)-api\./)
+    if (hostRegionMatch) {
+      region = hostRegionMatch[1]
+    }
+  }
+
+  let uiHostName, developerHubBaseUrl
+  if (config.host && (config.host.startsWith('dev') || config.host.startsWith('stag'))) {
+    uiHostName = config.host.replace('-api.', '-app.')
+    const transformedHost = config.host
+      .replace(/^dev\d+/, 'dev')
+      .replace(/^stag\d+/, 'stag')
+    developerHubBaseUrl = `https://${transformedHost.replace('-api.', '-developerhub-api.')}`
+  } else {
+    uiHostName = getRegionEndpoint(region, 'application')
+    developerHubBaseUrl = `https://${getRegionEndpoint(region, 'developerHub')}`
+  }
+
   const uiBaseUrl = config.endpoint || `${protocol}://${uiHostName}`
 
   // set ui host name