Merge branch 'develop' into release/v3

* develop:
  new ReCaptchaConfigurationTest test class
  getIpWhitelist method becomes public
  Default validate method response is of type array when reCAPTCHA v3 is used

Author: biscolab

src/ReCaptchaBuilder.php

@@ -110,14 +110,27 @@ public function setSkipByIp(bool $skip_by_ip): ReCaptchaBuilder {
 		return $this;
 	}
 
+	/**
+	 * @return array|mixed
+	 */
+	public function getIpWhitelist() {
+		$whitelist = config('recaptcha.skip_ip', []);
+
+		if(!is_array($whitelist)) {
+			$whitelist = explode(',', $whitelist);
+		}
+
+		return $whitelist;
+	}
+
 	/**
 	 * Checks whether the user IP address is among IPs "to be skipped"
 	 *
 	 * @return boolean
 	 */
 	public function skipByIp(): bool {
 
-		return (in_array(request()->ip(), config('recaptcha.skip_ip', [])));
+		return (in_array(request()->ip(), $this->getIpWhitelist()));
 	}
 
 	/**
@@ -221,6 +234,15 @@ public function htmlScriptTagJsApiV3(?array $configuration = []): string {
 	public function validate($response) {
 
 		if ($this->skip_by_ip) {
+			if ($this->returnArray()) {
+				// Add 'skip_by_ip' field to response
+				return [
+					'skip_by_ip' => true,
+					'score'      => 0.9,
+					'success'    => true
+				];
+			}
+
 			return true;
 		}
 
@@ -243,16 +265,34 @@ public function validate($response) {
 		else {
 			$curl_response = file_get_contents($url);
 		}
+
 		if (is_null($curl_response) || empty($curl_response)) {
+			if ($this->returnArray()) {
+				// Add 'error' field to response
+				return [
+					'error'   => 'cURL response empty',
+					'score'   => 0.1,
+					'success' => false
+				];
+			}
+
 			return false;
 		}
 		$response = json_decode(trim($curl_response), true);
 
-		if ($this->version == 'v3') {
+		if ($this->returnArray()) {
 			return $response;
 		}
 
 		return $response['success'];
 
 	}
+
+	/**
+	 * @return bool
+	 */
+	protected function returnArray(): bool {
+
+		return ($this->version == 'v3');
+	}
 }

tests/ReCaptchaConfigurationTest.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright (c) 2017 - present
+ * LaravelGoogleRecaptcha - ReCaptchaConfigurationTest.php
+ * author: Roberto Belotti - roby.belotti@gmail.com
+ * web : robertobelotti.com, github.com/biscolab
+ * Initial version created on: 13/2/2019
+ * MIT license: https://github.com/biscolab/laravel-recaptcha/blob/master/LICENSE
+ */
+
+namespace Biscolab\ReCaptcha\Tests;
+
+use Biscolab\ReCaptcha\Controllers\ReCaptchaController;
+use Biscolab\ReCaptcha\ReCaptchaBuilder;
+use Biscolab\ReCaptcha\ReCaptchaBuilderV2;
+use Biscolab\ReCaptcha\ReCaptchaBuilderV3;
+use Illuminate\Support\Facades\App;
+
+/**
+ * Class ReCaptchaConfigurationTest
+ * @package Biscolab\ReCaptcha\Tests
+ */
+class ReCaptchaConfigurationTest extends TestCase {
+
+	/**
+	 * @var ReCaptchaBuilder
+	 */
+	protected $recaptcha;
+
+	/**
+	 * @test
+	 */
+	public function testSkipIpWhiteListIsArray() {
+
+		$ip_whitelist = $this->recaptcha->getIpWhitelist();
+		$this->assertTrue(is_array($ip_whitelist));
+		$this->assertCount(2, $ip_whitelist);
+	}
+
+	/**
+	 * Define environment setup.
+	 *
+	 * @param  \Illuminate\Foundation\Application $app
+	 *
+	 * @return void
+	 */
+	protected function getEnvironmentSetUp($app) {
+
+		$app['config']->set('recaptcha.skip_ip', '10.0.0.1,10.0.0.2');
+	}
+
+	/**
+	 * Setup the test environment.
+	 */
+	protected function setUp() {
+
+		parent::setUp(); // TODO: Change the autogenerated stub
+
+		$this->recaptcha = new ReCaptchaBuilderV2('api_site_key', 'api_secret_key');
+	}
+}