Skip to content

Commit

Permalink
Use phonenumber lib instead of regex for phone number validation for …
Browse files Browse the repository at this point in the history
…better and flexible validation
  • Loading branch information
bhavberi committed Mar 12, 2024
1 parent d50c69f commit b379272
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 8 deletions.
6 changes: 6 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"graphql": "^16.8.1",
"graphql-tag": "^2.12.6",
"jwt-decode": "^4.0.0",
"libphonenumber-js": "^1.10.58",
"next": "^14.1.0",
"next-mdx-remote": "^4.4.1",
"nprogress": "^0.2.0",
Expand Down
22 changes: 18 additions & 4 deletions src/components/events/EventForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ import {
Select,
MenuItem,
} from "@mui/material";
import {
isValidPhoneNumber,
parsePhoneNumberWithError,
} from "libphonenumber-js";

import FileUpload from "components/FileUpload";
import EventBudget from "components/events/EventBudget";
Expand Down Expand Up @@ -1175,10 +1179,20 @@ function EventPOC({
name="poc_phone"
control={control}
rules={{
pattern: {
value:
/(\+\d{1,3}\s?)?((\(\d{3}\)\s?)|(\d{3})(\s|-?))(\d{3}(\s|-?))(\d{4})(\s?(([E|e]xt[:|.|]?)|x|X)(\s?\d+))?/g,
message: "Invalid phone number!",
validate: {
checkPhoneNumber: (value) => {
if (!value || value === "") return true;
try {
const phoneNumber = parsePhoneNumberWithError(value, {
defaultCountry: "IN",
});
return (
isValidPhoneNumber(value, "IN") || "Invalid Phone Number!"
);
} catch (error) {
return error.message;
}
},
},
required: "POC Phone number is required!",
}}
Expand Down
22 changes: 18 additions & 4 deletions src/components/profile/UserForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ import { useToast } from "components/Toast";

import { LoadingButton } from "@mui/lab";
import { Button, Grid, TextField, Typography } from "@mui/material";
import {
isValidPhoneNumber,
parsePhoneNumberWithError,
} from "libphonenumber-js";

import FileUpload from "components/FileUpload";
import ConfirmDialog from "components/ConfirmDialog";
Expand Down Expand Up @@ -150,10 +154,20 @@ export default function UserForm({ defaultValues = {}, action = "log" }) {
name="phone"
control={control}
rules={{
pattern: {
value:
/(\+\d{1,3}\s?)?((\(\d{3}\)\s?)|(\d{3})(\s|-?))(\d{3}(\s|-?))(\d{4})(\s?(([E|e]xt[:|.|]?)|x|X)(\s?\d+))?/g,
message: "Invalid phone number!",
validate: {
checkPhoneNumber: (value) => {
if (!value || value === "") return true;
try {
const phoneNumber = parsePhoneNumberWithError(value, {
defaultCountry: "IN",
});
return (
isValidPhoneNumber(value, "IN") || "Invalid Phone Number!"
);
} catch (error) {
return error.message;
}
},
},
}}
render={({ field, fieldState: { error, invalid } }) => (
Expand Down

0 comments on commit b379272

Please sign in to comment.