Compare commits

..

No commits in common. "30092e51bf00da8b06e9a7c9b7c0b264ef18ea01" and "db5c8fbe48a0145809c453a48468180bec9b525d" have entirely different histories.

View File

@ -19,17 +19,11 @@ const LoginPage = () => {
const loginSchema = IsLoginWithOTP
? z.object({
username: z.string()
.trim()
.email({ message: "Valid email required" }),
username: z.string().email({ message: "Valid email required" }),
})
: z.object({
username: z.string()
.trim()
.email({ message: "Valid email required" }),
password: z.string()
.trim()
.min(1, { message: "Password required" }),
username: z.string().email({ message: "Valid email required" }),
password: z.string().min(1, { message: "Password required" }),
rememberMe: z.boolean(),
});
@ -47,24 +41,20 @@ const LoginPage = () => {
setLoading(true);
try {
const username = data.username.trim();
const password = data.password?.trim();
if (!IsLoginWithOTP) {
const userCredential = {
username,
password,
username: data.username,
password: data.password,
};
const response = await AuthRepository.login(userCredential);
localStorage.setItem("jwtToken", response.data.token);
localStorage.setItem("refreshToken", response.data.refreshToken);
setLoading(false);
navigate("/dashboard");
} else {
await AuthRepository.sendOTP({ email: username });
await AuthRepository.sendOTP({ email: data.username });
showToast("OTP has been sent to your email.", "success");
localStorage.setItem("otpUsername", username);
localStorage.setItem("otpUsername", data.username);
localStorage.setItem("otpSentTime", now.toString());
navigate("/auth/login-otp");
}
@ -74,7 +64,6 @@ const LoginPage = () => {
}
};
useEffect(() => {
const otpSentTime = localStorage.getItem("otpSentTime");
if (