Merge pull request #980 from danilofuchs/fix/resource-path

fix: resourcePath in authorizers should contain wildcards
dherault · Jun 4, 2020 · bf2a48d · bf2a48d
2 parents b5b8f1f + efc4866
commit bf2a48d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/src/events/http/createAuthScheme.js b/src/events/http/createAuthScheme.js
@@ -44,7 +44,7 @@ export default function createAuthScheme(authorizerOptions, provider, lambda) {
       const accountId = 'random-account-id'
       const apiId = 'random-api-id'
       const httpMethod = request.method.toUpperCase()
-      const resourcePath = request.path.replace(
+      const resourcePath = request.route.path.replace(
         new RegExp(`^/${provider.stage}`),
         '',
       )
@@ -59,8 +59,10 @@ export default function createAuthScheme(authorizerOptions, provider, lambda) {
           requestId: 'random-request-id',
           resourceId: 'random-resource-id',
           resourcePath,
+          path: request.path,
           stage: provider.stage,
         },
+        resource: resourcePath,
       }
 
       // Create event Object for authFunction

diff --git a/src/events/http/lambda-events/LambdaProxyIntegrationEvent.js b/src/events/http/lambda-events/LambdaProxyIntegrationEvent.js
@@ -186,7 +186,7 @@ export default class LambdaProxyIntegrationEvent {
         resourcePath: route.path,
         stage: this.#stage,
       },
-      resource: this.#path,
+      resource: route.path,
       stageVariables: this.#stageVariables,
     }
   }

diff --git a/tests/integration/handler/handler.js b/tests/integration/handler/handler.js
@@ -202,3 +202,10 @@ exports.TestPathVariable = (event, context, callback) => {
     body: stringify(event.path),
   })
 }
+
+exports.TestResourceVariable = (event, context, callback) => {
+  callback(null, {
+    statusCode: 200,
+    body: stringify(event.resource),
+  })
+}
diff --git a/tests/integration/handler/handlerPayload.test.js b/tests/integration/handler/handlerPayload.test.js
@@ -301,6 +301,13 @@ describe('handler payload tests with prepend off', () => {
       path: '/test-path-variable-handler',
       status: 200,
     },
+
+    {
+      description: 'event.resource should not contain wildcards',
+      expected: '/{id}/test-resource-variable-handler',
+      path: '/1/test-resource-variable-handler',
+      status: 200,
+    },
   ].forEach(({ description, expected, path, status }) => {
     test(description, async () => {
       const url = joinUrl(TEST_BASE_URL, path)

diff --git a/tests/integration/handler/serverless.yml b/tests/integration/handler/serverless.yml
@@ -155,3 +155,10 @@ functions:
           method: get
           path: test-path-variable-handler
     handler: handler.TestPathVariable
+
+  TestResourceVariable:
+    events:
+      - http:
+          method: get
+          path: /{id}/test-resource-variable-handler
+    handler: handler.TestResourceVariable