Username & Password field should auto-trim spaces in Login page.
This commit is contained in:
parent
7283140a3a
commit
438ee4417f
@ -19,11 +19,17 @@ const LoginPage = () => {
|
|||||||
|
|
||||||
const loginSchema = IsLoginWithOTP
|
const loginSchema = IsLoginWithOTP
|
||||||
? z.object({
|
? z.object({
|
||||||
username: z.string().email({ message: "Valid email required" }),
|
username: z.string()
|
||||||
|
.trim()
|
||||||
|
.email({ message: "Valid email required" }),
|
||||||
})
|
})
|
||||||
: z.object({
|
: z.object({
|
||||||
username: z.string().email({ message: "Valid email required" }),
|
username: z.string()
|
||||||
password: z.string().min(1, { message: "Password required" }),
|
.trim()
|
||||||
|
.email({ message: "Valid email required" }),
|
||||||
|
password: z.string()
|
||||||
|
.trim()
|
||||||
|
.min(1, { message: "Password required" }),
|
||||||
rememberMe: z.boolean(),
|
rememberMe: z.boolean(),
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -41,20 +47,24 @@ const LoginPage = () => {
|
|||||||
setLoading(true);
|
setLoading(true);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
const username = data.username.trim();
|
||||||
|
const password = data.password?.trim();
|
||||||
|
|
||||||
if (!IsLoginWithOTP) {
|
if (!IsLoginWithOTP) {
|
||||||
const userCredential = {
|
const userCredential = {
|
||||||
username: data.username,
|
username,
|
||||||
password: data.password,
|
password,
|
||||||
};
|
};
|
||||||
|
|
||||||
const response = await AuthRepository.login(userCredential);
|
const response = await AuthRepository.login(userCredential);
|
||||||
localStorage.setItem("jwtToken", response.data.token);
|
localStorage.setItem("jwtToken", response.data.token);
|
||||||
localStorage.setItem("refreshToken", response.data.refreshToken);
|
localStorage.setItem("refreshToken", response.data.refreshToken);
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
navigate("/dashboard");
|
navigate("/dashboard");
|
||||||
} else {
|
} else {
|
||||||
await AuthRepository.sendOTP({ email: data.username });
|
await AuthRepository.sendOTP({ email: username });
|
||||||
showToast("OTP has been sent to your email.", "success");
|
showToast("OTP has been sent to your email.", "success");
|
||||||
localStorage.setItem("otpUsername", data.username);
|
localStorage.setItem("otpUsername", username);
|
||||||
localStorage.setItem("otpSentTime", now.toString());
|
localStorage.setItem("otpSentTime", now.toString());
|
||||||
navigate("/auth/login-otp");
|
navigate("/auth/login-otp");
|
||||||
}
|
}
|
||||||
@ -64,6 +74,7 @@ const LoginPage = () => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const otpSentTime = localStorage.getItem("otpSentTime");
|
const otpSentTime = localStorage.getItem("otpSentTime");
|
||||||
if (
|
if (
|
||||||
|
Loading…
x
Reference in New Issue
Block a user