Merge pull request #825 from govuk-one-login/OLH-4100

OLH-4100: dedicated Notify service for AMC

Author: martin-gwar

solutions/app-infra/template.yaml

@@ -81,8 +81,8 @@ Mappings:
       notifyStubUrl: https://stubs.manage.dev.account.gov.uk/notify
       notifyTemplateIds: |
         {
-          "CREATE_PASSKEY_WITH_PASSKEY_NAME": "aa8697b6-23e6-4317-9aff-5a274142e7f2",
-          "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME": "369a29fd-1e7b-4c1f-bd92-a08a51c99b2e"
+          "CREATE_PASSKEY_WITH_DISPLAY_NAME": "fb385d74-ac28-466d-8695-3d8a732a4cf8",
+          "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME": "d20ccbec-3eac-4669-993c-d3f892ecc0f6"
         }
       notificationsVisibilityTimeout: 120
       notificationsMaxReceiveCount: 5
@@ -115,8 +115,8 @@ Mappings:
       notifyStubUrl: https://stubs.manage.build.account.gov.uk/notify
       notifyTemplateIds: |
         {
-          "CREATE_PASSKEY_WITH_PASSKEY_NAME": "aa8697b6-23e6-4317-9aff-5a274142e7f2",
-          "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME": "369a29fd-1e7b-4c1f-bd92-a08a51c99b2e"
+          "CREATE_PASSKEY_WITH_DISPLAY_NAME": "fb385d74-ac28-466d-8695-3d8a732a4cf8",
+          "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME": "d20ccbec-3eac-4669-993c-d3f892ecc0f6"
         }
       notificationsVisibilityTimeout: 120
       notificationsMaxReceiveCount: 5
@@ -151,8 +151,8 @@ Mappings:
       notifyStubUrl: ""
       notifyTemplateIds: |
         {
-          "CREATE_PASSKEY_WITH_PASSKEY_NAME": "aa8697b6-23e6-4317-9aff-5a274142e7f2",
-          "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME": "369a29fd-1e7b-4c1f-bd92-a08a51c99b2e"
+          "CREATE_PASSKEY_WITH_DISPLAY_NAME": "fb385d74-ac28-466d-8695-3d8a732a4cf8",
+          "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME": "d20ccbec-3eac-4669-993c-d3f892ecc0f6"
         }
       notificationsVisibilityTimeout: 120
       notificationsMaxReceiveCount: 5
@@ -187,8 +187,8 @@ Mappings:
       notifyStubUrl: ""
       notifyTemplateIds: |
         {
-          "CREATE_PASSKEY_WITH_PASSKEY_NAME": "07fc5ed8-4775-4f03-b6cf-08a273458849",
-          "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME": "b6cec4ce-a23e-4132-87d8-952697c58851"
+          "CREATE_PASSKEY_WITH_DISPLAY_NAME": "aa8697b6-23e6-4317-9aff-5a274142e7f2",
+          "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME": "369a29fd-1e7b-4c1f-bd92-a08a51c99b2e"
         }
       notificationsVisibilityTimeout: 300
       notificationsMaxReceiveCount: 36
@@ -223,8 +223,8 @@ Mappings:
       notifyStubUrl: ""
       notifyTemplateIds: |
         {
-          "CREATE_PASSKEY_WITH_PASSKEY_NAME": "07fc5ed8-4775-4f03-b6cf-08a273458849",
-          "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME": "b6cec4ce-a23e-4132-87d8-952697c58851"
+          "CREATE_PASSKEY_WITH_DISPLAY_NAME": "07fc5ed8-4775-4f03-b6cf-08a273458849",
+          "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME": "b6cec4ce-a23e-4132-87d8-952697c58851"
         }
       notificationsVisibilityTimeout: 300
       notificationsMaxReceiveCount: 36

solutions/commons/utils/notifications/index.test.ts

