VIA-537 SB & AS Improve config type safety and enable IntelliSense

acerathereinspirative-nhs-nvir · acerathereinspirative-nhs-nvir · commit d490815858d0 · 2025-11-24T07:20:34.000Z
Defines a strict `AppConfig` interface to map configuration keys to their specific types. This allows for the removal of manual type casting (e.g., `as string`) throughout the codebase and updates test builders to support the new typed structure. Also enables auto-complete for config keys in IntelliJ etc.
diff --git a/auth.ts b/auth.ts
@@ -21,15 +21,15 @@ const AuthJWTPerformanceMarker = "auth-jwt-callback";
 const AuthSessionPerformanceMarker = "auth-session-callback";
 
 export const { handlers, signIn, signOut, auth } = NextAuth(async () => {
-  const MAX_SESSION_AGE_SECONDS: number = ((await config.MAX_SESSION_AGE_MINUTES) as number) * 60;
+  const MAX_SESSION_AGE_SECONDS: number = (await config.MAX_SESSION_AGE_MINUTES) * 60;
   const headerValues = await headers();
 
   const requestContext: RequestContext = extractRequestContextFromHeaders(headerValues);
 
   return await asyncLocalStorage.run(requestContext, async () => {
     return {
       providers: [await NHSLoginAuthProvider()],
-      secret: (await config.AUTH_SECRET) as string,
+      secret: await config.AUTH_SECRET,
       pages: {
         signIn: SSO_FAILURE_ROUTE,
         signOut: SESSION_LOGOUT_ROUTE,
diff --git a/contract/fetch-eligibility-content.contract.ts b/contract/fetch-eligibility-content.contract.ts
@@ -3,7 +3,7 @@ import { EligibilityApiResponse } from "@src/services/eligibility-api/api-types"
 import { fetchEligibilityContent } from "@src/services/eligibility-api/gateway/fetch-eligibility-content";
 import config from "@src/utils/config";
 import { asyncLocalStorage } from "@src/utils/requestContext";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { readFileSync } from "fs";
 import { pactWith } from "jest-pact";
 
@@ -40,7 +40,7 @@ const successfulResponse: EligibilityApiResponse = {
 };
 
 pactWith({ consumer: "VitA", provider: "EliD", port: 1234, logLevel: "warn" }, (provider) => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeEach(() => {
     const defaultConfig = configBuilder()
diff --git a/src/_lambda/content-cache-hydrator/content-cache-reader.test.ts b/src/_lambda/content-cache-hydrator/content-cache-reader.test.ts
@@ -6,7 +6,7 @@ import { VaccineInfo, VaccineType } from "@src/models/vaccine";
 import { readContentFromCache } from "@src/services/content-api/gateway/content-reader-service";
 import { InvalidatedCacheError, S3NoSuchKeyError } from "@src/services/content-api/gateway/exceptions";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 
 jest.mock("@src/services/content-api/gateway/content-reader-service");
 jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
@@ -16,7 +16,7 @@ const mockContentCachePath = "wiremock/__files/";
 describe("readCachedContentForVaccine", () => {
   const mockCacheFileContents = "mock-cache-file-contents";
   const vaccineType = VaccineType.RSV;
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeEach(() => {
     const defaultConfig = configBuilder().withContentCachePath(mockContentCachePath).build();
diff --git a/src/_lambda/content-cache-hydrator/content-cache-reader.ts b/src/_lambda/content-cache-hydrator/content-cache-reader.ts
@@ -16,7 +16,7 @@ const readCachedContentForVaccine = async (vaccineType: VaccineType): Promise<Re
   let cachedContent: string;
 
   try {
-    cachedContent = await readContentFromCache((await config.CONTENT_CACHE_PATH) as string, cacheFilename, vaccineType);
+    cachedContent = await readContentFromCache(await config.CONTENT_CACHE_PATH, cacheFilename, vaccineType);
   } catch (error) {
     if (error instanceof S3NoSuchKeyError) {
       return { cacheStatus: "empty", cacheContent: "" };
diff --git a/src/_lambda/content-cache-hydrator/content-fetcher.test.ts b/src/_lambda/content-cache-hydrator/content-fetcher.test.ts
@@ -1,7 +1,7 @@
 import { CONTENT_API_PATH_PREFIX, fetchContentForVaccine } from "@src/_lambda/content-cache-hydrator/content-fetcher";
 import { VaccineInfo, VaccineType } from "@src/models/vaccine";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import axios from "axios";
 
 jest.mock("axios");
@@ -11,7 +11,7 @@ describe("fetchContentForVaccine", () => {
   const testApiKey: string = "test-key";
   const testApiEndpoint: URL = new URL("https://test-endpoint/");
   const testApiContent = { test: "content" };
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeEach(() => {
     const defaultConfig = configBuilder().withContentApiKey(testApiKey).andContentApiEndpoint(testApiEndpoint).build();
diff --git a/src/_lambda/content-cache-hydrator/content-fetcher.ts b/src/_lambda/content-cache-hydrator/content-fetcher.ts
@@ -7,9 +7,9 @@ const log = logger.child({ module: "content-fetcher" });
 const CONTENT_API_PATH_PREFIX = "nhs-website-content/";
 
 const fetchContentForVaccine = async (vaccineType: VaccineType): Promise<string> => {
-  const apiEndpoint: URL = (await config.CONTENT_API_ENDPOINT) as URL;
+  const apiEndpoint: URL = await config.CONTENT_API_ENDPOINT;
   const vaccinePath = VaccineInfo[vaccineType].contentPath;
-  const apiKey: string = (await config.CONTENT_API_KEY) as string;
+  const apiKey: string = await config.CONTENT_API_KEY;
 
   const uri: string = `${apiEndpoint}${CONTENT_API_PATH_PREFIX}${vaccinePath}`;
   let response: AxiosResponse;
diff --git a/src/_lambda/content-cache-hydrator/content-writer-service.test.ts b/src/_lambda/content-cache-hydrator/content-writer-service.test.ts
@@ -9,7 +9,7 @@ import {
 } from "@src/_lambda/content-cache-hydrator/content-writer-service";
 import { Filename, VaccineInfo, VaccineType } from "@src/models/vaccine";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { writeFile } from "node:fs/promises";
 
 jest.mock("node:fs/promises");
@@ -29,7 +29,7 @@ describe("Content Writer Service", () => {
   const location: string = "test-location/";
   const path: Filename = "test-filename.json" as Filename;
   const content: string = "test-data";
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeEach(() => {
     mockSend = jest.fn();
diff --git a/src/_lambda/content-cache-hydrator/content-writer-service.ts b/src/_lambda/content-cache-hydrator/content-writer-service.ts
@@ -39,7 +39,7 @@ const _writeContentToCache = async (
 
 const writeContentForVaccine = async (vaccineType: VaccineType, vaccineContent: string) => {
   const cacheFilename = VaccineInfo[vaccineType].cacheFilename;
-  await _writeContentToCache((await config.CONTENT_CACHE_PATH) as string, cacheFilename, vaccineContent);
+  await _writeContentToCache(await config.CONTENT_CACHE_PATH, cacheFilename, vaccineContent);
 };
 
 export { _writeFileS3, _writeContentToCache, writeContentForVaccine };
diff --git a/src/_lambda/content-cache-hydrator/handler.test.ts b/src/_lambda/content-cache-hydrator/handler.test.ts
@@ -12,7 +12,7 @@ import { getFilteredContentForVaccine } from "@src/services/content-api/parsers/
 import { getStyledContentForVaccine } from "@src/services/content-api/parsers/content-styling-service";
 import config from "@src/utils/config";
 import { RequestContext, asyncLocalStorage } from "@src/utils/requestContext";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { Context } from "aws-lambda";
 
 jest.mock("@src/_lambda/content-cache-hydrator/content-writer-service");
@@ -53,7 +53,7 @@ describe("Lambda Handler", () => {
   });
 
   describe("when content-change-approval-needed feature disabled", () => {
-    const mockedConfig = config as AsyncConfigMock;
+    const mockedConfig = config as ConfigMock;
 
     beforeEach(() => {
       const defaultConfig = configBuilder().withContentCacheIsChangeApprovalEnabled(false).build();
@@ -100,7 +100,7 @@ describe("Lambda Handler", () => {
   });
 
   describe("when content-change-approval-needed feature enabled", () => {
-    const mockedConfig = config as AsyncConfigMock;
+    const mockedConfig = config as ConfigMock;
 
     beforeEach(() => {
       const defaultConfig = configBuilder().withContentCacheIsChangeApprovalEnabled(true).build();
diff --git a/src/_lambda/content-cache-hydrator/handler.ts b/src/_lambda/content-cache-hydrator/handler.ts
@@ -150,7 +150,7 @@ const runContentCacheHydrator = async (event: ContentCacheHydratorEvent) => {
   for (const vaccine of vaccinesToRunOn) {
     const status = await hydrateCacheForVaccine(
       vaccine,
-      (await config.CONTENT_CACHE_IS_CHANGE_APPROVAL_ENABLED) as boolean,
+      await config.CONTENT_CACHE_IS_CHANGE_APPROVAL_ENABLED,
       forceUpdate,
     );
     invalidatedCount += status.invalidatedCount;
diff --git a/src/app/_components/vaccine/Vaccine.integration.test.tsx b/src/app/_components/vaccine/Vaccine.integration.test.tsx
@@ -4,7 +4,7 @@ import { VaccineType } from "@src/models/vaccine";
 import { fetchEligibilityContent } from "@src/services/eligibility-api/gateway/fetch-eligibility-content";
 import config from "@src/utils/config";
 import { mockNHSAppJSFunctions } from "@src/utils/nhsapp-js.test";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { eligibilityApiResponseBuilder } from "@test-data/eligibility-api/builders";
 import { render, screen } from "@testing-library/react";
 import { ReadonlyHeaders } from "next/dist/server/web/spec-extension/adapters/headers";
@@ -31,7 +31,7 @@ jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
 const nhsNumber = "5123456789";
 
 describe("Vaccine", () => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
   beforeAll(() => {
     const defaultConfig = configBuilder().withContentCachePath("wiremock/__files/").withPinoLogLevel("info").build();
     Object.assign(mockedConfig, defaultConfig);
diff --git a/src/app/api/auth/[...nextauth]/provider.test.ts b/src/app/api/auth/[...nextauth]/provider.test.ts
@@ -1,12 +1,12 @@
 import NHSLoginAuthProvider from "@src/app/api/auth/[...nextauth]/provider";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 
 jest.mock("@src/utils/auth/pem-to-crypto-key");
 jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
 
 describe("provider", () => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeEach(() => {
     const defaultConfig = configBuilder().build();
diff --git a/src/app/api/auth/[...nextauth]/provider.ts b/src/app/api/auth/[...nextauth]/provider.ts
@@ -10,8 +10,8 @@ const NHSLoginAuthProvider = async (): Promise<OIDCConfig<Profile>> => {
     id: NHS_LOGIN_PROVIDER_ID,
     name: "NHS Login Auth Provider",
     type: "oidc",
-    issuer: (await config.NHS_LOGIN_URL) as string,
-    clientId: (await config.NHS_LOGIN_CLIENT_ID) as string,
+    issuer: `${await config.NHS_LOGIN_URL}`,
+    clientId: await config.NHS_LOGIN_CLIENT_ID,
     wellKnown: `${await config.NHS_LOGIN_URL}/.well-known/openid-configuration`,
     authorization: {
       params: {
@@ -20,7 +20,7 @@ const NHSLoginAuthProvider = async (): Promise<OIDCConfig<Profile>> => {
       },
     },
     token: {
-      clientPrivateKey: await pemToCryptoKey((await config.NHS_LOGIN_PRIVATE_KEY) as string),
+      clientPrivateKey: await pemToCryptoKey(await config.NHS_LOGIN_PRIVATE_KEY),
     },
     client: {
       token_endpoint_auth_method: "private_key_jwt",
diff --git a/src/middleware.test.ts b/src/middleware.test.ts
@@ -5,7 +5,7 @@ import { auth } from "@project/auth";
 import { unprotectedUrlPaths } from "@src/app/_components/inactivity/constants";
 import { config, middleware } from "@src/middleware";
 import appConfig from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { NextRequest } from "next/server";
 
 jest.mock("@project/auth", () => ({
@@ -34,7 +34,7 @@ function getMockRequest(testUrl: string) {
 }
 
 describe("middleware", () => {
-  const mockedConfig = appConfig as AsyncConfigMock;
+  const mockedConfig = appConfig as unknown as ConfigMock;
 
   beforeEach(() => {
     const defaultConfig = configBuilder()
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -29,7 +29,7 @@ const middlewareWrapper = async (request: NextRequest) => {
   const session: Session | null = await auth();
   if (!session?.user) {
     log.info({ context: { nextUrl: request.nextUrl.href } }, "Missing user session, redirecting to login");
-    response = NextResponse.redirect((await appConfig.NHS_APP_REDIRECT_LOGIN_URL) as URL);
+    response = NextResponse.redirect(await appConfig.NHS_APP_REDIRECT_LOGIN_URL);
     response.headers.set("Cache-Control", "no-cache, no-store, max-age=0, must-revalidate");
   } else {
     response = NextResponse.next({
diff --git a/src/services/content-api/content-api.integration.test.tsx b/src/services/content-api/content-api.integration.test.tsx
@@ -7,7 +7,7 @@ import { VaccineType } from "@src/models/vaccine";
 import { getContentForVaccine } from "@src/services/content-api/content-service";
 import { GetContentForVaccineResponse } from "@src/services/content-api/types";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { Readable } from "stream";
 
 jest.mock("@aws-sdk/client-s3");
@@ -23,7 +23,7 @@ const mockRsvResponse = {
 };
 
 describe("Content API Read Integration Test ", () => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   afterEach(async () => {
     const { styledVaccineContent, contentError }: GetContentForVaccineResponse = await getContentForVaccine(
diff --git a/src/services/content-api/content-service.test.ts b/src/services/content-api/content-service.test.ts
@@ -5,14 +5,14 @@ import { readContentFromCache } from "@src/services/content-api/gateway/content-
 import { InvalidatedCacheError, S3NoSuchKeyError } from "@src/services/content-api/gateway/exceptions";
 import { ContentErrorTypes, GetContentForVaccineResponse } from "@src/services/content-api/types";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 
 jest.mock("@src/services/content-api/gateway/content-reader-service");
 jest.mock("@src/utils/config");
 jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
 
 describe("getContentForVaccine()", () => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   describe("when readContent succeeds", () => {
     beforeEach(() => {
diff --git a/src/services/content-api/content-service.ts b/src/services/content-api/content-service.ts
@@ -22,7 +22,7 @@ const getContentForVaccine = async (vaccineType: VaccineType): Promise<GetConten
   try {
     profilePerformanceStart(GetVaccineContentPerformanceMarker);
 
-    const cachePath = (await config.CONTENT_CACHE_PATH) as string;
+    const cachePath = await config.CONTENT_CACHE_PATH;
     const vaccineCacheFilename = VaccineInfo[vaccineType].cacheFilename;
 
     // fetch content from api
diff --git a/src/services/eligibility-api/gateway/fetch-eligibility-content.ts b/src/services/eligibility-api/gateway/fetch-eligibility-content.ts
@@ -27,8 +27,8 @@ const log = logger.child({ module: "fetch-eligibility-content" });
 const ELIGIBILITY_API_PATH_SUFFIX = "eligibility-signposting-api/patient-check/";
 
 export const fetchEligibilityContent = async (nhsNumber: NhsNumber): Promise<EligibilityApiResponse> => {
-  const apiEndpoint: URL = (await config.ELIGIBILITY_API_ENDPOINT) as URL;
-  const apiKey: string = (await config.ELIGIBILITY_API_KEY) as string;
+  const apiEndpoint: URL = await config.ELIGIBILITY_API_ENDPOINT;
+  const apiKey: string = await config.ELIGIBILITY_API_KEY;
   const vitaTraceId: string | undefined = asyncLocalStorage?.getStore()?.traceId;
 
   const elidUri: string = `${apiEndpoint}${ELIGIBILITY_API_PATH_SUFFIX}${nhsNumber}`;
diff --git a/src/services/nbs/nbs-service.test.ts b/src/services/nbs/nbs-service.test.ts
@@ -2,7 +2,7 @@ import { VaccineType } from "@src/models/vaccine";
 import { getSSOUrlToNBSForVaccine } from "@src/services/nbs/nbs-service";
 import { generateAssertedLoginIdentityJwt } from "@src/utils/auth/generate-auth-payload";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 
 jest.mock("@src/utils/auth/generate-auth-payload", () => ({
   generateAssertedLoginIdentityJwt: jest.fn(),
@@ -15,7 +15,7 @@ const nbsBookingPathFromConfig = "/test/path/book";
 const mockAssertedLoginIdentityJWT = "mock-jwt";
 
 describe("getSSOUrlToNBSForVaccine", () => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   describe("when NBS config is valid", () => {
     beforeEach(() => {
diff --git a/src/services/nbs/nbs-service.ts b/src/services/nbs/nbs-service.ts
@@ -26,7 +26,7 @@ const nbsVaccinePath: Record<VaccinesWithNBSBookingAvailable, string> = {
 const getSSOUrlToNBSForVaccine = async (vaccineType: VaccinesWithNBSBookingAvailable) => {
   let redirectUrl;
   try {
-    const nbsBaseUrl = (await config.NBS_URL) as URL;
+    const nbsBaseUrl = await config.NBS_URL;
     const nbsBookingPath = await config.NBS_BOOKING_PATH;
     const nbsURl = new URL(`${nbsBaseUrl.pathname}${nbsBookingPath}${nbsVaccinePath[vaccineType]}`, nbsBaseUrl.origin);
     const nbsQueryParams = await getNbsQueryParams();
diff --git a/src/utils/auth/apim/fetch-apim-access-token.test.ts b/src/utils/auth/apim/fetch-apim-access-token.test.ts
@@ -4,7 +4,7 @@
 import { generateAPIMTokenPayload } from "@src/utils/auth/apim/fetch-apim-access-token";
 import { APIMTokenPayload, IdToken } from "@src/utils/auth/types";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import jwt from "jsonwebtoken";
 
 jest.mock("jsonwebtoken", () => ({
@@ -24,7 +24,7 @@ const apimAuthUrl = new URL("https://apim-test-auth-url.com/test");
 
 describe("generateAPIMTokenPayload", () => {
   let randomUUIDSpy: jest.SpyInstance;
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeAll(() => {
     randomUUIDSpy = jest.spyOn(global.crypto, "randomUUID").mockReturnValue(mockRandomUUID);
diff --git a/src/utils/auth/apim/fetch-apim-access-token.ts b/src/utils/auth/apim/fetch-apim-access-token.ts
@@ -17,7 +17,7 @@ const fetchAPIMAccessToken = async (idToken: IdToken): Promise<ApimTokenResponse
     log.debug({ context: { tokenPayload } }, "APIM token payload");
 
     const response: AxiosResponse<ApimTokenResponse> = await axios.post(
-      ((await config.APIM_AUTH_URL) as URL).href,
+      (await config.APIM_AUTH_URL).href,
       tokenPayload,
       {
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
@@ -34,7 +34,7 @@ const fetchAPIMAccessToken = async (idToken: IdToken): Promise<ApimTokenResponse
         {
           error,
           context: {
-            APIM_AUTH_URL: ((await config.APIM_AUTH_URL) as URL).href,
+            APIM_AUTH_URL: (await config.APIM_AUTH_URL).href,
             response_data: error.response?.data,
           },
         },
@@ -64,17 +64,17 @@ const generateAPIMTokenPayload = async (idToken: IdToken): Promise<APIMTokenPayl
 };
 
 const _generateClientAssertion = async (): Promise<string> => {
-  const privateKey: string = (await config.APIM_PRIVATE_KEY) as string;
+  const privateKey: string = await config.APIM_PRIVATE_KEY;
   const payload: APIMClientAssertionPayload = {
-    iss: (await config.ELIGIBILITY_API_KEY) as string,
-    sub: (await config.ELIGIBILITY_API_KEY) as string,
-    aud: ((await config.APIM_AUTH_URL) as URL).href,
+    iss: await config.ELIGIBILITY_API_KEY,
+    sub: await config.ELIGIBILITY_API_KEY,
+    aud: (await config.APIM_AUTH_URL).href,
     jti: crypto.randomUUID(),
     exp: Math.floor(Date.now() / 1000) + 300,
   };
   log.debug({ context: { payload } }, "raw APIMClientAssertionPayload");
 
-  return jwt.sign(payload, privateKey, { algorithm: "RS512", keyid: (await config.APIM_KEY_ID) as string });
+  return jwt.sign(payload, privateKey, { algorithm: "RS512", keyid: await config.APIM_KEY_ID });
 };
 
 export { fetchAPIMAccessToken, generateAPIMTokenPayload };
diff --git a/src/utils/auth/apim/get-or-refresh-apim-credentials.test.ts b/src/utils/auth/apim/get-or-refresh-apim-credentials.test.ts
@@ -1,7 +1,7 @@
 import { retrieveApimCredentials } from "@src/utils/auth/apim/get-apim-access-token";
 import { getOrRefreshApimCredentials } from "@src/utils/auth/apim/get-or-refresh-apim-credentials";
 import config from "@src/utils/config";
-import { AsyncConfigMock, configBuilder } from "@test-data/config/builders";
+import { ConfigMock, configBuilder } from "@test-data/config/builders";
 import { JWT } from "next-auth/jwt";
 
 jest.mock("@src/utils/auth/apim/get-apim-access-token", () => ({
@@ -11,7 +11,7 @@ jest.mock("sanitize-data", () => ({ sanitize: jest.fn() }));
 jest.mock("@src/utils/config");
 
 describe("getOrRefreshApimCredentials", () => {
-  const mockedConfig = config as AsyncConfigMock;
+  const mockedConfig = config as ConfigMock;
 
   beforeEach(() => {
     const defaultConfig = configBuilder().withIsApimAuthEnabled(true).build();
diff --git a/src/utils/auth/callbacks/get-token.test.ts b/src/utils/auth/callbacks/get-token.test.ts
diff --git a/src/utils/auth/callbacks/is-valid-signin.test.ts b/src/utils/auth/callbacks/is-valid-signin.test.ts
diff --git a/src/utils/auth/callbacks/is-valid-signin.ts b/src/utils/auth/callbacks/is-valid-signin.ts
diff --git a/src/utils/auth/generate-auth-payload.test.ts b/src/utils/auth/generate-auth-payload.test.ts
diff --git a/src/utils/auth/generate-auth-payload.ts b/src/utils/auth/generate-auth-payload.ts
diff --git a/src/utils/auth/get-jwt-token.test.ts b/src/utils/auth/get-jwt-token.test.ts
diff --git a/src/utils/auth/get-jwt-token.ts b/src/utils/auth/get-jwt-token.ts
diff --git a/src/utils/config.test.ts b/src/utils/config.test.ts
diff --git a/src/utils/config.ts b/src/utils/config.ts
diff --git a/test-data/config/builders.tsx b/test-data/config/builders.tsx
