Merge branch 'release/v5'

Author: biscolab

src/ReCaptchaBuilderV3.php

@@ -32,6 +32,33 @@ public function __construct(string $api_site_key, string $api_secret_key)
         parent::__construct($api_site_key, $api_secret_key, 'v3');
     }
 
+    public function getTokenParameterName(): string
+    {
+        return config(
+            'recaptcha.default_token_parameter_name',
+            'token'
+        );
+    }
+
+    public function getValidationUrl(): string
+    {
+        return url(config(
+            'recaptcha.default_validation_route',
+            'biscolab-recaptcha/validate'
+        ));
+    }
+
+    public function getValidationUrlWithToken(): string
+    {
+        return implode(
+            "?",
+            [
+                $this->getValidationUrl(),
+                $this->getTokenParameterName()
+            ]
+        );
+    }
+
     /**
      * Write script HTML tag in you HTML code
      * Insert before </head> tag
@@ -66,13 +93,7 @@ public function htmlScriptTagJsApi(?array $configuration = []): string
             $js_callback_catch = ($js_callback_catch) ? "{$js_callback_catch}(err)" : '';
 
             $validate_function = "
-                fetch('" . url(config(
-                'recaptcha.default_validation_route',
-                'biscolab-recaptcha/validate'
-            )) . "?" . config(
-                'recaptcha.default_token_parameter_name',
-                'token'
-            ) . "=' + token, {
+                fetch('" . $this->getValidationUrlWithToken() . "=' + token, {
                     headers: {
                         \"X-Requested-With\": \"XMLHttpRequest\",
                         \"X-CSRF-TOKEN\": csrfToken.content

tests/ReCaptchaV3Test.php

@@ -74,6 +74,16 @@ public function testCustomValidationFunction()
         $this->assertMatchesRegularExpression('/functionCustomValidation\(token\)/', $r);
     }
 
+    /**
+     * @test
+     */
+    public function testCustomValidationUrl()
+    {
+
+        $r = $this->recaptcha_v3->htmlScriptTagJsApi();
+        $this->assertMatchesRegularExpression('/http:\/\/localhost\/my-custom-url\?my-custom-token-name/', $r);
+    }
+
     /**
      * @test
      */
@@ -109,6 +119,30 @@ public function testHtmlScriptTagJsApiCalledByFacade()
         htmlScriptTagJsApi([]);
     }
 
+    /**
+     * @test
+     */
+    public function testValidationUrlShouldBeMyCustomUrl()
+    {
+        $this->assertEquals($this->recaptcha_v3->getValidationUrl(), "http://localhost/my-custom-url");
+    }
+
+    /**
+     * @test
+     */
+    public function testTokenParamNameShouldBeMyCustomTokenParamName()
+    {
+        $this->assertEquals($this->recaptcha_v3->getTokenParameterName(), "my-custom-token-name");
+    }
+
+    /**
+     * @test
+     */
+    public function testValidationUrlShouldBeMyCustomValidationUrl()
+    {
+        $this->assertEquals($this->recaptcha_v3->getValidationUrlWithToken(), "http://localhost/my-custom-url?my-custom-token-name");
+    }
+
     /**
      * Define environment setup.
      *
@@ -121,6 +155,9 @@ protected function getEnvironmentSetUp($app)
 
         $app['config']->set('recaptcha.version', 'v3');
         $app['config']->set('recaptcha.curl_timeout', 3);
+
+        $app['config']->set('recaptcha.default_validation_route', "my-custom-url");
+        $app['config']->set('recaptcha.default_token_parameter_name', "my-custom-token-name");
     }
 
     /**
@@ -130,7 +167,6 @@ protected function setUp(): void
     {
 
         parent::setUp(); // TODO: Change the autogenerated stub
-
         $this->recaptcha_v3 = new ReCaptchaBuilderV3('api_site_key', 'api_secret_key');
     }
 }