Merge pull request #42 from panva/refactor/get-path-with-query

Use native url.format; test for re-encoding in getPathWithQueryStringParams

Author: brettstack

__tests__/index.js

@@ -20,6 +20,17 @@ test('getPathWithQueryStringParams: 1 param', () => {
     expect(pathWithQueryStringParams).toEqual('/foo/bar?bizz=bazz')
 })
 
+test('getPathWithQueryStringParams: to be url-encoded param', () => {
+    const event = {
+        path: '/foo/bar',
+        queryStringParameters: {
+            'redirect_uri': 'http://lvh.me:3000/cb'
+        }
+    }
+    const pathWithQueryStringParams = awsServerlessExpress.getPathWithQueryStringParams(event)
+    expect(pathWithQueryStringParams).toEqual('/foo/bar?redirect_uri=http%3A%2F%2Flvh.me%3A3000%2Fcb')
+})
+
 test('getPathWithQueryStringParams: 2 params', () => {
     const event = {
         path: '/foo/bar',

index.js

@@ -14,16 +14,11 @@
  */
 'use strict'
 const http = require('http')
+const url = require('url')
 const binarycase = require('binary-case')
 
 function getPathWithQueryStringParams(event) {
-    const queryStringKeys = Object.keys(event.queryStringParameters || {})
-
-    if (queryStringKeys.length === 0) return event.path
-
-    const queryStringParams = queryStringKeys.map(queryStringKey => `${queryStringKey}=${encodeURIComponent(event.queryStringParameters[queryStringKey])}`).join('&')
-
-    return `${event.path}?${queryStringParams}`
+  return url.format({ pathname: event.path, query: event.queryStringParameters })
 }
 
 function mapApiGatewayEventToHttpRequest(event, context, socketPath) {