Merge pull request #38 from OpenWebconcept/development

Development to main
OpenWebconcept · Feb 23, 2024 · 3e4f5b5 · 3e4f5b5
2 parents 7f9d6c3 + f12379e
commit 3e4f5b5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/features/login/service.ts b/src/features/login/service.ts
@@ -10,7 +10,7 @@ const anonymousUser = Object.freeze({
 async function fetchUser(url: string): Promise<User> {
   const response = await fetch(url, {
     headers: {
-      Authorization: `Bearer ${Cookies.get("jwt")}`,
+      Authorization: `Bearer ${Cookies.get("jwt") ?? window.sessionStorage.getItem("jwt")}`,
     },
   });
 
@@ -45,5 +45,6 @@ export const logOut = () =>
     } else {
       Cookies.remove("jwt");
       Cookies.remove("userId");
+      window.sessionStorage.removeItem("jwt")
     }
   });
diff --git a/src/services/fetch-logged-in.ts b/src/services/fetch-logged-in.ts
@@ -6,7 +6,7 @@ type FetchArgs = Parameters<typeof fetch>;
 type FetchReturn = ReturnType<typeof fetch>;
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
-const empty = () => {};
+const empty = () => { };
 
 const waitForLogin = {
   promise: Promise.resolve(),
@@ -33,6 +33,7 @@ export function fetchLoggedIn(...args: FetchArgs): FetchReturn {
   if (!validateSession()) {
     Cookies.remove("jwt");
     Cookies.remove("userId");
+    window.sessionStorage.removeItem("jwt")
   }
 
   const init = args[1] || {};
@@ -48,7 +49,7 @@ export function fetchLoggedIn(...args: FetchArgs): FetchReturn {
     ...options,
     headers: {
       ...options?.headers,
-      Authorization: `Bearer ${Cookies.get("jwt")}`,
+      Authorization: `Bearer ${Cookies.get("jwt") ?? window.sessionStorage.getItem("jwt")}`,
     },
   };
 
@@ -64,7 +65,7 @@ export function fetchLoggedIn(...args: FetchArgs): FetchReturn {
 }
 
 const validateSession = () => {
-  const token = Cookies.get("jwt");
+  const token = Cookies.get("jwt") ?? window.sessionStorage.getItem("jwt");
 
   if (!token) return false;
 

diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
@@ -71,6 +71,7 @@ async function handleSubmit() {
 
     Cookies.set("userId", data.id);
     Cookies.set("jwt", data.jwtToken);
+    window.sessionStorage.setItem("jwt", data.jwtToken)
 
     router.push("/");
   }