Merge pull request #247 from silinternational/develop

Release 6.2.1 Workaround recaptcha error and catch potential future error.
silinternational · Oct 26, 2022 · 4a559ea · 4a559ea
2 parents 66bc8ca + 4162204
commit 4a559ea
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/application/common/helpers/Utils.php b/application/common/helpers/Utils.php
@@ -1,6 +1,8 @@
 <?php
 namespace common\helpers;
 
+use ReCaptcha\ReCaptcha;
+use ReCaptcha\RequestMethod\CurlPost as ReCaptchaCurlPost;
 use yii\base\Security;
 use yii\helpers\Html;
 use yii\helpers\Json;
@@ -218,8 +220,13 @@ public static function getRandomDigits($length = 4)
      */
     public static function isRecaptchaResponseValid($verificationToken, $ipAddress)
     {
-        $recaptcha = new \ReCaptcha\ReCaptcha(\Yii::$app->params['recaptcha']['secretKey']);
-        $response = $recaptcha->verify($verificationToken, $ipAddress);
+        $recaptcha = new ReCaptcha(\Yii::$app->params['recaptcha']['secretKey'], new ReCaptchaCurlPost());
+
+        try {
+            $response = $recaptcha->verify($verificationToken, $ipAddress);
+        } catch (\Exception $e) {
+            throw new \Exception('Error attempting to verify recaptcha token: ' . $e->getMessage(), 1666090198);
+        }
 
         if ($response->isSuccess()) {
             return true;