feat(lambda): support for CustomMessage_Authentication

jagregory · Nov 25, 2021 · dfb6fdf · dfb6fdf
1 parent 79f43ef
commit dfb6fdf
Show file tree

Hide file tree

Showing 4 changed files with 154 additions and 5 deletions.
diff --git a/src/services/messages.test.ts b/src/services/messages.test.ts
@@ -12,7 +12,96 @@ describe("messages service", () => {
 
   const user = TDB.user();
 
-  it.todo("authentication");
+  describe("authentication", () => {
+    describe("CustomMessage lambda is configured", () => {
+      describe("lambda returns a custom message", () => {
+        it("returns the custom message and code", async () => {
+          mockTriggers.enabled.mockImplementation((name) => {
+            return name === "CustomMessage";
+          });
+          mockTriggers.customMessage.mockResolvedValue({
+            smsMessage: "sms",
+            emailSubject: "email subject",
+            emailMessage: "email",
+          });
+
+          const messages = new MessagesService(mockTriggers);
+          const message = await messages.authentication(
+            "clientId",
+            "userPoolId",
+            user,
+            "1234"
+          );
+
+          expect(message).toMatchObject({
+            __code: "1234",
+            smsMessage: "sms",
+            emailSubject: "email subject",
+            emailMessage: "email",
+          });
+
+          expect(mockTriggers.customMessage).toHaveBeenCalledWith({
+            clientId: "clientId",
+            code: "1234",
+            source: "CustomMessage_Authentication",
+            userAttributes: user.Attributes,
+            userPoolId: "userPoolId",
+            username: user.Username,
+          });
+        });
+      });
+
+      describe("lambda does not return a custom message", () => {
+        it("returns just the code", async () => {
+          mockTriggers.enabled.mockImplementation((name) => {
+            return name === "CustomMessage";
+          });
+          mockTriggers.customMessage.mockResolvedValue(null);
+
+          const messages = new MessagesService(mockTriggers);
+          const message = await messages.authentication(
+            "clientId",
+            "userPoolId",
+            user,
+            "1234"
+          );
+
+          expect(message).toMatchObject({
+            __code: "1234",
+          });
+
+          expect(mockTriggers.customMessage).toHaveBeenCalledWith({
+            clientId: "clientId",
+            code: "1234",
+            source: "CustomMessage_Authentication",
+            userAttributes: user.Attributes,
+            userPoolId: "userPoolId",
+            username: user.Username,
+          });
+        });
+      });
+    });
+
+    describe("CustomMessage lambda is not configured", () => {
+      it("returns just the code", async () => {
+        mockTriggers.enabled.mockReturnValue(false);
+
+        const messages = new MessagesService(mockTriggers);
+        const message = await messages.authentication(
+          "clientId",
+          "userPoolId",
+          user,
+          "1234"
+        );
+
+        expect(message).toMatchObject({
+          __code: "1234",
+        });
+
+        expect(mockTriggers.customMessage).not.toHaveBeenCalled();
+      });
+    });
+  });
 
   describe("forgotPassword", () => {
     describe("CustomMessage lambda is configured", () => {
@@ -41,6 +130,15 @@ describe("messages service", () => {
             emailSubject: "email subject",
             emailMessage: "email",
           });
+
+          expect(mockTriggers.customMessage).toHaveBeenCalledWith({
+            clientId: "clientId",
+            code: "1234",
+            source: "CustomMessage_ForgotPassword",
+            userAttributes: user.Attributes,
+            userPoolId: "userPoolId",
+            username: user.Username,
+          });
         });
       });
 
@@ -62,6 +160,15 @@ describe("messages service", () => {
           expect(message).toMatchObject({
             __code: "1234",
           });
+
+          expect(mockTriggers.customMessage).toHaveBeenCalledWith({
+            clientId: "clientId",
+            code: "1234",
+            source: "CustomMessage_ForgotPassword",
+            userAttributes: user.Attributes,
+            userPoolId: "userPoolId",
+            username: user.Username,
+          });
         });
       });
     });
@@ -81,6 +188,8 @@ describe("messages service", () => {
         expect(message).toMatchObject({
           __code: "1234",
         });
+
+        expect(mockTriggers.customMessage).not.toHaveBeenCalled();
       });
     });
   });

diff --git a/src/services/messages.ts b/src/services/messages.ts
@@ -9,7 +9,12 @@ export interface Message {
 }
 
 export interface Messages {
-  authentication(code: string): Promise<Message>;
+  authentication(
+    clientId: string,
+    userPoolId: string,
+    user: User,
+    code: string
+  ): Promise<Message>;
   forgotPassword(
     clientId: string,
     userPoolId: string,
@@ -31,8 +36,32 @@ export class MessagesService implements Messages {
     this.triggers = triggers;
   }
 
-  public authentication(code: string): Promise<Message> {
-    return stubMessage(code);
+  public async authentication(
+    clientId: string,
+    userPoolId: string,
+    user: User,
+    code: string
+  ): Promise<Message> {
+    if (this.triggers.enabled("CustomMessage")) {
+      const message = await this.triggers.customMessage({
+        clientId,
+        code,
+        source: "CustomMessage_Authentication",
+        userAttributes: user.Attributes,
+        username: user.Username,
+        userPoolId,
+      });
+
+      return {
+        __code: code,
+        ...message,
+      };
+    }
+
+    // TODO: What should the default message be?
+    return {
+      __code: code,
+    };
   }
 
   public async forgotPassword(

diff --git a/src/targets/initiateAuth.test.ts b/src/targets/initiateAuth.test.ts
@@ -292,6 +292,12 @@ describe("InitiateAuth target", () => {
 
             expect(output).toBeDefined();
 
+            expect(mockMessages.authentication).toHaveBeenCalledWith(
+              "clientId",
+              "test",
+              user,
+              "1234"
+            );
             expect(mockMessageDelivery.deliver).toHaveBeenCalledWith(
               user,
               {

diff --git a/src/targets/initiateAuth.ts b/src/targets/initiateAuth.ts
@@ -51,7 +51,12 @@ const verifyMfaChallenge = async (
   }
 
   const code = otp();
-  const message = await messages.authentication(code);
+  const message = await messages.authentication(
+    req.ClientId,
+    userPool.config.Id,
+    user,
+    code
+  );
   await messageDelivery.deliver(
     user,
     {