gorb/frontend
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

dev #1

Merged
sauceyred merged 36 commits from dev into main 2025-05-29 03:01:50 +00:00
Conversation 0 Commits 36 Files changed 18 +79 -70
2 changed files with 79 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit a15f85a082 - Show all commits

20
composables/auth.ts
View file

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

129
utils/fetchWithApi.ts
View file

@ -9,63 +9,74 @@ export default async <T>(path: string, options: NitroFetchOptions<string> = {})
path = path.slice(0, path.lastIndexOf("/")); path = path.slice(0, path.lastIndexOf("/"));
} }
console.log("formatted path:", path); console.log("formatted path:", path);
try { const accessToken = useCookie("access_token");
const accessToken = useCookie("access_token"); console.log("access token:", accessToken.value);
console.log("access token:", accessToken.value); const apiBase = useCookie("api_base").value;
const apiBase = useCookie("api_base").value; const apiVersion = useRuntimeConfig().public.apiVersion;
const apiVersion = useRuntimeConfig().public.apiVersion; console.log("heyoooo")
console.log("heyoooo") console.log("apiBase:", apiBase);
console.log("apiBase:", apiBase); if (!apiBase) {
if (!apiBase) { console.log("no api base");
console.log("no api base"); return;
return; }
} console.log("path:", path)
console.log("path:", path) const { revoke, refresh } = useAuth();
const { revoke, refresh } = useAuth(); console.log("access token 2:", accessToken.value);
console.log("access token 2:", accessToken.value);
let headers: HeadersInit = {};
let headers: HeadersInit = {};
if (accessToken.value) {
if (accessToken.value) { headers = {
headers = { ...options.headers,
...options.headers, "Authorization": `Bearer ${accessToken.value}`
"Authorization": `Bearer ${accessToken.value}` };
}; } else {
} else { headers = {
headers = { ...options.headers
...options.headers };
}; }
}
let reauthFailed = false;
let reauthFailed = false; while (!reauthFailed) {
while (!reauthFailed) { try {
try { console.log("fetching:", URL.parse(apiBase + path));
console.log("fetching:", URL.parse(apiBase + path)); const res = await $fetch<T>(URL.parse(apiBase + path)!.href, {
const res = await $fetch<T>(URL.parse(apiBase + path)!.href, { ...options,
...options, headers,
headers, credentials: "include"
credentials: "include" });
});
return res;
return res; } catch (error: any) {
} catch (error: any) { console.error("Error fetching resource");
if (error?.response?.status === 401) { if (error?.response?.status === 401) {
if (!path.startsWith("/auth/refresh")) { console.log("Error status is 401");
try { if (!path.startsWith("/auth/refresh")) {
await refresh(); console.log("Path is not refresh endpoint");
} catch (error: any) { try {
if (error?.response?.status === 401) { console.log("Trying to refresh");
reauthFailed = true; await refresh();
await revoke(); console.log("Successfully refreshed token");
return; } catch (error: any) {
} console.log("Failed to refresh token");
} if (error?.response?.status === 401) {
} console.log("Refresh returned 401");
} reauthFailed = true;
throw error; console.log("Revoking");
} await revoke();
} console.log("Redirecting to login");
} catch (error) { await navigateTo("/login");
console.error("error:", error); console.log("redirected");
} return;
}
}
} else {
console.log("Path is refresh endpoint, throwing error");
throw error;
}
}
console.log("throwing error");
throw error;
}
}
} }