Merge pull request #656 from govuk-one-login/dependabot/npm_and_yarn/production-dependencies-ef3d59e1c5

liegeandlief · web-flow · commit 8a79738c3c4b · 2026-04-08T08:19:11.000Z
BAU: Bump the production-dependencies group with 10 updates
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -9,14 +9,14 @@
     "@aws-lambda-powertools/logger": "^2.32.0",
     "@aws-lambda-powertools/metrics": "^2.32.0",
     "@aws-lambda-powertools/parameters": "^2.32.0",
-    "@aws-sdk/client-appconfigdata": "^3.1015.0",
-    "@aws-sdk/client-dynamodb": "^3.1015.0",
-    "@aws-sdk/client-kms": "^3.1015.0",
-    "@aws-sdk/client-s3": "^3.1015.0",
-    "@aws-sdk/client-secrets-manager": "^3.1015.0",
-    "@aws-sdk/client-sqs": "^3.1015.0",
-    "@aws-sdk/client-ssm": "^3.1015.0",
-    "@aws-sdk/lib-dynamodb": "^3.1015.0",
+    "@aws-sdk/client-appconfigdata": "^3.1021.0",
+    "@aws-sdk/client-dynamodb": "^3.1021.0",
+    "@aws-sdk/client-kms": "^3.1021.0",
+    "@aws-sdk/client-s3": "^3.1021.0",
+    "@aws-sdk/client-secrets-manager": "^3.1021.0",
+    "@aws-sdk/client-sqs": "^3.1021.0",
+    "@aws-sdk/client-ssm": "^3.1021.0",
+    "@aws-sdk/lib-dynamodb": "^3.1021.0",
     "@fastify/aws-lambda": "^6.4.0",
     "@fastify/cookie": "^11.0.2",
     "@fastify/csrf-protection": "^7.1.0",
@@ -37,7 +37,7 @@
     "fastify": "^5.8.3",
     "fastify-plugin": "^5.1.0",
     "govuk-frontend": "^5.14.0",
-    "i18next": "^26.0.2",
+    "i18next": "^26.0.3",
     "i18next-http-middleware": "^3.9.2",
     "jose": "^6.2.2",
     "notifications-node-client": "^8.3.2",
diff --git a/solutions/api/src/lambda/healthcheck.test.ts b/solutions/api/src/lambda/healthcheck.test.ts
@@ -15,9 +15,9 @@ vi.mock(import("../../../commons/utils/metrics/index.js"), () => ({
 }));
 
 vi.mock(
-  import("../../../commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.js"),
+  import("../../../commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.js"),
   () => ({
-    normalizeAPIGatewayProxyEventHeadersHandlerWrapper: (fn) => fn,
+    normalizeAPIGatewayProxyEventHandlerWrapper: (fn) => fn,
   }),
 );
 
diff --git a/solutions/api/src/lambda/healthcheck.ts b/solutions/api/src/lambda/healthcheck.ts
@@ -1,9 +1,9 @@
 import type { APIGatewayProxyResult } from "aws-lambda";
 import { loggerAPIGatewayProxyHandlerWrapper } from "../../../commons/utils/logger/index.js";
 import { metricsAPIGatewayProxyHandlerWrapper } from "../../../commons/utils/metrics/index.js";
-import { normalizeAPIGatewayProxyEventHeadersHandlerWrapper } from "../../../commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.js";
+import { normalizeAPIGatewayProxyEventHandlerWrapper } from "../../../commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.js";
 
