Fixed: Incorrect Email Validation and Persistent display of error mes…

…sage on message selection in MailExportForm RocketChat#32974
Shahmaz0 · Sep 23, 2024 · bc0bf6a · bc0bf6a
1 parent c4fd29e
commit bc0bf6a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -159,7 +159,7 @@ const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportForm
 													return undefined;
 												}
 
-												if (additionalEmails !== '' && validateEmail(additionalEmails)) {
+												if (additionalEmails !== '' && validateEmail(additionalEmails, {style: 'rfc'})) {
 													return undefined;
 												}
 

diff --git a/apps/meteor/lib/emailValidator.ts b/apps/meteor/lib/emailValidator.ts
@@ -1,7 +1,8 @@
 export const validateEmail = (email: string, options: { style: string } = { style: 'basic' }): boolean => {
 	const basicEmailRegex = /^[^@]+@[^@]+$/;
-	const rfcEmailRegex =
-		/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
+
+	const rfcEmailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+
 
 	switch (options.style) {
 		case 'rfc':