Fix: threshold typo + add error handling

iodigital-com · Dec 14, 2023 · d8de1a2 · d8de1a2
1 parent 371f67d
commit d8de1a2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/Form/Handler/ContactFormHandler.php b/src/Form/Handler/ContactFormHandler.php
@@ -40,15 +40,24 @@ public function handle(FormInterface $form, Request $request): bool
 
         /** @var ContactSubmission $data */
         $data = $form->getData();
-
-        $result = $this->recaptcha->validateRecaptchaToken($data->getRecaptchaToken());
+        $captchaResult = $this->recaptcha->validateRecaptchaToken($data->getRecaptchaToken());
 
         // Client succeed recaptcha validation.
-        if ($result['success'] && $this->mailer->sendContactFormEmail($data)) {
-            $this->translator->setLocale($request->getLocale());
-            $this->session->getFlashBag()->add('success', $this->translator->trans('flashes.contact.success'));
+        if ($captchaResult['success'] !== true) {
+            $this->session->getFlashBag()->add('danger', 'You seem like a robot, sorry.');
+            return false;
         }
 
+        $mailResult = $this->mailer->sendContactFormEmail($data);
+
+        if (!$mailResult) {
+            $this->session->getFlashBag()->add('danger', 'Mail was not sent due to unknown error.');
+            return false;
+        }
+
+        $this->translator->setLocale($request->getLocale());
+        $this->session->getFlashBag()->add('success', $this->translator->trans('flashes.contact.success'));
+
         return true;
     }
 }
diff --git a/src/Service/RecaptchaService.php b/src/Service/RecaptchaService.php
@@ -21,7 +21,7 @@ public function validateRecaptchaToken(string $token): array
         $resp = $recaptcha
             ->setExpectedHostname($_SERVER['SERVER_NAME'])
             ->setExpectedAction($this->recaptchaSecret->action)
-            ->setScoreThreshold($this->recaptchaSecret->treshold)
+            ->setScoreThreshold($this->recaptchaSecret->threshold)
             ->verify($token, $_SERVER['REMOTE_ADDR']);
 
         return $resp->toArray();

diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -53,8 +53,6 @@
                 style="display:none;visibility:hidden"></iframe>
     </noscript>
 
-    {% block headScripts %} {% endblock headScripts %}
-
     <script>
         (function (w, d, s, l, i) {
             w[l] = w[l] || [];
@@ -67,6 +65,7 @@
     </script>
     <!-- End Google Tag Manager -->
 {% endif %}
+{% block headScripts %} {% endblock headScripts %}
 <div id="header" class="header">
     <div class="container">
         <div class="header__left" onclick="window.location='{{ url('homepage') }}'">