Revert "SB Fix sonarqube warnings - introduce URL objects rather than strings."

This reverts commit 881b096.

Author: acerathereinspirative-nhs-nvir

src/middleware.test.ts

@@ -17,40 +17,40 @@ jest.mock("@src/utils/config");
 const middlewareRegex = new RegExp(config.matcher[0]);
 const otherExcludedPaths = ["/favicon.ico", "/assets", "/js", "/css", "/_next"];
 
-function getMockRequest(testUrl: URL) {
+function getMockRequest(testUrl: string) {
   return {
     nextUrl: {
-      origin: testUrl.origin,
-      pathname: testUrl.pathname,
+      origin: new URL(testUrl).origin,
+      pathname: new URL(testUrl).pathname,
     },
-    url: testUrl.href,
+    url: testUrl,
   };
 }
 
 describe("middleware", () => {
   beforeEach(() => {
     (configProvider as jest.Mock).mockImplementation(
       (): Partial<AppConfig> => ({
-        NHS_APP_REDIRECT_LOGIN_URL: new URL("https://nhs-app-redirect-login-url"),
+        NHS_APP_REDIRECT_LOGIN_URL: "https://nhs-app-redirect-login-url",
       }),
     );
     jest.clearAllMocks();
   });
 
   it("redirects users without active session to session-logout page", async () => {
-    const testUrl = new URL("https://nhs-app-redirect-login-url/");
+    const testUrl = "https://nhs-app-redirect-login-url/";
     const mockRequest = getMockRequest(testUrl);
 
     (auth as jest.Mock).mockResolvedValue(null); // No authenticated session
 
     const result = await middleware(mockRequest as NextRequest);
 
     expect(result.status).toBe(307);
-    expect(result.headers.get("Location")).toEqual(testUrl.href);
+    expect(result.headers.get("Location")).toEqual(testUrl);
   });
 
   it("pass through for users with active session", async () => {
-    const testUrl = new URL("https://testurl/abc");
+    const testUrl = "https://testurl/abc";
     const mockRequest = getMockRequest(testUrl);
 
     (auth as jest.Mock).mockResolvedValue({ user: "test" });

src/utils/config.test.ts

@@ -17,7 +17,6 @@ describe("configProvider", () => {
     process.env.SSM_PREFIX = prefix;
     process.env.CONTENT_API_ENDPOINT = "https://api-endpoint";
     process.env.ELIGIBILITY_API_ENDPOINT = "https://elid-endpoint";
-    process.env.NHS_APP_REDIRECT_LOGIN_URL = "https://app-redirect-login-endpoint";
     const mockGetSSMParam = (getSSMParam as jest.Mock).mockResolvedValue("api-key");
 
     const config: AppConfig = await configProvider();

src/utils/config.ts

@@ -13,7 +13,7 @@ type AppConfig = {
   NBS_URL: string;
   NBS_BOOKING_PATH: string;
   MAX_SESSION_AGE_MINUTES: number;
-  NHS_APP_REDIRECT_LOGIN_URL: URL;
+  NHS_APP_REDIRECT_LOGIN_URL: string;
 };
 
 const configProvider = async (): Promise<AppConfig> => {
@@ -25,7 +25,7 @@ const configProvider = async (): Promise<AppConfig> => {
     ELIGIBILITY_API_KEY: await getFromEnvironmentOrSSM(SSM_PREFIX, "ELIGIBILITY_API_KEY"),
     CONTENT_CACHE_PATH: await getFromEnvironmentOrSSM(SSM_PREFIX, "CONTENT_CACHE_PATH"),
     NHS_LOGIN_URL: await getFromEnvironmentOrSSM(SSM_PREFIX, "NHS_LOGIN_URL"),
-    NHS_APP_REDIRECT_LOGIN_URL: await getUrlFromEnvironmentOrSSM(SSM_PREFIX, "NHS_APP_REDIRECT_LOGIN_URL"),
+    NHS_APP_REDIRECT_LOGIN_URL: await getFromEnvironmentOrSSM(SSM_PREFIX, "NHS_APP_REDIRECT_LOGIN_URL"),
     NHS_LOGIN_CLIENT_ID: await getFromEnvironmentOrSSM(SSM_PREFIX, "NHS_LOGIN_CLIENT_ID"),
     NHS_LOGIN_SCOPE: await getFromEnvironmentOrSSM(SSM_PREFIX, "NHS_LOGIN_SCOPE"),
     NHS_LOGIN_PRIVATE_KEY: await getFromEnvironmentOrSSM(SSM_PREFIX, "NHS_LOGIN_PRIVATE_KEY"),

test-data/config/builders.tsx

@@ -14,7 +14,7 @@ export function appConfigBuilder() {
     NHS_LOGIN_PRIVATE_KEY: randomString(10),
     NBS_URL: randomString(10),
     NBS_BOOKING_PATH: randomString(10),
-    NHS_APP_REDIRECT_LOGIN_URL: randomURL(),
+    NHS_APP_REDIRECT_LOGIN_URL: randomString(10),
     MAX_SESSION_AGE_MINUTES: randomInteger(1, 999),
   });
 }