From 2a4089da89b1769ab0beee5eea1ec0deab1732da Mon Sep 17 00:00:00 2001 From: Italo A Date: Thu, 28 Sep 2023 00:52:01 +0000 Subject: [PATCH 1/2] fix: mfa infinite loop --- frontend/src/components/MFAModal/MFACode.tsx | 5 +++-- frontend/src/components/MFAModal/MFASuccess.tsx | 10 +++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/MFAModal/MFACode.tsx b/frontend/src/components/MFAModal/MFACode.tsx index b78c2e0c..a4fd3c7d 100644 --- a/frontend/src/components/MFAModal/MFACode.tsx +++ b/frontend/src/components/MFAModal/MFACode.tsx @@ -11,16 +11,16 @@ type MFACodeProps = { export default function MFACode({ handleStep }: MFACodeProps) { const [code, setCode] = useState(["", "", "", "", "", ""]); - const { user } = useContext(AuthContext); + const { user,setUser } = useContext(AuthContext); const handleSubmit = async () => { // Handle submission logic here - console.log("Submitted code:", code.join("")); const endpoint = user.mfaEnabled ? "/auth/2fa/disable" : "/auth/2fa/enable"; await api .post(endpoint, { code: code.join("") }, { withCredentials: true }) .then((r) => { if (r.status == 201) handleStep(2); + setUser({ ...user, mfaEnabled: !user.mfaEnabled }); }) .catch((e) => { toast.error("Código inválido", { @@ -29,6 +29,7 @@ export default function MFACode({ handleStep }: MFACodeProps) { console.log(e); }); }; + const baseURL = process.env.NEXT_PUBLIC_API_URL; return ( diff --git a/frontend/src/components/MFAModal/MFASuccess.tsx b/frontend/src/components/MFAModal/MFASuccess.tsx index 06ea6ba9..35c57efa 100644 --- a/frontend/src/components/MFAModal/MFASuccess.tsx +++ b/frontend/src/components/MFAModal/MFASuccess.tsx @@ -1,14 +1,10 @@ import { AuthContext } from "@/contexts/AuthContext"; import { useContext } from "react"; -type MFASuccessProps = { - handleStep: (step: number) => void; -}; -export default function MFASuccess({ handleStep }: MFASuccessProps) { - const { user, setUser } = useContext(AuthContext); - // TODO solve infinite loop - setUser({ ...user, mfaEnabled: !user.mfaEnabled }); +export default function MFASuccess() { + const { user } = useContext(AuthContext); + return ( <>
From 9b45808648b0b2ec1b1473cad24fc4a29424741c Mon Sep 17 00:00:00 2001 From: Juliano Date: Fri, 29 Sep 2023 01:13:52 +0000 Subject: [PATCH 2/2] Removes unused component parameter --- frontend/src/components/MFAModal/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/MFAModal/index.tsx b/frontend/src/components/MFAModal/index.tsx index a6aadc2b..6ac78b34 100644 --- a/frontend/src/components/MFAModal/index.tsx +++ b/frontend/src/components/MFAModal/index.tsx @@ -74,7 +74,7 @@ export default function MFAModal() { ) : step === 1 ? ( ) : step === 2 ? ( - + ) : null}