FreakU
/
pronounsfu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: log user out if token is invalid (fixes #50)

This commit is contained in:
Sam 2023-04-19 00:41:20 +02:00
parent f5d7bc4095
commit 661f0254fd
No known key found for this signature in database
GPG Key ID: B4EF20DDE721CAA1
1 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
frontend/src/lib/api/fetch.ts
View File

@ -1,6 +1,8 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
import type { APIError } from "./entities"; import { ErrorCode, type APIError } from "./entities";
import { PUBLIC_BASE_URL } from "$env/static/public"; import { PUBLIC_BASE_URL } from "$env/static/public";
import { addToast } from "$lib/toast";
import { userStore } from "$lib/store";
export async function apiFetch<T>( export async function apiFetch<T>(
path: string, path: string,
@ -26,8 +28,24 @@ export async function apiFetch<T>(
return data as T; return data as T;
} }
export const apiFetchClient = async <T>(path: string, method = "GET", body: any = null) => export const apiFetchClient = async <T>(path: string, method = "GET", body: any = null) => {
apiFetch<T>(path, { method, body, token: localStorage.getItem("pronouns-token") || undefined }); try {
const data = await apiFetch<T>(path, {
method,
body,
token: localStorage.getItem("pronouns-token") || undefined,
});
return data;
} catch (e) {
if ((e as APIError).code === ErrorCode.InvalidToken) {
addToast({ header: "Token expired", body: "Your token has expired, please log in again." });
userStore.set(null);
localStorage.removeItem("pronouns-token");
localStorage.removeItem("pronouns-user");
}
throw e;
}
};
/** Fetches the specified path without parsing the response body. */ /** Fetches the specified path without parsing the response body. */
export async function fastFetch( export async function fastFetch(
@ -53,5 +71,20 @@ export async function fastFetch(
} }
/** Fetches the specified path without parsing the response body. */ /** Fetches the specified path without parsing the response body. */
export const fastFetchClient = async (path: string, method = "GET", body: any = null) => export const fastFetchClient = async (path: string, method = "GET", body: any = null) => {
fastFetch(path, { method, body, token: localStorage.getItem("pronouns-token") || undefined }); try {
await fastFetch(path, {
method,
body,
token: localStorage.getItem("pronouns-token") || undefined,
});
} catch (e) {
if ((e as APIError).code === ErrorCode.InvalidToken) {
addToast({ header: "Token expired", body: "Your token has expired, please log in again." });
userStore.set(null);
localStorage.removeItem("pronouns-token");
localStorage.removeItem("pronouns-user");
}
throw e;
}
};