From 74166ad91211f753452cb011d71cd8cfa8dcb485 Mon Sep 17 00:00:00 2001
From: ariannedee <ariannedee@gmail.com>
Date: Tue, 22 Sep 2020 17:30:44 -0700
Subject: [PATCH] DIV-1142: Check that it's a valid email address

---
 edivorce/apps/core/static/js/functions.js              | 10 +++++++---
 edivorce/apps/core/static/js/signing-filing.js         |  6 ++++--
 .../core/templates/dashboard/sign_file_options.html    |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/edivorce/apps/core/static/js/functions.js b/edivorce/apps/core/static/js/functions.js
index a8d93ec6..795c2a56 100644
--- a/edivorce/apps/core/static/js/functions.js
+++ b/edivorce/apps/core/static/js/functions.js
@@ -337,6 +337,12 @@ var getValue = function(el, question){
     }
 };
 
+var isEmailValid = function(el) {
+    var value = el.val();
+    var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+    return regex.test(value);
+}
+
 // check if email is in valid format
 var validateEmail = function(el){
 
@@ -345,9 +351,7 @@ var validateEmail = function(el){
         .find('span.help-block')
         .remove();
 
-    var value = el.val();
-    var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
-    if (regex.test(value)) {
+    if (isEmailValid(el)) {
         return true;
     } else {
         el.closest('.form-group')
diff --git a/edivorce/apps/core/static/js/signing-filing.js b/edivorce/apps/core/static/js/signing-filing.js
index ee8a9bdd..5f27403a 100644
--- a/edivorce/apps/core/static/js/signing-filing.js
+++ b/edivorce/apps/core/static/js/signing-filing.js
@@ -98,13 +98,15 @@ $(window).load(function () {
 
     $('#check-email-filled').on('click', function (e) {
         var yourEmailInput = $('#email-you-input');
-        var yourEmailError = yourEmailInput.is(":visible") && !yourEmailInput.val();
+        var yourEmailError = yourEmailInput.is(":visible") && !(yourEmailInput.val() && isEmailValid(yourEmailInput));
         var spouseEmailInput = $('#email-spouse-input');
-        var spouseEmailError = spouseEmailInput.is(":visible") && !spouseEmailInput.val();
+        var spouseEmailError = spouseEmailInput.is(":visible") && !(spouseEmailInput.val() && isEmailValid(spouseEmailInput));
         if (yourEmailError || spouseEmailError) {
             $('#unfilled-email-alert').show();
             $('#error-email-you').toggle(yourEmailError)
             $('#error-email-spouse').toggle(spouseEmailError)
+            yourEmailInput.toggleClass('error', yourEmailError);
+            spouseEmailInput.toggleClass('error', spouseEmailError);
             e.preventDefault();
         } else {
             $('#unfilled-email-alert').hide();
diff --git a/edivorce/apps/core/templates/dashboard/sign_file_options.html b/edivorce/apps/core/templates/dashboard/sign_file_options.html
index c5d9fefb..e7cbb23f 100644
--- a/edivorce/apps/core/templates/dashboard/sign_file_options.html
+++ b/edivorce/apps/core/templates/dashboard/sign_file_options.html
@@ -149,7 +149,7 @@
 
 <div class="information-message bg-danger add-top-margin" id="unfilled-email-alert" hidden>
     <p>
-        You must fill in the following field(s) before you can continue:
+        You must provide a valid email for the following field(s) before you can continue:
     </p>
     <ul>
         <li id="error-email-you">E-mail Address for You</li>