Skip to content

Commit 39ef417

Browse files
authored
Merge branch 'main' into BAU-fix-cookie-scoping
2 parents b5a9ac1 + b9c49c4 commit 39ef417

5 files changed

Lines changed: 20 additions & 15 deletions

File tree

.github/dependabot.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ updates:
7676

7777
- package-ecosystem: docker
7878
directories:
79-
- "/**"
79+
- "/solutions/integration-tests"
80+
- "/solutions/localstack/local-kms"
81+
- "/solutions/localstack/localstack"
8082
schedule:
8183
interval: daily
8284
time: "03:00"

package-lock.json

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"@govuk-one-login/frontend-ui": "^5.1.2",
3030
"@simplewebauthn/browser": "^13.3.0",
3131
"@simplewebauthn/server": "^13.3.0",
32-
"@smithy/node-http-handler": "^4.7.0",
32+
"@smithy/node-http-handler": "^4.7.1",
3333
"aws-xray-sdk": "^3.12.0",
3434
"axios": "^1.16.0",
3535
"cookie": "^1.1.1",
@@ -38,7 +38,7 @@
3838
"fastify": "^5.8.5",
3939
"fastify-plugin": "^5.1.0",
4040
"govuk-frontend": "^5.14.0",
41-
"i18next": "^26.0.10",
41+
"i18next": "^26.1.0",
4242
"i18next-http-middleware": "^3.9.6",
4343
"jose": "^6.2.3",
4444
"notifications-node-client": "^8.3.2",

solutions/frontend/src/utils/jsonApiClient.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type { APIGatewayProxyEvent } from "aws-lambda";
55

66
const mockLogger = vi.hoisted(() => ({
77
error: vi.fn(),
8-
debug: vi.fn(),
8+
info: vi.fn(),
99
}));
1010

1111
const mockGetPropsFromAPIGatewayEvent = vi.hoisted(() => vi.fn());
@@ -201,6 +201,7 @@ describe("jsonApiClient", () => {
201201
expect(TestJsonApiClient.testUnknownError).toStrictEqual({
202202
success: false,
203203
error: "UnknownError",
204+
rawResponse: undefined,
204205
});
205206
});
206207

solutions/frontend/src/utils/jsonApiClient.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ export abstract class JsonApiClient {
88
protected static readonly unknownError = {
99
success: false,
1010
error: "UnknownError",
11+
rawResponse: undefined,
1112
} as const;
1213
protected static readonly undefinedSchema = v.undefined();
1314
protected fetch: typeof fetch;
@@ -121,8 +122,9 @@ export abstract class JsonApiClient {
121122

122123
const body = v.safeParse(successResponseBodySchema, responseJson);
123124
if (!body.success) {
124-
logger.debug("response status debug", { status: response.status });
125-
logger.debug("responseJson debug", {
125+
logger.info("MHTEST");
126+
logger.info("response status debug", { status: response.status });
127+
logger.info("responseJson debug", {
126128
responseJson: JSON.stringify(responseJson, null, 2),
127129
});
128130

0 commit comments

Comments
 (0)