From 434d45248c99360882d6f5290fa76a1cb988e897 Mon Sep 17 00:00:00 2001
From: GotPPay <bilal@saburly.com>
Date: Fri, 19 Jan 2018 20:15:27 +0100
Subject: [PATCH] fix error in validation and undefined email value

---
 backend/helpers/email.js | 10 ++++++----
 backend/models/alexa.js  |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/backend/helpers/email.js b/backend/helpers/email.js
index 67d11aa..cf1bfb3 100644
--- a/backend/helpers/email.js
+++ b/backend/helpers/email.js
@@ -9,6 +9,7 @@ module.exports = {
     //dot = .
     //TODO: This list should be longer
     let transformedEmail = email
+      .replace (/\s/g, '') //remove all spaces
       .replace (/at/gi, '@')
       .replace (/underscore/gi, '_')
       .replace (/dash/gi, '-')
@@ -17,10 +18,11 @@ module.exports = {
     return transformedEmail;
   },
 
-  isEmailValid : function(email){
-      let validEmailRegex = /^(([^<>()\[\]\\.,;:\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,}))$/;
+  isEmailValid: function (email) {
+    console.log ('Email to validate : ' + email);
+    let validEmailRegex = /^(([^<>()\[\]\\.,;:\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,}))$/;
 
-      return validEmailRegex.test(email);
+    return validEmailRegex.test (email);
   },
 
   sendEmal: function (name, fromEmail, message, toEmail) {
@@ -59,7 +61,7 @@ module.exports = {
         to: toEmail,
         subject: 'Message from Saburly service',
         text: messageBody,
-        html: messageBodyHTML
+        html: messageBodyHTML,
       };
 
       transporter.sendMail (mailOptions, (error, info) => {
diff --git a/backend/models/alexa.js b/backend/models/alexa.js
index 3ba0c56..92f0fac 100644
--- a/backend/models/alexa.js
+++ b/backend/models/alexa.js
@@ -88,7 +88,7 @@ module.exports = {
               repromptSpeech
             );
           } else if (!intent.slots.Message.value) {
-            intent.slots.Email.value = emailHelper.transformEmailFromAlexaResponse(intent.slots.Message.value);
+            intent.slots.Email.value = emailHelper.transformEmailFromAlexaResponse(intent.slots.Email.value);
             if (
               !emailHelper.isEmailValid (
                 intent.slots.Email.value