composables/auth.ts

@@ -30,11 +30,11 @@ export const useAuth = () => {
       {
         username, password: hashedPass, device_name: "Linux Laptop"
       }
-    }) as { access_token: string, refresh_token: string }; fetch
+    }) as { access_token: string, refresh_token: string };
     console.log("hi");
     accessToken.value = res.access_token;
     console.log("access token:", accessToken.value);
-    await fetchUser();
+    //await fetchUser();
   }
 
   async function logout(password: string) {
@@ -60,19 +60,17 @@ export const useAuth = () => {
 
   async function refresh() {
     console.log("refreshing");
-    try {
 	const res = await fetchWithApi("/auth/refresh", {
 	method: "POST"
-      }) as { access_token: string };
-      accessToken.value = res.access_token;
+	}) as any;
+	console.log("finished refreshing:", res);
+	accessToken.value = res?.access_token;
 	console.log("set new access token");
-    } catch (error) {
-      console.error("refresh error:", error);
-    }
   }
 
   async function fetchUser() {
     if (!accessToken.value) return;
+	console.log("fetchuser access token:", accessToken.value);
     const res = await fetchWithApi("/users/me") as UserResponse;
     user.value = res;
     return user.value;

utils/fetchWithApi.ts

@@ -9,7 +9,6 @@ export default async <T>(path: string, options: NitroFetchOptions<string> = {})
     path = path.slice(0, path.lastIndexOf("/"));
   }
   console.log("formatted path:", path);
-  try {
 	const accessToken = useCookie("access_token");
 	console.log("access token:", accessToken.value);
 	const apiBase = useCookie("api_base").value;
@@ -49,23 +48,35 @@ export default async <T>(path: string, options: NitroFetchOptions<string> = {})
 
 		return res;
 		} catch (error: any) {
+		console.error("Error fetching resource");
 		if (error?.response?.status === 401) {
+			console.log("Error status is 401");
 			if (!path.startsWith("/auth/refresh")) {
+			console.log("Path is not refresh endpoint");
 			try {
+				console.log("Trying to refresh");
 				await refresh();
+				console.log("Successfully refreshed token");
 			} catch (error: any) {
+				console.log("Failed to refresh token");
 				if (error?.response?.status === 401) {
+				console.log("Refresh returned 401");
 				reauthFailed = true;
+				console.log("Revoking");
 				await revoke();
+				console.log("Redirecting to login");
+				await navigateTo("/login");
+				console.log("redirected");
 				return;
 				}
 			}
-          }
-        }
+			} else {
+			console.log("Path is refresh endpoint, throwing error");
 			throw error;
 			}
 		}
-  } catch (error) {
-    console.error("error:", error);
+		console.log("throwing error");
+		throw error;
+		}
 	}
 }