Fix: [AEA-0000] - remove uuid (#2244)

## Summary

- Routine Change

### Details

- remove uuid

Author: anthony-nhs

package-lock.json

@@ -24,8 +24,7 @@
     "axios": "^1.12.2",
     "axios-retry": "^4.5.0",
     "jose": "^6.1.0",
-    "nock": "^14.0.10",
-    "uuid": "^13.0.0"
+    "nock": "^14.0.10"
   },
   "devDependencies": {
     "@PrescriptionStatusUpdate_common/testing": "^1.0.0",

packages/nhsNotifyLambda/package.json

@@ -3,7 +3,6 @@ import {getSecret} from "@aws-lambda-powertools/parameters/secrets"
 import {AxiosInstance} from "axios"
 
 import {SignJWT, importPKCS8} from "jose"
-import {v4 as uuidv4} from "uuid"
 
 /**
  * Exchange API key + JWT for a bearer token from NHS Notify.
@@ -30,7 +29,7 @@ export async function tokenExchange(
   // create and sign the JWT
   const alg = "RS512"
   const now = Math.floor(Date.now() / 1000)
-  const jti = uuidv4()
+  const jti = crypto.randomUUID()
 
   const key = await importPKCS8(PRIVATE_KEY, alg)
 

packages/nhsNotifyLambda/src/utils/auth.ts

@@ -1,7 +1,6 @@
 import {Logger} from "@aws-lambda-powertools/logger"
 
 import axios from "axios"
-import {v4} from "uuid"
 
 import {setupAxios} from "./axios"
 import {
@@ -95,7 +94,7 @@ async function makeFakeNotifyRequest(
   await new Promise(f => setTimeout(f, DUMMY_NOTIFY_DELAY_MS))
 
   const messageStatus = "silent running"
-  const messageBatchReference = v4()
+  const messageBatchReference = crypto.randomUUID()
 
   logger.info("Requested notifications OK!", {
     messageBatchReference,
@@ -113,7 +112,7 @@ async function makeFakeNotifyRequest(
       ...item,
       messageBatchReference,
       messageStatus,
-      notifyMessageId: v4() // Create a dummy UUID
+      notifyMessageId: crypto.randomUUID() // Create a dummy UUID
     }
   })
 }
@@ -137,7 +136,7 @@ export async function makeRealNotifyRequest(
 ): Promise<Array<NotifyDataItemMessage>> {
 
   // Shared between all messages in this batch
-  const messageBatchReference = v4()
+  const messageBatchReference = crypto.randomUUID()
 
   const body: CreateMessageBatchRequest = {
     data: {

packages/nhsNotifyLambda/src/utils/notify.ts

@@ -7,8 +7,6 @@ import {
 } from "@aws-sdk/client-sqs"
 import {Logger} from "@aws-lambda-powertools/logger"
 
-import {v4} from "uuid"
-
 import {NotifyDataItem} from "@PrescriptionStatusUpdate_common/commonTypes"
 
 import {NotifyDataItemMessage} from "./types"
@@ -122,7 +120,7 @@ export async function drainQueue(
             ...m,
             PSUDataItem: parsedBody,
             messageBatchReference: undefined, // Only populated when notify request is made
-            messageReference: v4()
+            messageReference: crypto.randomUUID()
           }
         ]
       } catch (error) {

packages/nhsNotifyLambda/src/utils/sqs.ts

@@ -21,12 +21,6 @@ jest.unstable_mockModule("jose", async () => ({
   SignJWT: mockSignJWTConstructor
 }))
 
-const mockUuidv4 = jest.fn()
-jest.unstable_mockModule("uuid", async () => ({
-  __esModule: true,
-  v4: mockUuidv4
-}))
-
 let tokenExchange: (logger: Logger, axiosInstance: AxiosInstance, host: string) => Promise<string>
 beforeAll(async () => {
   ({tokenExchange} = await import("../src/utils/auth"))
@@ -69,9 +63,6 @@ describe("tokenExchange", () => {
     }
     mockSignJWTConstructor.mockImplementation(() => fakeJwtInstance)
 
-    // Mock uuid
-    mockUuidv4.mockReturnValue("uuid-1234")
-
     // Mock the HTTP call
     nock(`${host}`)
       .post("/oauth2/token", (body) => {
@@ -123,7 +114,6 @@ describe("tokenExchange", () => {
       },
       sign: jest.fn().mockImplementation(() => Promise.resolve("jwt-tkn"))
     }))
-    mockUuidv4.mockReturnValue("uid")
 
     nock(`${host}`)
       .post("/oauth2/token")
@@ -149,7 +139,6 @@ describe("tokenExchange", () => {
       },
       sign: jest.fn().mockImplementation(() => Promise.resolve("jwt-tkn"))
     }))
-    mockUuidv4.mockReturnValue("uid")
 
     nock(`${host}`)
       .post("/oauth2/token")

packages/nhsNotifyLambda/tests/testAuth.test.ts

@@ -2,8 +2,6 @@ import {jest} from "@jest/globals"
 
 import * as sqs from "@aws-sdk/client-sqs"
 
-import {v4} from "uuid"
-
 import {PSUDataItem} from "@PrescriptionStatusUpdate_common/commonTypes"
 import {NotifyDataItemMessage} from "../src/utils"
 
@@ -25,7 +23,7 @@ export function constructMessage(overrides: Partial<sqs.Message> = {}): sqs.Mess
   return {
     MessageId: "messageId",
     Attributes: {
-      MessageDeduplicationId: v4()
+      MessageDeduplicationId: crypto.randomUUID()
     },
     Body: JSON.stringify(constructPSUDataItem()),
     ...overrides
@@ -36,9 +34,9 @@ export function constructPSUDataItemMessage(overrides: Partial<NotifyDataItemMes
   return {
     ...constructMessage(),
     PSUDataItem: constructPSUDataItem(),
-    messageBatchReference: v4(),
-    messageReference: v4(),
-    notifyMessageId: v4(),
+    messageBatchReference: crypto.randomUUID(),
+    messageReference: crypto.randomUUID(),
+    notifyMessageId: crypto.randomUUID(),
     ...overrides
   }
 }

packages/nhsNotifyLambda/tests/testHelpers.ts

@@ -22,8 +22,7 @@
     "@middy/core": "^6.4.5",
     "@middy/http-header-normalizer": "^6.4.5",
     "@middy/input-output-logger": "^6.4.5",
-    "@nhs/fhir-middy-error-handler": "^2.1.51",
-    "uuid": "^13.0.0"
+    "@nhs/fhir-middy-error-handler": "^2.1.51"
   },
   "devDependencies": {
     "@faker-js/faker": "^10.0.0",

packages/updatePrescriptionStatus/package.json

@@ -7,7 +7,6 @@ import {
 } from "@jest/globals"
 
 import {BundleEntry} from "fhir/r4"
-import {v4} from "uuid"
 
 import {badRequest, conflictDuplicate} from "../src/utils/responses"
 import {
@@ -210,7 +209,7 @@ describe("handleTransactionCancelledException", () => {
 describe("buildDataItems", () => {
   it("should uppercase LineItemId, PharmacyODSCode and PrescriptionID", () => {
     const task = validTask()
-    const lineItemID = v4().toUpperCase()
+    const lineItemID = crypto.randomUUID().toUpperCase()
     const pharmacyODSCode = "X26"
     const prescriptionID = "4F00A8-A83008-2EB4D"