Skip to content

Fixes OAuth issues when using custom hosts #450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 30, 2025
Merged

Fixes OAuth issues when using custom hosts #450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
74cffc0
Fixes OAuth authentication issues when using custom hosts without spe…
harshithad0703 Oct 30, 2025
a75e118
Fix lint
harshithad0703 Oct 30, 2025
3c6ffeb
Fix ui host for oauth
harshithad0703 Oct 30, 2025
1c46d48
Fix ui host for oauth
harshithad0703 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions lib/core/contentstackHTTPClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions test/sanity-check/api/oauth-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
Loading