nihonium/nyanimedb
1
0
Fork 1
Code Issues 12 Pull requests Releases Packages 3 Activity Actions

Merge branch 'front' of ssh://meowgit.nekoea.red:22222/nihonium/nyanimedb into front
Some checks failed
Build (frontend build only) / build (push) Failing after 1m15s
Details

Browse source
This commit is contained in:
Iron_Felix 2025-12-20 03:14:07 +03:00
commit 088bd6ffaf
1 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

48
modules/frontend/src/api/AuthClient/AuthClient.ts
View file

@ -10,15 +10,13 @@ async function getRefreshed(): Promise<boolean> {
if (!refreshPromise) { if (!refreshPromise) {
refreshPromise = (async () => { refreshPromise = (async () => {
try { try {
const res = await refreshTokens(); const res = await refreshTokens({ throwOnError: true });
// consider refresh successful if res.data exists
return !!res.data; return !!res.data;
} catch (err) { } catch {
return false; // failed to refresh return false;
} }
})(); })();
} }
return refreshPromise; return refreshPromise;
} }
@ -27,29 +25,33 @@ const baseClient = createClient(createConfig<ClientOptions2>({ baseUrl: '/api/v1
export const authClient: Client = { export const authClient: Client = {
...baseClient, ...baseClient,
request: function < // Force the function to match the expected signature exactly
request: (async <
TData = unknown, TData = unknown,
TError = unknown, TError = unknown,
ThrowOnError extends boolean = true, ThrowOnError extends boolean = false,
TResponseStyle extends ResponseStyle = 'fields', TResponseStyle extends ResponseStyle = 'fields',
>( >(
options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> & options: Omit<RequestOptions<TData, TResponseStyle, ThrowOnError>, 'method'> &
Pick<Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>, 'method'> Pick<Required<RequestOptions<TData, TResponseStyle, ThrowOnError>>, 'method'>
): RequestResult<TData, TError, ThrowOnError, TResponseStyle> { ): Promise<RequestResult<TData, TError, ThrowOnError, TResponseStyle>> => {
// Initial request
let result = await baseClient.request<TData, TError, ThrowOnError, TResponseStyle>(options);
// Wrap logic inside a Promise to satisfy RequestResult type // Check for 401
return baseClient.request<TData, TError, ThrowOnError, TResponseStyle>(options).catch(async (err: any) => { if ((result as any)?.error?.response?.status === 401) {
if (err?.status === 401) { const refreshed = await getRefreshed();
const refreshed = await getRefreshed();
if (!refreshed) { if (refreshed) {
localStorage.clear(); // Retry
window.location.href = "/login"; result = await baseClient.request<TData, TError, ThrowOnError, TResponseStyle>(options);
throw err; } else {
} localStorage.clear();
// Retry original request window.location.href = "/login";
return baseClient.request<TData, TError, ThrowOnError, TResponseStyle>(options);
} }
throw err; }
}) as RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
}, return result as RequestResult<TData, TError, ThrowOnError, TResponseStyle>;
}; }) as Client['request'], // Cast the function itself to match the Client interface
};