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

anthony-nhs · web-flow · commit 848d27ddb2af · 2025-09-29T12:52:51.000+01:00
## Summary

- Routine Change

### Details

- remove uuid
diff --git a/.vscode/eps-prescription-tracker-ui.code-workspace b/.vscode/eps-prescription-tracker-ui.code-workspace
@@ -176,7 +176,6 @@
         "Truststore",
         "URID",
         "URPID",
-        "uuidv4",
         "vars",
         "venv",
         "versionable",
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cognito/package.json b/packages/cognito/package.json
@@ -26,8 +26,7 @@
     "aws-lambda": "^1.0.7",
     "axios": "^1.12.2",
     "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.2.0",
-    "uuid": "11.1.0"
+    "jwks-rsa": "^3.2.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.152",
diff --git a/packages/cognito/src/helpers.ts b/packages/cognito/src/helpers.ts
@@ -1,7 +1,6 @@
 import {Logger} from "@aws-lambda-powertools/logger"
 import jwt from "jsonwebtoken"
 import {ParsedUrlQuery} from "querystring"
-import {v4 as uuidv4} from "uuid"
 
 export function rewriteRequestBody(
   logger: Logger,
@@ -23,7 +22,7 @@ export function rewriteRequestBody(
     "aud": idpTokenPath,
     "iat": current_time,
     "exp": expiration_time,
-    "jti": uuidv4()
+    "jti": crypto.randomUUID()
   }
 
   const signOptions: jwt.SignOptions = {
diff --git a/packages/cognito/src/tokenMock.ts b/packages/cognito/src/tokenMock.ts
@@ -11,7 +11,6 @@ import {PrivateKey} from "jsonwebtoken"
 import {exchangeTokenForApigeeAccessToken, fetchUserInfo, initializeOidcConfig} from "@cpt-ui-common/authFunctions"
 import {insertTokenMapping, getSessionState, tryGetTokenMapping} from "@cpt-ui-common/dynamoFunctions"
 import {MiddyErrorHandler} from "@cpt-ui-common/middyErrorHandler"
-import {v4 as uuidv4} from "uuid"
 import jwt from "jsonwebtoken"
 import axios from "axios"
 
@@ -122,7 +121,7 @@ const lambdaHandler = async (event: APIGatewayProxyEvent): Promise<APIGatewayPro
   const current_time = Math.floor(Date.now() / 1000)
   const expirationTime = current_time + 600
   const baseUsername = userInfoResponse.user_details.sub
-  const sessionId = uuidv4()
+  const sessionId = crypto.randomUUID()
 
   const jwtClaims = {
     exp: expirationTime,
diff --git a/packages/common/authFunctions/package.json b/packages/common/authFunctions/package.json
@@ -25,7 +25,6 @@
     "@middy/core": "^6.4.5",
     "aws-lambda": "^1.0.7",
     "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.2.0",
-    "uuid": "^11.1.0"
+    "jwks-rsa": "^3.2.0"
   }
 }
diff --git a/packages/common/authFunctions/src/apigee.ts b/packages/common/authFunctions/src/apigee.ts
@@ -1,6 +1,5 @@
 import {Logger} from "@aws-lambda-powertools/logger"
 import jwt from "jsonwebtoken"
-import {v4 as uuidv4} from "uuid"
 import axios, {AxiosInstance} from "axios"
 import {ParsedUrlQuery, stringify} from "querystring"
 import {handleAxiosError} from "./errorUtils"
@@ -13,7 +12,7 @@ export function buildApigeeHeaders(apigeeAccessToken: string, roleId: string, or
   return {
     Authorization: `Bearer ${apigeeAccessToken}`,
     "nhsd-session-urid": roleId,
-    "x-request-id": uuidv4(),
+    "x-request-id": crypto.randomUUID(),
     "nhsd-session-jobrole": roleId,
     "nhsd-identity-uuid": roleId, //TODO potentially remove this line
     "nhsd-organization-uuid": orgCode,
@@ -50,7 +49,7 @@ export function constructSignedJWTBody(
     aud: idpTokenPath,
     iat: current_time,
     exp: expiration_time,
-    jti: uuidv4()
+    jti: crypto.randomUUID()
   }
 
   const signOptions: jwt.SignOptions = {
diff --git a/packages/common/authFunctions/tests/test_apigeeUtils.test.ts b/packages/common/authFunctions/tests/test_apigeeUtils.test.ts
@@ -6,9 +6,6 @@ import {Logger} from "@aws-lambda-powertools/logger"
 
 jest.mock("axios")
 jest.mock("jsonwebtoken")
-jest.unstable_mockModule("uuid", () => ({
-  v4: jest.fn(() => "test-uuid")
-}))
 
 const mockGetTokenMapping = jest.fn()
 const mockUpdateTokenMapping = jest.fn()
@@ -33,7 +30,13 @@ const {exchangeTokenForApigeeAccessToken,
 describe("apigeeUtils", () => {
   const mockAxiosPost = jest.fn();
   (axios.post as unknown as jest.Mock) = mockAxiosPost
+  beforeAll(() => {
+    jest.spyOn(global.crypto, "randomUUID").mockReturnValue("test-uuid-in-uuid-format")
+  })
 
+  afterAll(() => {
+    jest.restoreAllMocks()
+  })
   beforeEach(() => {
     jest.clearAllMocks()
   })
@@ -52,7 +55,7 @@ describe("apigeeUtils", () => {
         "nhsd-identity-uuid": roleId,
         "nhsd-session-jobrole": roleId,
         "x-correlation-id": correlationId,
-        "x-request-id": "test-uuid"
+        "x-request-id": "test-uuid-in-uuid-format"
       }
 
       const headers = buildApigeeHeaders(apigeeAccessToken, roleId, orgCode, correlationId)
diff --git a/packages/common/lambdaUtils/package.json b/packages/common/lambdaUtils/package.json
@@ -17,7 +17,6 @@
     "@aws-lambda-powertools/logger": "^2.27.0",
     "@cpt-ui-common/common-types": "^1.0.0",
     "aws-lambda": "^1.0.7",
-    "axios": "^1.12.2",
-    "uuid": "^11.1.0"
+    "axios": "^1.12.2"
   }
 }
diff --git a/packages/common/lambdaUtils/src/index.ts b/packages/common/lambdaUtils/src/index.ts
@@ -1,5 +1,4 @@
 import {APIGatewayProxyEvent} from "aws-lambda"
-import {v4 as uuidv4} from "uuid"
 import {Logger} from "@aws-lambda-powertools/logger"
 import {Headers} from "@cpt-ui-common/common-types"
 
@@ -18,7 +17,7 @@ export type InboundEventValues = {
   correlationId: string
 }
 export const extractInboundEventValues = (event: APIGatewayProxyEvent): InboundEventValues => {
-  const correlationId = event.headers["x-correlation-id"] || uuidv4()
+  const correlationId = event.headers["x-correlation-id"] || crypto.randomUUID()
   return {
     loggerKeys: {
       "apigw-request-id": event.requestContext?.requestId,
diff --git a/packages/common/pdsClient/package.json b/packages/common/pdsClient/package.json
@@ -19,8 +19,7 @@
     "@cpt-ui-common/lambdaUtils": "^1.0.0",
     "ajv": "^8.17.1",
     "axios": "^1.12.2",
-    "json-schema-to-ts": "^3.1.1",
-    "uuid": "11.1.0"
+    "json-schema-to-ts": "^3.1.1"
   },
   "devDependencies": {
     "@cpt-ui-common/testing": "^1.0.0",
diff --git a/packages/common/pdsClient/src/client.ts b/packages/common/pdsClient/src/client.ts
@@ -1,5 +1,4 @@
 import {AxiosInstance} from "axios"
-import {v4 as uuidv4} from "uuid"
 import {Logger} from "@aws-lambda-powertools/logger"
 
 import {patientDetailsLookup, patientSearch, axios} from "."
@@ -41,7 +40,7 @@ export class Client implements clientInterface, patientDetailsLookup.Interface,
       Authorization: `Bearer ${this.apigeeAccessToken}`,
       "NHSD-End-User-Organisation-ODS": this.orgCode!,
       "NHSD-Session-URID": this.roleId!,
-      "x-Request-ID": uuidv4(),
+      "x-Request-ID": crypto.randomUUID(),
       "X-Correlation-ID": this.correlationId!
     }
   }
diff --git a/packages/cpt-ui/__tests__/axios.test.tsx b/packages/cpt-ui/__tests__/axios.test.tsx
@@ -1,7 +1,6 @@
 import http from "@/helpers/axios"
 import {fetchAuthSession} from "aws-amplify/auth"
 import MockAdapter from "axios-mock-adapter"
-import {v4 as uuidv4} from "uuid"
 import {readItemGroupFromLocalStorage} from "@/helpers/useLocalStorageState"
 
 jest.mock("uuid", () => ({
@@ -30,14 +29,15 @@ describe("HTTP Axios Instance", () => {
   })
 
   it("adds X-request-id and x-correlation-id header with a UUID on every request", async () => {
-    (uuidv4 as jest.Mock)
-      .mockReturnValueOnce("test-x-request-id")
-      .mockReturnValueOnce("test-x-correlation-id")
+    // eslint-disable-next-line no-undef
+    jest.spyOn(global.crypto, "randomUUID")
+      .mockReturnValueOnce("test-x-request-id-1")
+      .mockReturnValueOnce("test-x-correlation-id-1")
     mock.onGet("/test").reply((config) => {
       // 'config.headers' is possibly 'undefined'.
       // Cannot invoke an object which is possibly 'undefined'.ts(2722)
-      expect(config.headers?.["x-request-id"]).toBe("test-x-request-id")
-      expect(config.headers?.["x-correlation-id"]).toBe("test-x-correlation-id")
+      expect(config.headers?.["x-request-id"]).toBe("test-x-request-id-1")
+      expect(config.headers?.["x-correlation-id"]).toBe("test-x-correlation-id-1")
       return [200, {success: true}]
     })
 
diff --git a/packages/cpt-ui/package.json b/packages/cpt-ui/package.json
@@ -24,8 +24,7 @@
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.30.1",
-    "sass": "^1.93.2",
-    "uuid": "11.1.0"
+    "sass": "^1.93.2"
   },
   "devDependencies": {
     "@aws-amplify/auth": "^6.15.1",
diff --git a/packages/cpt-ui/src/helpers/axios.tsx b/packages/cpt-ui/src/helpers/axios.tsx
@@ -1,5 +1,4 @@
 import axios, {AxiosError, InternalAxiosRequestConfig, isAxiosError} from "axios"
-import {v4 as uuidv4} from "uuid"
 import {fetchAuthSession} from "aws-amplify/auth"
 import {logger} from "./logger"
 import {cptAwsRum} from "./awsRum"
@@ -40,8 +39,8 @@ http.interceptors.request.use(
   async (config: InternalAxiosRequestConfig) => {
     const controller = new AbortController()
 
-    config.headers[Headers.x_request_id] = uuidv4()
-    config.headers[Headers.x_correlation_id] = uuidv4()
+    config.headers[Headers.x_request_id] = crypto.randomUUID()
+    config.headers[Headers.x_correlation_id] = crypto.randomUUID()
     config.headers[Headers.x_rum_session_id] = getRumSessionIdFromCookie()
     try {
       const sessionGroup = readItemGroupFromLocalStorage("sessionId")
diff --git a/packages/prescriptionDetailsLambda/package.json b/packages/prescriptionDetailsLambda/package.json
@@ -29,8 +29,7 @@
     "aws-lambda": "^1.0.7",
     "axios": "^1.12.2",
     "jsonwebtoken": "^9.0.2",
-    "jwks-rsa": "^3.1.0",
-    "uuid": "11.1.0"
+    "jwks-rsa": "^3.1.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "^8.10.152",
diff --git a/packages/prescriptionListLambda/package.json b/packages/prescriptionListLambda/package.json
@@ -24,8 +24,7 @@
     "@middy/http-header-normalizer": "^6.4.5",
     "@middy/input-output-logger": "^6.4.5",
     "aws-lambda": "^1.0.7",
-    "axios": "^1.12.2",
-    "uuid": "11.1.0"
+    "axios": "^1.12.2"
   },
   "devDependencies": {
     "@cpt-ui-common/common-types": "^1.0.0",
diff --git a/packages/prescriptionListLambda/src/services/prescriptionsLookupService.ts b/packages/prescriptionListLambda/src/services/prescriptionsLookupService.ts

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@`
`25`	`25`	`"@middy/core": "^6.4.5",`
`26`	`26`	`"aws-lambda": "^1.0.7",`
`27`	`27`	`"jsonwebtoken": "^9.0.2",`
`28`		`- "jwks-rsa": "^3.2.0",`
`29`		`- "uuid": "^11.1.0"`
	`28`	`+ "jwks-rsa": "^3.2.0"`
`30`	`29`	`}`
`31`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`"@aws-lambda-powertools/logger": "^2.27.0",`
`18`	`18`	`"@cpt-ui-common/common-types": "^1.0.0",`
`19`	`19`	`"aws-lambda": "^1.0.7",`
`20`		`- "axios": "^1.12.2",`
`21`		`- "uuid": "^11.1.0"`
	`20`	`+ "axios": "^1.12.2"`
`22`	`21`	`}`
`23`	`22`	`}`