From 6bf0a2b6e83be40bd7628915ca0cfde5e7ae3fb3 Mon Sep 17 00:00:00 2001
From: Dslak <dslaky@gmail.com>
Date: Fri, 10 Sep 2021 09:36:55 +0200
Subject: [PATCH] add recaptcha

---
 .env                              |  3 +++
 .env_prod                         |  3 +++
 components/account/account.html   |  3 +--
 components/account/account.js     | 15 +++++++++------
 components/cart/cart.html         |  2 +-
 components/checkout/checkout.html |  1 -
 components/checkout/checkout.js   |  7 ++++++-
 pages/index.ejs                   | 12 +++++++++---
 8 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/.env b/.env
index e6e72e0..ae31d3e 100644
--- a/.env
+++ b/.env
@@ -10,5 +10,8 @@ PP_RETURN=http://iolovolio.local/thankyou
 PP_AUTH_URL=https://api-m.sandbox.paypal.com/v1/oauth2/token
 PP_ORDER_URL=https://api-m.sandbox.paypal.com/v2/checkout/orders
 
+RECAPTCHA_SITE_KEY=6LfD8FgcAAAAANpdeDvkFRHk8VXTgC7huXa3LKqe
+RECAPTCHA_SECRET_KEY=6LfD8FgcAAAAAOZgo5UgR_BRLd83NS3qdFdBA6XH
+
 #dslaky-buyer@gmail.com dslakyPwd
 #dslaky-facilitator@gmail.com dslakyPwd
diff --git a/.env_prod b/.env_prod
index 56e2129..f2f13b4 100644
--- a/.env_prod
+++ b/.env_prod
@@ -9,3 +9,6 @@ PP_CANCEL=http://www.iolovolio.com/checkout
 PP_RETURN=http://www.iolovolio.com/thankyou
 PP_AUTH_URL=https://api-m.sandbox.paypal.com/v1/oauth2/token
 PP_ORDER_URL=https://api-m.sandbox.paypal.com/v2/checkout/orders
+
+RECAPTCHA_SITE_KEY=6LfD8FgcAAAAANpdeDvkFRHk8VXTgC7huXa3LKqe
+RECAPTCHA_SECRET_KEY=6LfD8FgcAAAAAOZgo5UgR_BRLd83NS3qdFdBA6XH
diff --git a/components/account/account.html b/components/account/account.html
index 0783f67..bf39c1e 100644
--- a/components/account/account.html
+++ b/components/account/account.html
@@ -132,8 +132,6 @@
         </div>
       </div>
 
-
-
       <?php
       } else {
       ?>
@@ -314,3 +312,4 @@
     </div>
   </div>
 </div>
+
diff --git a/components/account/account.js b/components/account/account.js
index 86bb829..75801b5 100644
--- a/components/account/account.js
+++ b/components/account/account.js
@@ -101,13 +101,16 @@ $(document).ready( () => {
           body[name] = input.val()
         })
 
-        Apis.addUser(body).then( (data) => {
-          Apis.notification("Account aggiunto correttamente!")
-        }).catch( (error) => {
-          console.error(error)
-          Apis.notification("ATTENZIONE: L'utente che stai cercando di inserire è già presente nel database")
+        grecaptcha.ready(() => {
+          grecaptcha.execute(ENV.RECAPTCHA_SITE_KEY, {action: 'submit'}).then((token) => {
+            Apis.addUser(body).then( (data) => {
+              Apis.notification("Account aggiunto correttamente!")
+            }).catch( (error) => {
+              console.error(error)
+              Apis.notification("ATTENZIONE: L'utente che stai cercando di inserire è già presente nel database")
+            })
+          })
         })
-
       }
     })
 
diff --git a/components/cart/cart.html b/components/cart/cart.html
index de5bf24..87dfe7f 100644
--- a/components/cart/cart.html
+++ b/components/cart/cart.html
@@ -54,7 +54,7 @@
           <div class="item-col col-3 col-md-1 pt-2 pb-3 partial">
             <?= money_format('%.2n',$r['price'] * $item['qty']);?> &euro;
           </div>
-          <div class="item-col col-2 col-md-1 mr-auto pr-0 pt-2 pb-3 text-center">
+          <div class="item-col col-2 col-md-1 mr-auto pr-0 pt-1 pb-3 text-center">
             <button class="remove icon-close"></button>
           </div>
         </div>
diff --git a/components/checkout/checkout.html b/components/checkout/checkout.html
index f92e1ee..fe699e7 100644
--- a/components/checkout/checkout.html
+++ b/components/checkout/checkout.html
@@ -243,4 +243,3 @@
     </div>
   </div>
 </div>
-
diff --git a/components/checkout/checkout.js b/components/checkout/checkout.js
index d95c932..28615d7 100644
--- a/components/checkout/checkout.js
+++ b/components/checkout/checkout.js
@@ -133,7 +133,12 @@ $(document).ready( () => {
           }
         })
 
-        placeOrder(body, isNewUser)
+        grecaptcha.ready(() => {
+          grecaptcha.execute(ENV.RECAPTCHA_SITE_KEY, {action: 'submit'}).then((token) => {
+            placeOrder(body, isNewUser)
+          })
+        })
+
 
       }
     }
diff --git a/pages/index.ejs b/pages/index.ejs
index dc31ae1..3dd1548 100644
--- a/pages/index.ejs
+++ b/pages/index.ejs
@@ -66,9 +66,15 @@
       <img src="/images/logoHeader.png" class="spinner">
     </div>
 
-    <div class="notification">
-    aaa
-    </div>
+    <div class="notification"></div>
+
+    <?php
+      if($getQ[0] == 'checkout' || $getQ[0] == 'account') {
+    ?>
+      <script src="https://www.google.com/recaptcha/api.js?render=${ENV.RECAPTCHA_SITE_KEY}"></script>
+    <?php
+      }
+    ?>
 
   </body>
 </html>