Compare commits

...

1 Commits

Author SHA1 Message Date
Hayden
ae4b95301f fix: infinite redirect issue (#583) 2023-10-10 05:43:44 -08:00
2 changed files with 10 additions and 6 deletions

View File

@@ -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");
}

View File

@@ -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;