Merge pull request #1179 from JulianAdams4/email-regex

Accept external email addresses format

Author: JulianAdams4

electron_app/src/utils/RegexUtils.js

@@ -1,4 +1,5 @@
-const emailRegex = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/;
+/* eslint no-useless-escape: 0 */
+const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const HTMLTagsRegex = /<[^>]*>?/g;
 const mailtoProtocolRegex = /^mailto:/;
 const mailformedEventRegex = /(\[|,)null(\]|,)/g;

electron_app/src/utils/__tests__/RegexUtils.js

@@ -1,8 +1,8 @@
 /* eslint-env node, jest */
-const { mailformedEventRegex } = require('./../RegexUtils');
+const { mailformedEventRegex, emailRegex } = require('./../RegexUtils');
 
-describe('Regex Utils: ', () => {
-  it(' Should match malformed events ', () => {
+describe('Regex Utils: Pending events: ', () => {
+  it('Should match malformed events ', () => {
     const invalidStartComma =
       '{"cmd":304,"params":{"labelsAdded":["Spam"],"labelsRemoved":[],"threadIds":[,null]}}';
     const invalidBetweenComma =
@@ -18,7 +18,7 @@ describe('Regex Utils: ', () => {
     expect(invalidWithoutComma.match(mailformedEventRegex)).not.toBe(null);
   });
 
-  it(' Should not match wellformed events ', () => {
+  it('Should not match wellformed events ', () => {
     const validAdded =
       '{"cmd":304,"params":{"labelsAdded":["null"],"labelsRemoved":[],"threadIds":["<1>"]}}';
     const validRemoved =
@@ -31,3 +31,53 @@ describe('Regex Utils: ', () => {
     expect(validAddedAndRemoved.match(mailformedEventRegex)).toBeNull();
   });
 });
+
+describe('Regex Utils: Email address: ', () => {
+  it('Should match valid email addresses', () => {
+    const validEmailAddresses = [
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      'email@[123.123.123.123]',
+      '"email"@domain.com',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      'あいうえお@domain.com',
+      '[email protected]',
+      'reply+adelvyfdwyausnlpgjrihp53sytbxevbnhhb3iv4oy@reply.github.com'
+    ];
+    for (const emailAddress of validEmailAddresses) {
+      expect(emailAddress.match(emailRegex)).not.toBe(null);
+    }
+  });
+
+  it('Should not match invalid email addresses', () => {
+    const invalidEmailAddresses = [
+      'plainaddress',
+      '#@%^%#$@#$@#.com',
+      '@domain.com',
+      'Joe Smith <[email protected]>',
+      'email.domain.com',
+      'email@[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected]',
+      '[email protected] (Joe Smith)',
+      'email@domain',
+      '[email protected]',
+      '[email protected]'
+    ];
+    for (const emailAddress of invalidEmailAddresses) {
+      expect(emailAddress.match(emailRegex)).toBe(null);
+    }
+  });
+});

email_composer/src/utils/RegexUtils.js

@@ -1,4 +1,5 @@
-export const emailRegex = /^(([a-z]*\+)?[\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$/;
+/* eslint no-useless-escape: 0 */
+export const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 export const HTMLTagsRegex = /<[^>]*>?/g;
 export const contactsRegex = string =>
   new RegExp(`(^${string}| ${string})`, 'i');

email_mailbox/src/utils/RegexUtils.js

@@ -1,3 +1,4 @@
-export const emailRegex = /^([\w-]+(?:\.[\w-]+)*)@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,8}(?:\.[a-z]{2})?)$/;
+/* eslint no-useless-escape: 0 */
+export const emailRegex = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 export const HTMLTagsRegex = /<[^>]*>?/g;
 export const mimeTypeImageRegex = /image\/([a-z][-+])*/;

email_mailbox/src/utils/__tests__/EmailUtils.js

@@ -190,7 +190,7 @@ describe('Form recipients', () => {
     const data = {
       to: ['<[email protected]>'],
       cc: [
-        'Name<>1 <[email protected]>',
+        'Name<>1 <[email protected]>',
         '<[email protected]> <[email protected]>',
         '[email protected] <[email protected]>'
       ],
@@ -217,7 +217,7 @@ describe('Check email is: to me or from me', () => {
     const data = {
       to: ['<[email protected]>'],
       cc: [
-        'Name<>1 <[email protected]>',
+        'Name<>1 <[email protected]>',
         '<[email protected]> <[email protected]>',
         '[email protected] <[email protected]>'
       ],
@@ -233,7 +233,7 @@ describe('Check email is: to me or from me', () => {
     const data = {
       to: ['<[email protected]>'],
       cc: [
-        'Name<>1 <[email protected]>',
+        'Name<>1 <[email protected]>',
         '<[email protected]> <[email protected]>',
         '[email protected] <[email protected]>'
       ],

email_mailbox/src/utils/__tests__/__snapshots__/EmailUtils.js.snap

@@ -12,7 +12,7 @@ Object {
     "[email protected]",
   ],
   "cc": Array [
-    "Name<>1 <[email protected]>",
+    "Name<>1 <[email protected]>",
     "<[email protected]> <[email protected]>",
     "[email protected] <[email protected]>",
   ],