fix: use useeffect to cleanup timeout

This commit is contained in:
Stavros
2025-09-01 17:29:23 +03:00
parent 57dd8a6d81
commit 0c18a64466
3 changed files with 34 additions and 14 deletions

View File

@@ -17,7 +17,7 @@ import { useIsMounted } from "@/lib/hooks/use-is-mounted";
import { LoginSchema } from "@/schemas/login-schema"; import { LoginSchema } from "@/schemas/login-schema";
import { useMutation } from "@tanstack/react-query"; import { useMutation } from "@tanstack/react-query";
import axios, { AxiosError } from "axios"; import axios, { AxiosError } from "axios";
import { useEffect } from "react"; import { useEffect, useRef } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Navigate, useLocation } from "react-router"; import { Navigate, useLocation } from "react-router";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -30,6 +30,8 @@ export const LoginPage = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const isMounted = useIsMounted(); const isMounted = useIsMounted();
const redirectTimer = useRef<number | null>(null);
const searchParams = new URLSearchParams(search); const searchParams = new URLSearchParams(search);
const redirectUri = searchParams.get("redirect_uri"); const redirectUri = searchParams.get("redirect_uri");
@@ -49,11 +51,9 @@ export const LoginPage = () => {
description: t("loginOauthSuccessSubtitle"), description: t("loginOauthSuccessSubtitle"),
}); });
const redirect = setTimeout(() => { redirectTimer.current = window.setTimeout(() => {
window.location.replace(data.data.url); window.location.replace(data.data.url);
}, 500); }, 500);
return () => clearTimeout(redirect);
}, },
onError: () => { onError: () => {
toast.error(t("loginOauthFailTitle"), { toast.error(t("loginOauthFailTitle"), {
@@ -77,13 +77,11 @@ export const LoginPage = () => {
description: t("loginSuccessSubtitle"), description: t("loginSuccessSubtitle"),
}); });
const redirect = setTimeout(() => { redirectTimer.current = window.setTimeout(() => {
window.location.replace( window.location.replace(
`/continue?redirect_uri=${encodeURIComponent(redirectUri ?? "")}`, `/continue?redirect_uri=${encodeURIComponent(redirectUri ?? "")}`,
); );
}, 500); }, 500);
return () => clearTimeout(redirect);
}, },
onError: (error: AxiosError) => { onError: (error: AxiosError) => {
toast.error(t("loginFailTitle"), { toast.error(t("loginFailTitle"), {
@@ -108,6 +106,13 @@ export const LoginPage = () => {
} }
}, []); }, []);
useEffect(
() => () => {
if (redirectTimer.current) clearTimeout(redirectTimer.current);
},
[],
);
if (isLoggedIn) { if (isLoggedIn) {
return <Navigate to="/logout" />; return <Navigate to="/logout" />;
} }

View File

@@ -11,6 +11,7 @@ import { useUserContext } from "@/context/user-context";
import { capitalize } from "@/lib/utils"; import { capitalize } from "@/lib/utils";
import { useMutation } from "@tanstack/react-query"; import { useMutation } from "@tanstack/react-query";
import axios from "axios"; import axios from "axios";
import { useEffect, useRef } from "react";
import { Trans, useTranslation } from "react-i18next"; import { Trans, useTranslation } from "react-i18next";
import { Navigate } from "react-router"; import { Navigate } from "react-router";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -20,6 +21,8 @@ export const LogoutPage = () => {
const { genericName } = useAppContext(); const { genericName } = useAppContext();
const { t } = useTranslation(); const { t } = useTranslation();
const redirectTimer = useRef<number | null>(null);
const logoutMutation = useMutation({ const logoutMutation = useMutation({
mutationFn: () => axios.post("/api/user/logout"), mutationFn: () => axios.post("/api/user/logout"),
mutationKey: ["logout"], mutationKey: ["logout"],
@@ -28,11 +31,9 @@ export const LogoutPage = () => {
description: t("logoutSuccessSubtitle"), description: t("logoutSuccessSubtitle"),
}); });
const redirect = setTimeout(() => { redirectTimer.current = window.setTimeout(() => {
window.location.replace("/login"); window.location.replace("/login");
}, 500); }, 500);
return () => clearTimeout(redirect);
}, },
onError: () => { onError: () => {
toast.error(t("logoutFailTitle"), { toast.error(t("logoutFailTitle"), {
@@ -41,6 +42,13 @@ export const LogoutPage = () => {
}, },
}); });
useEffect(
() => () => {
if (redirectTimer.current) clearTimeout(redirectTimer.current);
},
[],
);
if (!isLoggedIn) { if (!isLoggedIn) {
return <Navigate to="/login" />; return <Navigate to="/login" />;
} }

View File

@@ -12,7 +12,7 @@ import { useUserContext } from "@/context/user-context";
import { TotpSchema } from "@/schemas/totp-schema"; import { TotpSchema } from "@/schemas/totp-schema";
import { useMutation } from "@tanstack/react-query"; import { useMutation } from "@tanstack/react-query";
import axios from "axios"; import axios from "axios";
import { useId } from "react"; import { useEffect, useId, useRef } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Navigate, useLocation } from "react-router"; import { Navigate, useLocation } from "react-router";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -23,6 +23,8 @@ export const TotpPage = () => {
const { search } = useLocation(); const { search } = useLocation();
const formId = useId(); const formId = useId();
const redirectTimer = useRef<number | null>(null);
const searchParams = new URLSearchParams(search); const searchParams = new URLSearchParams(search);
const redirectUri = searchParams.get("redirect_uri"); const redirectUri = searchParams.get("redirect_uri");
@@ -34,13 +36,11 @@ export const TotpPage = () => {
description: t("totpSuccessSubtitle"), description: t("totpSuccessSubtitle"),
}); });
const redirect = setTimeout(() => { redirectTimer.current = window.setTimeout(() => {
window.location.replace( window.location.replace(
`/continue?redirect_uri=${encodeURIComponent(redirectUri ?? "")}`, `/continue?redirect_uri=${encodeURIComponent(redirectUri ?? "")}`,
); );
}, 500); }, 500);
return () => clearTimeout(redirect);
}, },
onError: () => { onError: () => {
toast.error(t("totpFailTitle"), { toast.error(t("totpFailTitle"), {
@@ -49,6 +49,13 @@ export const TotpPage = () => {
}, },
}); });
useEffect(
() => () => {
if (redirectTimer.current) clearTimeout(redirectTimer.current);
},
[],
);
if (!totpPending) { if (!totpPending) {
return <Navigate to="/" />; return <Navigate to="/" />;
} }