From e55080425ee91543fa503feb58c8241fee73f5ef Mon Sep 17 00:00:00 2001 From: sstefdev Date: Mon, 18 Nov 2024 07:50:43 +0100 Subject: [PATCH] fix: added validator for email validation --- package-lock.json | 18 ++++++++++++++++++ packages/create-invoice-form/package.json | 2 ++ .../src/lib/invoice/form.svelte | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 12e500bb..1e550943 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6471,6 +6471,13 @@ "integrity": "sha512-7gqG38EyHgyP1S+7+xomFtL+ZNHcKv6DwNaCZmJmo1vgMugyF3TCnXVg4t1uk89mLNwnLtnY3TpOpCOyp1/xHQ==", "license": "MIT" }, + "node_modules/@types/validator": { + "version": "13.12.2", + "resolved": "https://registry.npmjs.org/@types/validator/-/validator-13.12.2.tgz", + "integrity": "sha512-6SlHBzUW8Jhf3liqrGGXyTJSIFe4nqlJ5A5KaMZ2l/vbM3Wh3KSybots/wfWVzNLK4D1NZluDlSQIbIEPx6oyA==", + "dev": true, + "license": "MIT" + }, "node_modules/@types/yargs": { "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", @@ -16863,6 +16870,15 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/validator": { + "version": "13.12.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz", + "integrity": "sha512-c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==", + "license": "MIT", + "engines": { + "node": ">= 0.10" + } + }, "node_modules/valtio": { "version": "1.11.2", "license": "MIT", @@ -17502,10 +17518,12 @@ "@requestnetwork/data-format": "0.19.1", "@requestnetwork/request-client.js": "0.50.0", "@wagmi/core": "^2.13.8", + "validator": "^13.12.0", "viem": "^2.9.15" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.5.2", + "@types/validator": "^13.12.2", "svelte": "^4.0.5", "svelte-check": "^3.6.0", "typescript": "^5.0.0", diff --git a/packages/create-invoice-form/package.json b/packages/create-invoice-form/package.json index 060549b9..8b230958 100644 --- a/packages/create-invoice-form/package.json +++ b/packages/create-invoice-form/package.json @@ -36,10 +36,12 @@ "@requestnetwork/data-format": "0.19.1", "@requestnetwork/request-client.js": "0.50.0", "@wagmi/core": "^2.13.8", + "validator": "^13.12.0", "viem": "^2.9.15" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.5.2", + "@types/validator": "^13.12.2", "svelte": "^4.0.5", "svelte-check": "^3.6.0", "typescript": "^5.0.0", diff --git a/packages/create-invoice-form/src/lib/invoice/form.svelte b/packages/create-invoice-form/src/lib/invoice/form.svelte index 8e411fc2..11202080 100644 --- a/packages/create-invoice-form/src/lib/invoice/form.svelte +++ b/packages/create-invoice-form/src/lib/invoice/form.svelte @@ -17,6 +17,7 @@ import { calculateItemTotal } from "@requestnetwork/shared-utils/invoiceTotals"; import { checkAddress } from "@requestnetwork/shared-utils/checkEthAddress"; import { inputDateFormat } from "@requestnetwork/shared-utils/formatDate"; + import isEmail from "validator/es/lib/isEmail"; export let config: IConfig; export const invoiceNumber: number = 1; @@ -45,8 +46,7 @@ } const validateEmail = (email: string, type: "sellerInfo" | "buyerInfo") => { - const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/; - validationErrors[`${type}`].email = !emailRegex.test(email); + validationErrors[`${type}`].email = !isEmail(email); }; const checkPayeeAddress = () => {