fixes for serverless#12, serverless#17, serverless#26, and resolves d…

…ependabot identified vulnerabilities
trevor-leach · Jun 18, 2021 · 89d8dfe · 89d8dfe
1 parent 074ef29
commit 89d8dfe
Show file tree

Hide file tree

Showing 5 changed files with 565 additions and 564 deletions.
diff --git a/lib/events/aws/api-gateway-event-template.json b/lib/events/aws/api-gateway-event-template.json
@@ -30,6 +30,8 @@
     "accountId": "123456789012",
     "resourceId": "us4z18",
     "stage": "test",
+    "authorizer": {},
+    "protocol": "",
     "requestId": "41b45ea3-70b5-11e6-b7bd-69b5aaebc7d9",
     "identity": {
       "accessKey": "",
@@ -38,8 +40,10 @@
       "accountId": "",
       "cognitoIdentityId": "",
       "caller": "",
+      "clientCert": null,
       "apiKey": "",
       "sourceIp": "192.168.100.1",
+      "principalOrgId": "o-hefegcwbcibwue",
       "cognitoAuthenticationType": "",
       "cognitoAuthenticationProvider": "",
       "userArn": "",

diff --git a/lib/index.spec.ts b/lib/index.spec.ts
@@ -50,6 +50,26 @@ describe("createApigEvent()", () => {
   });
 });
 
+it("should return APIG mocked event with custom authorizer", () => {
+  const event = createEvent("aws:apiGateway", {
+    requestContext: {
+      authorizer: {
+        user_info: JSON.stringify({
+          id: 1234,
+          name: "Sam Smith",
+        }),
+      },
+    },
+  } as any);
+
+  expect(!!event.requestContext.authorizer).to.be.true;
+
+  const authorizer = event.requestContext.authorizer || {};
+  const parsedAuthorizer = JSON.parse(authorizer.user_info || "");
+  expect(parsedAuthorizer.id).to.eql(1234);
+  expect(parsedAuthorizer.name).to.eql("Sam Smith");
+});
+
 describe("createWebsocketEvent()", () => {
   it("should return websocket mocked event", () => {
     const event = createEvent("aws:websocket", {

diff --git a/lib/index.ts b/lib/index.ts
@@ -45,10 +45,11 @@ export const dictionary = {
   "aws:cognitoUserPool": cognitoUserPoolEventTemplate as CognitoUserPoolEvent,
   "aws:websocket": apiGatewayTemplate as APIGatewayEvent, // Websockets are included in APIG typedef: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/32855/files
 };
-
+// https://typeofnan.dev/creating-your-own-deeppartial-type-in-typescript/
+type DeepPartial<T> = Partial<{ [P in keyof T]: DeepPartial<T[P]> }>;
 export default function createEvent<T extends keyof typeof dictionary, B>(
   eventType: T,
-  body: typeof dictionary[T],
+  body: DeepPartial<typeof dictionary[T]>,
 ): typeof dictionary[T] {
   const event = dictionary[eventType];
   let generatedEvent = {};