Merge pull request #1135 from 18F/lkb-email_validation_rfc822

Correct validator to use rfc822 email validation
cloud-gov · Jun 23, 2017 · bcb8b25 · bcb8b25
2 parents d2fca51 + 41addee
commit bcb8b25
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/static_src/test/unit/util/validators.spec.js b/static_src/test/unit/util/validators.spec.js
@@ -31,13 +31,23 @@ describe('validateEmail', function () {
     });
 
     it('fails for none emails string@', function () {
-      const result = validator('domain@place');
+      const result = validator('domain@');
+      expect(result).toEqual({ message: 'The value entered is not a valid e-mail address' });
+    });
+
+    it('fails for none emails string@domain.', function () {
+      const result = validator('domain@domain.');
       expect(result).toEqual({ message: 'The value entered is not a valid e-mail address' });
     });
 
     it('fails for none emails string@string', function () {
       const result = validator('domain@place');
-      expect(result).toEqual({ message: 'The value entered is not a valid e-mail address' });
+      expect(result).toEqual(null);
+    });
+
+    it('fails for none emails string@string.com.co', function () {
+      const result = validator('domain@place');
+      expect(result).toEqual(null);
     });
 
     it('succeeds for email', function () {

diff --git a/static_src/util/validators.js b/static_src/util/validators.js
@@ -1,3 +1,5 @@
+const EMAIL_REGEX = /^[a-zA-Z0-9.!#$%&amp;'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/;
+
 export function validateInteger(options) {
   const { max, min } = options || {};
   return function _validateInteger(text) {
@@ -41,7 +43,7 @@ export function validateString() {
 
 export function validateEmail() {
   return function _validateEmail(value, name) {
-    if (!(/^\w+([\.-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/.test(value))) {
+    if (!(EMAIL_REGEX).test(value)) {
       const nameString = (name ? `in ${name} ` : '');
       return {
         message: `The value entered ${nameString}is not a valid e-mail address`