Skip to content

Compare host against known urls #216

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
purplecabbage merged 3 commits into from
Aug 12, 2025
Merged

Compare host against known urls #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bda2bb8
Compare host against known urls
purplecabbage Aug 12, 2025
af7ae41
Update src/utils.js
purplecabbage Aug 12, 2025
f880ffc
check against host without protocol
purplecabbage Aug 12, 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
5 changes: 4 additions & 1 deletion src/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1853,10 +1853,13 @@ function getActionUrls (appConfig, /* istanbul ignore next */ isRemoteDev = fals
const config = replacePackagePlaceHolder(appConfig)
const cleanApihost = removeProtocolFromURL(config.ow.apihost)
const cleanHostname = removeProtocolFromURL(config.app.hostname)
const endpointHosts = SUPPORTED_ADOBE_ANNOTATION_ENDPOINTS.map(endpoint => removeProtocolFromURL(endpoint))

const apihostIsCustom = !endpointHosts.includes(cleanApihost)

const apihostIsCustom = cleanApihost !== removeProtocolFromURL(config.ow.defaultApihost)
const hostnameIsCustom = cleanHostname !== removeProtocolFromURL(config.app.defaultHostname)

aioLogger.debug('apihostIsCustom ', apihostIsCustom, 'hostnameIsCustom ', hostnameIsCustom)
// second condition allows users to point to its own http local ow stack
const isHttp = isLocalDev || !!config.ow.apihost.match(/^http:\/\/localhost/)

Expand Down
16 changes: 16 additions & 0 deletions test/utils.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2191,6 +2191,22 @@ describe('getActionUrls', () => {
expect(result).toEqual(expect.objectContaining(expected))
})

// this test proves we still have an issue with non default package actions
// eslint-disable-next-line jest/no-commented-out-tests
// test('should not fail if default package has no actions with deploy-service apihost', () => {
// const expected = {
// 'sample-app-1.0.0/action-sequence': 'https://fake_ns.adobeio-static.net/api/v1/web/sample-app-1.0.0/action-sequence',
// 'pkg2/thataction': 'https://fake_ns.adobeioruntime.net/api/v1/pkg2/thataction',
// 'pkg2/thatsequence': 'https://fake_ns.adobeio-static.net/api/v1/web/pkg2/thatsequence'
// }
// config.ow.apihost = 'https://deploy-service.app-builder.adp.adobe.io/runtime'
// config.app.hostname = 'adobeio-static.net'
// config.manifest.full.packages.pkg2.actions.thataction.web = false
// delete config.manifest.full.packages.__APP_PACKAGE__.actions
// const result = utils.getActionUrls(config, false, false)
// expect(result).toEqual(expect.objectContaining(expected))
// })

test('urls with action keys when legacy on', () => {
const expected = {
'pkg2/thataction': 'https://fake_ns.adobeio-static.net/api/v1/web/pkg2/thataction',
Expand Down
Loading