From a0f2b044b22635a29ca333826e6db182a3ef68a7 Mon Sep 17 00:00:00 2001
From: Nedim Uka <nedim@saburly.com>
Date: Wed, 29 May 2019 17:04:16 +0200
Subject: [PATCH] Added validation to email confirmation

---
 app/controllers/querySubmit.js | 30 ++++++++++++++-----
 app/views/querySubmit.ejs      | 55 ++++++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 22 deletions(-)

diff --git a/app/controllers/querySubmit.js b/app/controllers/querySubmit.js
index 4ed6863..05f53bd 100644
--- a/app/controllers/querySubmit.js
+++ b/app/controllers/querySubmit.js
@@ -1,7 +1,7 @@
 const { currentRERequest } = require('../helpers/url');
 const { isValidEmail } = require('../helpers/email');
 
-const getQuerySubmit = async (req,res) => {
+const getQuerySubmit = async (req, res) => {
   const nextStep = req.query.nextStep;
   const error = req.query.error;
 
@@ -16,14 +16,30 @@ const postQuerySubmit = async (req, res) => {
   const nextStep = req.query.nextStep || '/ponovo';
 
   const emailInput = req.body.email;
+  const emailConfirmInput = req.body.confirm;
+  let error = "Greška ! Unesite validan email";
 
-  if (isValidEmail(emailInput)){
-    request.email = req.body.email;
-    await request.save();
-    res.redirect(nextStep);
-  } else {
-    res.redirect('?error=1');
+  if (!isValidEmail(emailInput) || !isValidEmail(emailInput)) {
+
+    error = "Greška ! Unesite validan email";
+    res.render('querySubmit', {
+      error
+    });
+    return;
   }
+
+  if (emailInput !== emailConfirmInput) {
+
+    error = "Greška ! Unešeni emailovi nisu isti";
+    res.render('querySubmit', {
+      error
+    });
+    return;
+  }
+
+  request.email = req.body.email;
+  await request.save();
+  res.redirect(nextStep); 
 };
 
 module.exports = {
diff --git a/app/views/querySubmit.ejs b/app/views/querySubmit.ejs
index 5612ce4..ded8ac6 100644
--- a/app/views/querySubmit.ejs
+++ b/app/views/querySubmit.ejs
@@ -9,13 +9,25 @@
       <input id="email" name="email" type="email" placeholder="vas.email@mail.com" required size="250" />
     </div>
   </div>
-  <% if (error) {%>
-    <div class="row">
-      <div class="col s6 push-s3">
-        <h6 style="color: red">Greška ! Unesite ispravan email</h6>
-      </div>
+
+  <div class="row">
+    <div class="col s6 push-s3">
+      <h6 id="error-lable-email" style="color: red"><%= error %> </h6>
     </div>
-  <%}%>
+  </div>
+
+  <div class="row center-align">
+    <div class="col s6 push-s3">
+      <input id="confirm" name="confirm" type="email" placeholder="potvrdite.email@mail.com" required size="250" />
+    </div>
+  </div>
+
+  <div class="row">
+    <div class="col s6 push-s3">
+      <h6 id="error-lable-email-confirm" style="color: red"></h6>
+    </div>
+  </div>
+
   <div class="row">
     <div class="col s6 push-s3">
       <a id="submit" href="#" class="welcome-center-button waves-effect waves-light btn">
@@ -31,13 +43,26 @@
 </form>
 
 <script>
- $(document).ready( () => {
-   $("#submit").click( () => {
-     const emailField = document.getElementById('email');
-     if (emailField.validity.valid){
-       $("#form-submitquery").submit();
-     }
-   });
- });
-</script>
+  $(document).ready(() => {
+    $("#submit").click(() => {
+      const emailField = document.getElementById('email');
+      const emailConfirmField = document.getElementById('confirm');
+      const errorMessage = "Greška ! Unedite validan email";
+      $("#error-lable-email").text("");
+      $("#error-lable-email-confirm").text("");
 
+      if (!emailField.validity.valid) {
+        $("#error-lable-email").text(errorMessage);
+        return
+      }
+
+      if (!emailConfirmField.validity.valid) {
+        $("#error-lable-email-confirm").text(errorMessage);
+        return
+      }
+
+      $("#form-submitquery").submit();
+
+    });
+  });
+</script>
\ No newline at end of file