-export const handler = normalizeAPIGatewayProxyEventHeadersHandlerWrapper(
+export const handler = normalizeAPIGatewayProxyEventHandlerWrapper(
   loggerAPIGatewayProxyHandlerWrapper(
     metricsAPIGatewayProxyHandlerWrapper(
       async (): Promise<APIGatewayProxyResult> => {
diff --git a/solutions/api/src/lambda/journeyoutcome/index.test.ts b/solutions/api/src/lambda/journeyoutcome/index.test.ts
@@ -71,9 +71,9 @@ vi.mock(import("../../../../commons/utils/logger/index.js"), () => ({
 }));
 
 vi.mock(
-  import("../../../../commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.js"),
+  import("../../../../commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.js"),
   () => ({
-    normalizeAPIGatewayProxyEventHeadersHandlerWrapper: (fn) => fn,
+    normalizeAPIGatewayProxyEventHandlerWrapper: (fn) => fn,
   }),
 );
 
diff --git a/solutions/api/src/lambda/journeyoutcome/index.ts b/solutions/api/src/lambda/journeyoutcome/index.ts
@@ -10,9 +10,9 @@ import { validateJourneyOutcomeJwtClaims } from "./utils/validateJourneyOutcomeJ
 import { loggerAPIGatewayProxyHandlerWrapper } from "../../../../commons/utils/logger/index.js";
 import { getJourneyOutcome } from "./utils/getJourneyOutcome.js";
 import type { JourneyOutcomePayload } from "./utils/interfaces.js";
-import { normalizeAPIGatewayProxyEventHeadersHandlerWrapper } from "../../../../commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.js";
+import { normalizeAPIGatewayProxyEventHandlerWrapper } from "../../../../commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.js";
 
-export const handler = normalizeAPIGatewayProxyEventHeadersHandlerWrapper(
+export const handler = normalizeAPIGatewayProxyEventHandlerWrapper(
   loggerAPIGatewayProxyHandlerWrapper(
     metricsAPIGatewayProxyHandlerWrapper(
       async (event: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
diff --git a/solutions/api/src/lambda/token/index.test.ts b/solutions/api/src/lambda/token/index.test.ts
@@ -38,9 +38,9 @@ vi.mock(import("../../../../commons/utils/logger/index.js"), () => ({
 }));
 
 vi.mock(
-  import("../../../../commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.js"),
+  import("../../../../commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.js"),
   () => ({
-    normalizeAPIGatewayProxyEventHeadersHandlerWrapper: (fn) => fn,
+    normalizeAPIGatewayProxyEventHandlerWrapper: (fn) => fn,
   }),
 );
 
diff --git a/solutions/api/src/lambda/token/index.ts b/solutions/api/src/lambda/token/index.ts
@@ -11,9 +11,9 @@ import { verifyJti } from "./utils/verifyJti.js";
 import { loggerAPIGatewayProxyHandlerWrapper } from "../../../../commons/utils/logger/index.js";
 import { createAccessToken } from "./utils/createAccessToken.js";
 import { getApiBaseUrlWithStage } from "../../utils/common.js";
-import { normalizeAPIGatewayProxyEventHeadersHandlerWrapper } from "../../../../commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.js";
+import { normalizeAPIGatewayProxyEventHandlerWrapper } from "../../../../commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.js";
 
-export const handler = normalizeAPIGatewayProxyEventHeadersHandlerWrapper(
+export const handler = normalizeAPIGatewayProxyEventHandlerWrapper(
   loggerAPIGatewayProxyHandlerWrapper(
     metricsAPIGatewayProxyHandlerWrapper(
       async (e: APIGatewayProxyEvent): Promise<APIGatewayProxyResult> => {
diff --git a/solutions/commons/utils/metrics/index.test.ts b/solutions/commons/utils/metrics/index.test.ts
@@ -36,7 +36,7 @@ describe("metricsAPIGatewayProxyHandlerWrapper", () => {
     expect(result).toStrictEqual({ statusCode: 200, body: "success" });
   });
 
-  it("returns 500 response and flushes metrics when handler throws", async () => {
+  it("flushes metrics and re-throws when handler throws", async () => {
     const mockHandler = vi.fn().mockRejectedValue(new Error("handler error"));
     const publishSpy = vi.spyOn(metrics, "publishStoredMetrics");
     const coldStartSpy = vi.spyOn(metrics, "captureColdStartMetric");
@@ -50,7 +50,9 @@ describe("metricsAPIGatewayProxyHandlerWrapper", () => {
     } as APIGatewayProxyEvent;
     const mockContext = {} as Context;
 
-    const result = await wrappedHandler(mockEvent, mockContext);
+    await expect(wrappedHandler(mockEvent, mockContext)).rejects.toThrow(
+      "handler error",
+    );
 
     expect(mockHandler).toHaveBeenCalledWith(mockEvent, mockContext);
     expect(addDimensionsSpy).toHaveBeenCalledWith({
@@ -59,6 +61,5 @@ describe("metricsAPIGatewayProxyHandlerWrapper", () => {
     });
     expect(coldStartSpy).toHaveBeenCalledTimes(1);
     expect(publishSpy).toHaveBeenCalledTimes(1);
-    expect(result).toStrictEqual({ statusCode: 500, body: "" });
   });
 });
diff --git a/solutions/commons/utils/metrics/index.ts b/solutions/commons/utils/metrics/index.ts
@@ -1,6 +1,5 @@
 import { Metrics } from "@aws-lambda-powertools/metrics";
 import type { APIGatewayProxyHandler } from "../interfaces.js";
-import { logger } from "../logger/index.js";
 
 export const metrics = new Metrics({
   namespace: "account-components",
@@ -20,13 +19,9 @@ export const metricsAPIGatewayProxyHandlerWrapper = (
       metrics.publishStoredMetrics();
       return res;
     } catch (error) {
-      logger.error("An error occurred", { error });
       metrics.captureColdStartMetric();
       metrics.publishStoredMetrics();
-      return {
-        statusCode: 500,
-        body: "",
-      };
+      throw error;
     }
   };
   return wrappedHandler;
diff --git a/solutions/commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.test.ts b/solutions/commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.test.ts
@@ -0,0 +1,199 @@
+import { describe, it, expect, vi } from "vitest";
+import type { APIGatewayProxyEvent, Context } from "aws-lambda";
+import { normalizeAPIGatewayProxyEventHandlerWrapper } from "./index.js";
+
+const baseEvent = {
+  headers: {},
+  multiValueHeaders: {},
+} as APIGatewayProxyEvent;
+
+const mockContext = {} as Context;
+
+const mockResponse = { statusCode: 200, body: "" };
+
+describe("normalizeAPIGatewayProxyEventHandlerWrapper", () => {
+  it("lowercases header keys", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      {
+        ...baseEvent,
+        headers: { "Content-Type": "application/json", Accept: "text/html" },
+        multiValueHeaders: {
+          "Content-Type": ["application/json"],
+          Accept: ["text/html"],
+        },
+      },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        headers: { "content-type": "application/json", accept: "text/html" },
+        multiValueHeaders: {
+          "content-type": ["application/json"],
+          accept: ["text/html"],
+        },
+      }),
+      mockContext,
+    );
+  });
+
+  it("merges duplicate multi-value headers with different cases", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      {
+        ...baseEvent,
+        multiValueHeaders: {
+          Accept: ["text/html"],
+          accept: ["application/json"],
+        },
+      },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        multiValueHeaders: { accept: ["text/html", "application/json"] },
+      }),
+      mockContext,
+    );
+  });
+
+  it("sets multi-value header to undefined when value is undefined", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      { ...baseEvent, multiValueHeaders: { Accept: undefined } },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        multiValueHeaders: { accept: undefined },
+      }),
+      mockContext,
+    );
+  });
+
+  it("lowercases query string parameter keys", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      {
+        ...baseEvent,
+        queryStringParameters: { Foo: "bar", Baz: "qux" },
+        multiValueQueryStringParameters: {
+          Foo: ["bar"],
+          Baz: ["qux"],
+        },
+      },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        queryStringParameters: { foo: "bar", baz: "qux" },
+        multiValueQueryStringParameters: {
+          foo: ["bar"],
+          baz: ["qux"],
+        },
+      }),
+      mockContext,
+    );
+  });
+
+  it("merges duplicate multi-value query string parameters with different cases", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      {
+        ...baseEvent,
+        multiValueQueryStringParameters: {
+          Foo: ["bar"],
+          foo: ["baz"],
+        },
+      },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        multiValueQueryStringParameters: { foo: ["bar", "baz"] },
+      }),
+      mockContext,
+    );
+  });
+
+  it("sets multi-value query string parameter to undefined when value is undefined", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      {
+        ...baseEvent,
+        multiValueQueryStringParameters: { Foo: undefined },
+      },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        multiValueQueryStringParameters: { foo: undefined },
+      }),
+      mockContext,
+    );
+  });
+
+  it("handles null query string parameters", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      {
+        ...baseEvent,
+        queryStringParameters: null,
+        multiValueQueryStringParameters: null,
+      },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({
+        queryStringParameters: {},
+        multiValueQueryStringParameters: {},
+      }),
+      mockContext,
+    );
+  });
+
+  it("returns the handler response", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    const result = await wrapped(baseEvent, mockContext);
+
+    expect(result).toStrictEqual(mockResponse);
+  });
+
+  it("preserves other event properties", async () => {
+    const handler = vi.fn().mockResolvedValue(mockResponse);
+    const wrapped = normalizeAPIGatewayProxyEventHandlerWrapper(handler);
+
+    await wrapped(
+      { ...baseEvent, httpMethod: "GET", path: "/test" },
+      mockContext,
+    );
+
+    expect(handler).toHaveBeenCalledWith(
+      expect.objectContaining({ httpMethod: "GET", path: "/test" }),
+      mockContext,
+    );
+  });
+});
diff --git a/solutions/commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.ts b/solutions/commons/utils/normalizeAPIGatewayProxyEventHandlerWrapper/index.ts
@@ -1,6 +1,6 @@
 import type { APIGatewayProxyHandler } from "../interfaces.js";
 
