Merge pull request #51 from zalando-incubator/50-fix-request-uri-parsing

fix(fragment): Fixed x-zalando-request-uri parsing

packages/tessellate-fragment/src/actions/sources-resolver.js

@@ -17,8 +17,9 @@ const SOURCES_QUERY_PARAM = 'sources'
 const SOURCES_PROPERTY_BY_HEADER_KEY = {
   'x-zalando-request-uri': {
     key: 'bundles:path',
-    transformValue: (value) => {
-      const {hostname, pathname} = url.parse(value)
+    transformValue: (value, headers) => {
+      const { pathname } = url.parse(value)
+      const hostname = headers['x-zalando-request-host']
       return path.join(hostname.replace(/^www\./, ''), pathname)
     }
   }
@@ -61,7 +62,7 @@ function assignSourcePropertiesFromHeaders(headers: Object, sources: Object) {
         target = target[key]
       }
       const lastKey = keys.shift()
-      target[lastKey] = SOURCES_PROPERTY_BY_HEADER_KEY[headerName].transformValue(headers[headerName])
+      target[lastKey] = SOURCES_PROPERTY_BY_HEADER_KEY[headerName].transformValue(headers[headerName], headers)
     }
   }
 }

packages/tessellate-fragment/test/actions/sources-resolver.test.js

@@ -12,8 +12,11 @@ describe('sources-resolver', () => {
     expect(sources.bundles.src).toBe('http://localhost:3001')
   })
 
-  it('merges header properties with properties from nconf', async () => {
-    const headers = { 'x-zalando-request-uri': 'https://www.zalando.de/foo' }
+  it('merges headers with request uri and host with properties from nconf', async () => {
+    const headers = {
+      'x-zalando-request-uri': '/foo?q=bar',
+      'x-zalando-request-host': 'www.zalando.de'
+    }
 
     const sources = await resolveSources(headers, {})
 
@@ -25,7 +28,10 @@ describe('sources-resolver', () => {
     require('request-promise-native').mockImplementation(() =>
       Promise.resolve({ sources: { bundles: { path: 'zalando.de/remote' } } }))
 
-    const headers = { 'x-zalando-request-uri': 'https://www.zalando.de/foo' }
+    const headers = {
+      'x-zalando-request-uri': '/foo',
+      'x-zalando-request-host': 'www.zalando.de'
+    }
     const query = { sources: 'https://cdn.com/sources.json' }
 
     const sources = await resolveSources(headers, query)