fix: fix tests not passing

Arquisoft · Mar 5, 2024 · 072f943 · 072f943
1 parent d6beb38
commit 072f943
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/webapp/src/components/auth/AuthUtils.js b/webapp/src/components/auth/AuthUtils.js
@@ -1,16 +1,22 @@
 import axios, { HttpStatusCode } from "axios";
 
 export function isUserLogged() {
-    return localStorage.getItem("authData") !== null;
+    return getLoginData().jwtToken !== null;
 }
 
 export function saveToken(requestAnswer) {
     axios.defaults.headers.common["Authorization"] = "Bearer " + requestAnswer.data.token;
-    localStorage.setItem("authData", {
-        "jwtToken": requestAnswer.data.token,
-        "refreshToken": requestAnswer.data.refresh_Token,
-        "receivedOnUTC": Date.now()
-    });
+    sessionStorage.setItem("jwtToken", requestAnswer.data.token);
+    sessionStorage.setItem("jwtRefreshToken", requestAnswer.data.refresh_Token);
+    sessionStorage.setItem("jwtReceptionMillis", Date.now().toString());
+}
+
+export function getLoginData() {
+    return {
+        "jwtToken": sessionStorage.getItem("jwtToken"),
+        "jwtRefreshToken": sessionStorage.getItem("jwtRefreshToken"),
+        "jwtReceptionDate": new Date(sessionStorage.getItem("jwtReceptionMillis"))
+    };
 }
 
 export async function login(loginData, onSuccess, onError) {

diff --git a/webapp/src/tests/AuthUtils.test.js b/webapp/src/tests/AuthUtils.test.js
@@ -1,6 +1,6 @@
 import MockAdapter from "axios-mock-adapter";
 import axios, { HttpStatusCode } from "axios";
-import { isUserLogged, login } from "components/auth/AuthUtils";
+import { isUserLogged, login} from "components/auth/AuthUtils";
 
 const mockAxios = new MockAdapter(axios);
 
@@ -35,15 +35,15 @@ describe("Auth Utils tests", () => {
 
             //Check the user is now logged in
             expect(isUserLogged()).toBe(true);
-            expect(localStorage.getItem("authData").jwtToken).toBe("token");
-            expect(localStorage.getItem("authData").jwtRefreshToken).toBe("refreshToken");
+            expect(sessionStorage.getItem("jwtToken")).toBe("token");
+            expect(sessionStorage.getItem("jwtRefreshToken")).toBe("refreshToken");
         });
     });
 
     describe("when the user is authenticated", () => {
 
         beforeAll(() => {
-            localStorage.setItem("authData", {
+            sessionStorage.setItem("authData", {
                 "token": "testToken"
             });
         })