Merge pull request spring-media#20 from napicella/master

normalize request path takes into account localhost

Author: chgohlke

lib/proxyIntegration.js

@@ -108,6 +108,10 @@ function process(proxyIntegrationConfig, event, context) {
 }
 
 function normalizeRequestPath(event) {
+    if (isLocalExecution(event)) {
+      return event.path;
+    }
+    
     // ugly hack: if host is from API-Gateway 'Custom Domain Name Mapping', then event.path has the value '/basepath/resource-path/';
     // if host is from amazonaws.com, then event.path is just '/resource-path':
     const apiId = event.requestContext ? event.requestContext.apiId : null; // the apiId that is the first part of the amazonaws.com-host
@@ -189,4 +193,10 @@ function extractPathNames(pathExpression) {
     return pathNames && pathNames.length > 0 ? pathNames.slice(1) : null;
 }
 
+function isLocalExecution(event) {
+   return event.headers
+       && event.headers.Host
+       && event.headers.Host.startsWith('localhost');
+}
+
 module.exports = process;

test/proxyIntegration.spec.js

@@ -221,28 +221,10 @@ describe('proxyIntegration.routeHandler', () => {
         }, context);
     });
     it('should not change path if not coming over custom domain name', () => {
-        const actionSpy = jasmine.createSpy('action');
-        const context = {};
-        const event = {
-            httpMethod: 'GET', path: "/123/456",
-            headers: {Host: "blabla.execute-api.eu-central-1.amazonaws.com"},
-            requestContext: {apiId: 'blabla'}
-        };
-        proxyIntegration({
-            routes: [{
-                method: 'GET',
-                path: '/123/456',
-                action: actionSpy
-            }]
-        }, event, context, () => {
-        });
-        expect(actionSpy).toHaveBeenCalledWith({
-            httpMethod: 'GET',
-            headers: jasmine.anything(),
-            requestContext: jasmine.anything(),
-            path: "/123/456",
-            paths: {}
-        }, context);
+        assertPathIsUnchanged("blabla.execute-api.eu-central-1.amazonaws.com");
+    });
+    it('should not change path if coming over localhost', () => {
+        assertPathIsUnchanged("localhost");
     });
     it('should return 400 for an invalid body', (done) => {
         proxyIntegration({routes: [{}]}, {httpMethod: 'GET', path: '/', body: '{keinJson'}).then(result => {
@@ -489,3 +471,28 @@ describe('proxyIntegration.routeHandler.returnvalues', () => {
     });
 });
 
+function assertPathIsUnchanged(hostname) {
+    const actionSpy = jasmine.createSpy('action');
+    const context = {};
+    const event = {
+        httpMethod: 'GET', path: "/123/456",
+        headers: {Host: hostname},
+        requestContext: {apiId: 'blabla'}
+    };
+    proxyIntegration({
+        routes: [{
+            method: 'GET',
+            path: '/123/456',
+            action: actionSpy
+        }]
+    }, event, context, () => {
+    });
+    expect(actionSpy).toHaveBeenCalledWith({
+        httpMethod: 'GET',
+        headers: jasmine.anything(),
+        requestContext: jasmine.anything(),
+        path: "/123/456",
+        paths: {}
+    }, context);
+}
+