@@ -26,7 +26,7 @@ describe("sendNotification", () => {
   it("should send message to SQS queue", async () => {
     const message = {
       emailAddress: "test@example.com",
-      notificationType: NotificationType.CREATE_PASSKEY_WITHOUT_PASSKEY_NAME,
+      notificationType: NotificationType.CREATE_PASSKEY_WITHOUT_DISPLAY_NAME,
     } as const;
 
     await sendNotification(message);
@@ -42,7 +42,7 @@ describe("sendNotification", () => {
 
     const message = {
       emailAddress: "test@example.com",
-      notificationType: NotificationType.CREATE_PASSKEY_WITHOUT_PASSKEY_NAME,
+      notificationType: NotificationType.CREATE_PASSKEY_WITHOUT_DISPLAY_NAME,
     } as const;
 
     await expect(sendNotification(message)).rejects.toThrow();

solutions/commons/utils/notifications/index.ts

@@ -3,8 +3,8 @@ import { getSqsClient } from "../awsClient/sqsClient/index.js";
 import assert from "node:assert";
 
 export enum NotificationType {
-  CREATE_PASSKEY_WITH_PASSKEY_NAME = "CREATE_PASSKEY_WITH_PASSKEY_NAME",
-  CREATE_PASSKEY_WITHOUT_PASSKEY_NAME = "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME",
+  CREATE_PASSKEY_WITH_DISPLAY_NAME = "CREATE_PASSKEY_WITH_DISPLAY_NAME",
+  CREATE_PASSKEY_WITHOUT_DISPLAY_NAME = "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME",
 }
 
 export const notifyTemplateIDsSchema = v.pipe(
@@ -17,7 +17,7 @@ export const messageSchema = v.variant("notificationType", [
   v.pipe(
     v.object({
       notificationType: v.literal(
-        NotificationType.CREATE_PASSKEY_WITH_PASSKEY_NAME,
+        NotificationType.CREATE_PASSKEY_WITH_DISPLAY_NAME,
       ),
       emailAddress: v.pipe(v.string(), v.email()),
       passkeyName: v.string(),
@@ -36,7 +36,7 @@ export const messageSchema = v.variant("notificationType", [
   v.pipe(
     v.object({
       notificationType: v.literal(
-        NotificationType.CREATE_PASSKEY_WITHOUT_PASSKEY_NAME,
+        NotificationType.CREATE_PASSKEY_WITHOUT_DISPLAY_NAME,
       ),
       emailAddress: v.pipe(v.string(), v.email()),
     }),

solutions/frontend/src/journeys/passkey-create/handlers/create.test.ts

@@ -631,7 +631,7 @@ describe("passkey-create handlers", () => {
           "aaguid-123",
         );
         expect(mockSendNotification).toHaveBeenCalledWith({
-          notificationType: "CREATE_PASSKEY_WITH_PASSKEY_NAME",
+          notificationType: "CREATE_PASSKEY_WITH_DISPLAY_NAME",
           emailAddress: "test@example.com",
           passkeyName: "iCloud Keychain",
         });
@@ -651,7 +651,7 @@ describe("passkey-create handlers", () => {
           "aaguid-123",
         );
         expect(mockSendNotification).toHaveBeenCalledWith({
-          notificationType: "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME",
+          notificationType: "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME",
           emailAddress: "test@example.com",
         });
       });

solutions/frontend/src/journeys/passkey-create/handlers/create.ts

@@ -335,13 +335,13 @@ export async function postHandler(
   await sendNotification(
     passkeyConvenienceMetadata
       ? {
-          notificationType: NotificationType.CREATE_PASSKEY_WITH_PASSKEY_NAME,
+          notificationType: NotificationType.CREATE_PASSKEY_WITH_DISPLAY_NAME,
           emailAddress: request.session.claims.email,
           passkeyName: passkeyConvenienceMetadata.name,
         }
       : {
           notificationType:
-            NotificationType.CREATE_PASSKEY_WITHOUT_PASSKEY_NAME,
+            NotificationType.CREATE_PASSKEY_WITHOUT_DISPLAY_NAME,
           emailAddress: request.session.claims.email,
         },
   );

solutions/stubs/src/notify/handlers/sendEmail.test.ts

@@ -4,8 +4,8 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 vi.mock(import("../../../../commons/utils/logger/index.js"));
 
 const mockTemplateIds = {
-  CREATE_PASSKEY_WITH_PASSKEY_NAME: "template-id-1",
-  CREATE_PASSKEY_WITHOUT_PASSKEY_NAME: "template-id-2",
+  CREATE_PASSKEY_WITH_DISPLAY_NAME: "template-id-1",
+  CREATE_PASSKEY_WITHOUT_DISPLAY_NAME: "template-id-2",
 };
 
 describe("sendEmailPostHandler", () => {
@@ -47,7 +47,7 @@ describe("sendEmailPostHandler", () => {
     expect(logger.info).toHaveBeenCalledWith("NotifySendEmailCalled", {
       reference: "test-reference",
       templateId: "template-id-1",
-      template: "CREATE_PASSKEY_WITH_PASSKEY_NAME",
+      template: "CREATE_PASSKEY_WITH_DISPLAY_NAME",
     });
     expect(mockReply.send).toHaveBeenCalledWith({
       data: {
@@ -68,7 +68,7 @@ describe("sendEmailPostHandler", () => {
     expect(logger.info).toHaveBeenCalledWith("NotifySendEmailCalled", {
       reference: undefined,
       templateId: "template-id-2",
-      template: "CREATE_PASSKEY_WITHOUT_PASSKEY_NAME",
+      template: "CREATE_PASSKEY_WITHOUT_DISPLAY_NAME",
     });
     expect(mockReply.send).toHaveBeenCalledWith({
       data: {