remove captchas from this endpoint
All checks were successful
Deploy / deploy (ubuntu-latest, 2.44.0) (push) Successful in 1m25s

This commit is contained in:
Braydon 2024-09-20 00:11:05 -04:00
parent 338ce3edf1
commit cf122de847

@ -1,7 +1,7 @@
"use client"; "use client";
import { z } from "zod"; import { z } from "zod";
import { ReactElement, useEffect, useState } from "react"; import { ReactElement, useState } from "react";
import { useForm } from "react-hook-form"; import { useForm } from "react-hook-form";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Input } from "@/components/ui/input"; import { Input } from "@/components/ui/input";
@ -90,15 +90,11 @@ const AuthForm = (): ReactElement => {
const [stage, setStage] = useState<"email" | "register" | "login">("email"); const [stage, setStage] = useState<"email" | "register" | "login">("email");
const [loading, setLoading] = useState<boolean>(false); const [loading, setLoading] = useState<boolean>(false);
const [awaitingCaptcha, setAwaitingCaptcha] = useState<boolean>(true);
const [captchaResponse, setCaptchaResponse] = useState<string | undefined>( const [captchaResponse, setCaptchaResponse] = useState<string | undefined>(
undefined undefined
); );
const [borderCrossing, setBorderCrossing] = useState<boolean>(false); const [borderCrossing, setBorderCrossing] = useState<boolean>(false);
const [tfaPin, setTfaPin] = useState<string | undefined>(); const [tfaPin, setTfaPin] = useState<string | undefined>();
const [error, setError] = useState<string | undefined>(undefined); const [error, setError] = useState<string | undefined>(undefined);
// Build the form // Build the form
@ -116,12 +112,6 @@ const AuthForm = (): ReactElement => {
), ),
}); });
// Received the captcha response
useEffect(() => {
console.log("Received new captcha response");
setAwaitingCaptcha(false);
}, [captchaResponse]);
/** /**
* Handle submitting the form. * Handle submitting the form.
*/ */
@ -131,24 +121,18 @@ const AuthForm = (): ReactElement => {
password, password,
passwordConfirmation, passwordConfirmation,
}: any) => { }: any) => {
// Prevent submitting when the captcha is being fetched
if (awaitingCaptcha) {
return;
}
setLoading(true); setLoading(true);
if (stage === "email") { if (stage === "email") {
const { data, error } = await apiRequest<{ exists: boolean }>({ const { data, error } = await apiRequest<{ exists: boolean }>({
endpoint: `/user/exists`, endpoint: `/user/exists`,
method: "POST", method: "POST",
body: { email, captchaResponse }, body: { email },
}); });
if (error) { if (error) {
setError(error.message); setError(error.message);
} else { } else {
setStage(data?.exists ? "login" : "register"); setStage(data?.exists ? "login" : "register");
} }
setAwaitingCaptcha(true);
turnstile.reset();
} else { } else {
const registering: boolean = stage === "register"; const registering: boolean = stage === "register";
const { data, error } = await apiRequest<UserAuthResponse>({ const { data, error } = await apiRequest<UserAuthResponse>({
@ -175,7 +159,6 @@ const AuthForm = (): ReactElement => {
setLoading(false); setLoading(false);
setBorderCrossing(true); setBorderCrossing(true);
setError(undefined); setError(undefined);
setAwaitingCaptcha(true);
turnstile.reset(); turnstile.reset();
return; return;
} }
@ -183,7 +166,6 @@ const AuthForm = (): ReactElement => {
// Reset the captcha if auth fails // Reset the captcha if auth fails
if (error) { if (error) {
setAwaitingCaptcha(true);
turnstile.reset(); turnstile.reset();
} else { } else {
// Otherwise store the session and redirect to the dashboard // Otherwise store the session and redirect to the dashboard
@ -256,7 +238,6 @@ const AuthForm = (): ReactElement => {
className="pl-8 rounded-lg" className="pl-8 rounded-lg"
type="password" type="password"
placeholder="Password" placeholder="Password"
disabled={awaitingCaptcha}
{...register("password")} {...register("password")}
/> />
</motion.div> </motion.div>
@ -320,7 +301,7 @@ const AuthForm = (): ReactElement => {
<Button <Button
className="h-11 flex gap-2.5 items-center text-white border border-secondary transition-all transform-gpu group" className="h-11 flex gap-2.5 items-center text-white border border-secondary transition-all transform-gpu group"
type="submit" type="submit"
disabled={loading || awaitingCaptcha} disabled={loading}
> >
{loading && <ArrowPathIcon className="w-4 h-4 animate-spin" />} {loading && <ArrowPathIcon className="w-4 h-4 animate-spin" />}
<span className="-translate-y-0.5"> <span className="-translate-y-0.5">