-export const normalizeAPIGatewayProxyEventHeadersHandlerWrapper = (
+export const normalizeAPIGatewayProxyEventHandlerWrapper = (
   handler: APIGatewayProxyHandler,
 ): APIGatewayProxyHandler => {
   const wrappedHandler: APIGatewayProxyHandler = async (event, context) => {
@@ -21,11 +21,38 @@ export const normalizeAPIGatewayProxyEventHeadersHandlerWrapper = (
       normalizedMultiHeaders[lowercaseKey] = values.length ? values : undefined;
     }
 
+    const normalizedQueryStringParameters: (typeof event)["queryStringParameters"] =
+      {};
+    const normalizedMultiQueryStringParameters: (typeof event)["multiValueQueryStringParameters"] =
+      {};
+
+    for (const [key, value] of Object.entries(
+      event.queryStringParameters ?? {},
+    )) {
+      normalizedQueryStringParameters[key.toLowerCase()] = value;
+    }
+
+    for (const [key, value] of Object.entries(
+      event.multiValueQueryStringParameters ?? {},
+    )) {
+      const lowercaseKey = key.toLowerCase();
+
+      const values = [
+        ...(normalizedMultiQueryStringParameters[lowercaseKey] ?? []),
+        ...(value ?? []),
+      ];
+      normalizedMultiQueryStringParameters[lowercaseKey] = values.length
+        ? values
+        : undefined;
+    }
+
     const res = await handler(
       {
         ...event,
         headers: normalizedHeaders,
         multiValueHeaders: normalizedMultiHeaders,
+        queryStringParameters: normalizedQueryStringParameters,
+        multiValueQueryStringParameters: normalizedMultiQueryStringParameters,
       },
       context,
     );
diff --git a/solutions/commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.test.ts b/solutions/commons/utils/normalizeAPIGatewayProxyEventHeadersHandlerWrapper/index.test.ts
diff --git a/solutions/frontend/src/lambda.ts b/solutions/frontend/src/lambda.ts
diff --git a/solutions/stubs/src/lambda.ts b/solutions/stubs/src/lambda.ts
