admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Merge pull request 'Username & Password field should auto-trim spaces in Login page.' (#341) from Kartik_Bug#929 into Issues_Aug_1W

Browse Source 
Reviewed-on: #341
This commit is contained in:
Vikas Nale 2025-08-18 11:05:29 +00:00
commit 30092e51bf
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/pages/authentication/LoginPage.jsx
View File

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