fix: infinite redirect issue (#583)

hay-kot · Oct 10, 2023 · ae4b953 · ae4b953
1 parent d8482f3
commit ae4b953
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/frontend/composables/use-auth-context.ts b/frontend/composables/use-auth-context.ts
@@ -45,7 +45,8 @@ class AuthContext implements IAuthContext {
   private _attachmentToken: CookieRef<string | null>;
 
   get token() {
-    return this._token.value === "true";
+    // @ts-ignore sometimes it's a boolean I guess?
+    return this._token.value === "true" || this._token.value === true;
   }
 
   get attachmentToken() {
@@ -66,11 +67,11 @@ class AuthContext implements IAuthContext {
   }
 
   isExpired() {
-    return this.token;
+    return !this.token;
   }
 
   isAuthorized() {
-    return !this.isExpired();
+    return this.token;
   }
 
   invalidateSession() {
@@ -79,7 +80,6 @@ class AuthContext implements IAuthContext {
     // Delete the cookies
     this._token.value = null;
     this._attachmentToken.value = null;
-
     console.log("Session invalidated");
   }
 

diff --git a/frontend/middleware/auth.ts b/frontend/middleware/auth.ts
@@ -3,14 +3,18 @@ export default defineNuxtRouteMiddleware(async () => {
   const api = useUserApi();
 
   if (!ctx.isAuthorized()) {
-    return navigateTo("/");
+    if (window.location.pathname !== "/") {
+      return navigateTo("/");
+    }
   }
 
   if (!ctx.user) {
     console.log("Fetching user data");
     const { data, error } = await api.user.self();
     if (error) {
-      return navigateTo("/");
+      if (window.location.pathname !== "/") {
+        return navigateTo("/");
+      }
     }
 
     ctx.user = data.item;