idanoo/autobrr
1
0
Fork 0
mirror of https://github.com/idanoo/autobrr synced 2025-07-24 01:09:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(auth): cookie expiry and renewal (#1527)

Browse source 
* fix(auth/web): logout when expired/invalid/no cookie is present

* fix(auth/web): specify error message in invalid cookie

* fix(auth/web): reset error boundary on login

* fix(auth/web): fix onboarding

* chore: code cleanup

* fix(web): revert tanstack/router to 1.31.0

* refactor(web): remove react-error-boundary

* feat(auth): refresh cookie when close to expiry

* enhancement(web): specify defaultError message in HttpClient

* fix(web): use absolute paths for router links (#1530)

* chore(web): bump `@tanstack/react-router` to `1.31.6`

* fix(web): settings routes

* fix(web): filter routes

* fix(web): remove unused ReleasesIndexRoute

* chore(web): add documentation for HttpClient

* chore(lint): remove unnecessary whitespace
This commit is contained in:
martylukyy 2024-05-08 10:38:02 +02:00 • committed by GitHub
parent 3dab295387
commit 8120c33f6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 364 additions and 366 deletions
Download patch file Download diff file Expand all files Collapse all files

49
web/src/api/QueryClient.tsx
View file

@ -6,26 +6,31 @@
import { QueryCache, QueryClient } from "@tanstack/react-query";
import { toast } from "react-hot-toast";
import Toast from "@components/notifications/Toast";
import { baseUrl } from "@utils";
import { AuthContext } from "@utils/Context";
import { redirect } from "@tanstack/react-router";
import { LoginRoute } from "@app/routes";
const MAX_RETRIES = 6;
const HTTP_STATUS_TO_NOT_RETRY = [400, 401, 403, 404];
export const queryClient = new QueryClient({
queryCache: new QueryCache({
onError: (error ) => {
console.error("query client error: ", error);
onError: (error, query) => {
console.error(`Caught error for query '${query.queryKey}': `, error);
toast.custom((t) => <Toast type="error" body={error?.message} t={t}/>);
// @ts-expect-error TS2339: Property status does not exist on type Error
if (error?.status === 401 || error?.status === 403) {
// @ts-expect-error TS2339: Property status does not exist on type Error
console.error("bad status, redirect to login", error?.status)
// Redirect to login page
window.location.href = baseUrl()+"login";
return
if (error.message === "Cookie expired or invalid.") {
AuthContext.reset();
redirect({
to: LoginRoute.to,
search: {
// Use the current location to power a redirect after login
// (Do not use `router.state.resolvedLocation` as it can
// potentially lag behind the actual current location)
redirect: location.href
},
});
return;
} else {
toast.custom((t) => <Toast type="error" body={ error?.message } t={ t }/>);
}
}
}),
@ -35,8 +40,12 @@ export const queryClient = new QueryClient({
// See https://tanstack.com/query/v4/docs/guides/query-retries#retry-delay
// delay = Math.min(1000 * 2 ** attemptIndex, 30000)
// retry: false,
throwOnError: true,
throwOnError: (error) => {
return error.message !== "Cookie expired or invalid.";
},
retry: (failureCount, error) => {
/*
console.debug("retry count:", failureCount)
console.error("retry err: ", error)
@ -46,7 +55,12 @@ export const queryClient = new QueryClient({
console.log(`retry: Aborting retry due to ${error.status} status`);
return false;
}
*/
if (error.message === "Cookie expired or invalid.") {
return false;
}
console.error(`Retrying query (N=${failureCount}): `, error);
return failureCount <= MAX_RETRIES;
},
},
@ -54,8 +68,9 @@ export const queryClient = new QueryClient({
onError: (error) => {
console.log("mutation error: ", error)
// TODO: Maybe unneeded with our little HttpClient refactor.
if (error instanceof Response) {
return
return;
}
// Use a format string to convert the error object to a proper string without much hassle.
@ -68,4 +83,4 @@ export const queryClient = new QueryClient({
}
}
}
});
});