Skip to content

feat(navigation / pass extra headers): allow passing of extra headers… #22

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 1 commit into from
Apr 22, 2021
+24 −6
Merged

feat(navigation / pass extra headers): allow passing of extra headers… #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions src/__tests__/modules/FSXAApi.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,18 +170,32 @@ describe('FSXAApi', () => {

describe('fetchPage', async () => {
it('should call local url in proxy-mode', async () => {
testForLocalUrl(api => api.fetchElement('foobar', 'de_DE'))
await testForLocalUrl(api => api.fetchElement('foobar', 'de_DE'))
})
})

describe('fetchNavigation', async () => {
it('should call local url in proxy-mode', async () => {
testForLocalUrl(api => api.fetchNavigation(null, 'de_DE'))
await testForLocalUrl(api => api.fetchNavigation(null, 'de_DE'))
})

it('should pass extraHeaders', async () => {
await testForLocalUrl(
api => api.fetchNavigation(null, 'de_DE', { 'x-test': 'foobar' }),
fetch => {
const request = fetch.mock.calls[0][1]
const headers = request && request['headers']
expect(headers && 'x-test' in headers && headers['x-test']).toBe('foobar')
}
)
})
})
})

const testForLocalUrl = async (method: (api: FSXAApi) => Promise<any>) => {
const testForLocalUrl = async (
method: (api: FSXAApi) => Promise<any>,
validate?: (fetch: FetchMock) => void
) => {
fetchMock.enableMocks()
const api = new FSXAApi(FSXAContentMode.PREVIEW, {
mode: 'proxy',
Expand All @@ -193,5 +207,6 @@ const testForLocalUrl = async (method: (api: FSXAApi) => Promise<any>) => {
await method(api)
expect(mockedFetch).toHaveBeenCalledTimes(1)
expect(mockedFetch.mock.calls[0][0]).toMatch(/localhost/g)
validate && validate(fetchMock)
fetchMock.disableMocks()
}
9 changes: 6 additions & 3 deletions src/modules/FSXAApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ export class FSXAApi {

async fetchNavigation(
initialPath: string | null,
defaultLocale: string
defaultLocale: string,
extraHeaders?: Record<string, string>
): Promise<NavigationData | null> {
const encodedInitialPath = initialPath ? encodeURI(initialPath) : null
if (this.params.mode === 'proxy') {
Expand All @@ -327,7 +328,8 @@ export class FSXAApi {
const response = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
'Content-Type': 'application/json',
...extraHeaders
},
body: JSON.stringify({
initialPath,
Expand Down Expand Up @@ -360,7 +362,8 @@ export class FSXAApi {
})
const response = await fetch(url, {
headers: {
'Accept-Language': '*'
'Accept-Language': '*',
...extraHeaders
}
})

Expand Down