fix broken tests from Oauth2 addition

Author: R-Sandor

frontend/__tests__/account/login/login.test.tsx

@@ -7,10 +7,13 @@ import { typePassword } from "../signup/signup.test";
 import { submitDisabled } from "@/__tests__/utilities/TestingUtilities";
 import { bkmkResp } from "@/__tests__/data/SampleData";
 import { instance } from "@api/Api";
-import { instance as userInstance } from "@api/userApi";
 import authService from "@services/auth.service";
 import axios from "axios";
+import { userApiInstance } from "@api/userApi";
+const SERVER_URL = process.env.NEXT_PUBLIC_SERVER_URL;
 const user = userEvent.setup();
+const userApiMock = new MockAdapter(userApiInstance);
+userApiMock.onGet("/oauth2Providers").reply(200, JSON.stringify([]));
 
 describe("Login events.", () => {
   vi.mock("next/navigation", () => {
@@ -38,7 +41,6 @@ describe("Login events.", () => {
     const mock = new MockAdapter(axios);
 
     // Create a custom response
-    const SERVER_URL = process.env.NEXT_PUBLIC_SERVER_URL;
     axiosMock.onGet().reply(200, bkmkResp);
 
     const SIGNIN_URL = SERVER_URL + "/user/signin";
@@ -96,9 +98,9 @@ describe("Errors on fields.", () => {
   });
 });
 
-describe("Oauth2 Signin", () => {
-  beforeEach(() => {
-    render(<Page />);
-  });
-  test("Oauth2Providers are listed", async () => {});
-});
+// describe("Oauth2 Signin", () => {
+//   beforeEach(() => {
+//     render(<Page />);
+//   });
+//   test("Oauth2Providers are listed", async () => {});
+// });

frontend/api/Api.ts

@@ -46,9 +46,14 @@ instance.interceptors.response.use(
 );
 
 export function parseData(data: string) {
-  if (data.length != 0 || data || data != "") {
+  if (data === undefined || data === "") {
+    return null;
+  }
+
+  if (data || data.length != 0) {
     return JSON.parse(data);
   }
+
   return data;
 }
 

frontend/api/userApi.ts

@@ -2,7 +2,7 @@ import axios from "axios";
 import { parseData } from "./Api";
 const SERVER_URL = process.env.NEXT_PUBLIC_SERVER_URL + "/user";
 
-export const instance = axios.create({
+export const userApiInstance = axios.create({
   withCredentials: true,
   baseURL: SERVER_URL,
   timeout: 10000,
@@ -20,19 +20,19 @@ const userApi = {
     data: any,
     config: {} | undefined,
   ) {
-    return instance({
+    return userApiInstance({
       method: method,
       url: resource,
       data,
       ...config,
     });
   },
   userInfo() {
-    return instance.get("/user-info");
+    return userApiInstance.get("/user-info");
   },
   oauth2Providers() {
     console.log("getOauth2Providers");
-    return instance.get("/oauth2Providers");
+    return userApiInstance.get("/oauth2Providers");
   },
 };