fix(LoginPage): enhance email and phone validation logic and update password length requirement

This commit is contained in:
Estifo77
2026-08-04 13:53:51 +03:00
parent 30d46dfc6b
commit 01105446a0

View File

@@ -34,12 +34,33 @@ import type {
} from "../types/auth.types";
import { useAuthConfig } from "../AuthConfig";
import { authStorage } from "../utils/auth-storage";
const emailOrPhone = z
.string()
.trim()
.transform((value) => {
// Convert 09xxxxxxxx -> +2519xxxxxxxx
if (/^09\d{8}$/.test(value)) {
return `+251${value.substring(1)}`;
}
return value;
})
.refine(
(value) => {
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
const phoneRegex = /^\+2519\d{8}$/;
return emailRegex.test(value) || phoneRegex.test(value);
},
{
message: "Enter a valid email or phone number (+2519xxxxxxxx)",
},
);
const schema = z.object({
email: z.string().email({ message: "Enter a valid email" }),
email: emailOrPhone,
password: z
.string()
.min(5, { message: "Password must be at least 6 characters" }),
.min(8, { message: "Password must be at least 8 characters" }),
});
type FormValues = z.infer<typeof schema>;
@@ -88,8 +109,8 @@ export function LoginPage() {
// `useCurrentProfile` resolves it again on demand.
try {
const { profile } = await profileTrigger({
url: '/profiles/me',
method: 'GET',
url: "/profiles/me",
method: "GET",
}).unwrap();
if (profile) {
authStorage.setProfileId(profile.id);
@@ -190,19 +211,6 @@ export function LoginPage() {
</Button>
</Stack>
</form>
<Divider label="or" labelPosition="center" />
<Button
variant="default"
fullWidth
size="md"
leftSection={<IconDeviceMobile size={18} />}
onClick={() => notify.info("Phone sign-in is coming soon.")}
>
Sign in with phone number
</Button>
{enableSignup && (
<Text ta="center" size="sm" c="dimmed">
Don&apos;t have an account?{" "}