Fixes OAuth authentication issues when using custom hosts without specifying region

Author: harshithad0703

lib/core/contentstackHTTPClient.js

@@ -68,9 +68,30 @@ 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'
+
+  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]
+    }
+  }
+
   const uiHostName = getRegionEndpoint(region, 'application')
-  const developerHubBaseUrl = getRegionEndpoint(region, 'developerHub').replace(/^/, 'https://')
+
+  let developerHubBaseUrl
+  if (config.host && (config.host.startsWith('dev') || config.host.startsWith('stag'))) {
+    developerHubBaseUrl = config.host
+     .replace('api', 'developerhub-api')
+      .replace(/^dev\d+/, 'dev')
+      .replace(/^stag\d+/, 'stag')
+      .replace(/^http:\/\//, '')
+      .replace(/^https:\/\//, '')
+      .replace(/^/, 'https://')
+  } else {
+    developerHubBaseUrl = getRegionEndpoint(region, 'developerHub').replace(/^/, 'https://')
+  }
+
   const uiBaseUrl = config.endpoint || `${protocol}://${uiHostName}`
 
   // set ui host name

test/sanity-check/api/oauth-test.js

@@ -21,12 +21,6 @@ const oauthClient = client.oauth({
   redirectUri: process.env.REDIRECT_URI
 })
 
-// Override developerHubBaseUrl if DEV_HUB_HOST is provided
-if (process.env.DEV_HUB_HOST) {
-  oauthClient.axiosInstance.defaults.developerHubBaseUrl = `https://${process.env.DEV_HUB_HOST}`
-  oauthClient.developerHubBaseUrl = `https://${process.env.DEV_HUB_HOST}`
-}
-
 describe('OAuth Authentication API Test', () => {
   it('should login with credentials', done => {
     client.login({ email: process.env.EMAIL, password: process.env.PASSWORD }, { include_orgs: true, include_orgs_roles: true, include_stack_roles: true, include_user_settings: true }).then((response) => {