fix: Verify method could throw an exception if no actions parameters …

…were saved (merged from 1.1.1)

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Google Recaptcha Changelog
 
+## 2.0.2 - 2022-05-13
+### Fixed
+- Fix an exception that could occur in verify method if no actions parameters were saved (merged from 1.1.1)
+
 ## 2.0.1 - 2022-05-09
 
 ### Fixed
@@ -10,6 +14,10 @@
 ### Added
 - Added Craft 4 compatibility.
 
+## 1.1.1 - 2022-05-13
+### Fixed
+- Fix an exception that could occur in verify method if no actions parameters were saved.
+
 ## 1.1.0 - 2022-03-07
 ### Added
 - (v3 API) Default action name and score threshold can be configured

composer.json

@@ -2,7 +2,7 @@
   "name": "simplonprod/craft-google-recaptcha",
   "description": "Google reCAPTCHA for Craft CMS",
   "type": "craft-plugin",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "keywords": [
     "craft",
     "cms",

src/models/Settings.php

@@ -100,7 +100,10 @@ public function validateActions()
      */
     public function getScoreThresholdPerAction(): array
     {
-        return ArrayHelper::map($this->actions, 'name', 'scoreThreshold');
+        if (is_array($this->actions)) {
+            return ArrayHelper::map($this->actions, 'name', 'scoreThreshold');
+        }
+        return [];
     }
 
     /**

tests/unit/ServicesTest.php

@@ -230,4 +230,29 @@ public function testVerifyWithInvalidResponseException(): void
         $this->expectException(ForbiddenHttpException::class);
         GoogleRecaptcha::$plugin->recaptcha->verify();
     }
+
+    public function testVerifyWithEmptyActionsSettings(): void
+    {
+        GoogleRecaptcha::$plugin->setSettings([
+            'version' => 3,
+            'actions' => '',
+        ]);
+        $response = $this->make(
+            Response::class,
+            [
+                'getStatusCode' => 200,
+                'getBody' => Utils::streamFor(
+                    Json::encode([
+                        'success' => true,
+                        'action' => 'homepage',
+                        'score' => 0.5,
+                    ])
+                ),
+            ]
+        );
+        $googleRecaptchaService = $this->make(Recaptcha::class, [
+            'getRecaptchaClient' => $this->_getClientMock($response),
+        ]);
+        $this->assertTrue($googleRecaptchaService->verify());
+    }
 }