htmlScriptTagJsApi function: Google reCAPTCHA v3 full support/compatibility

Author: biscolab

src/ReCaptchaBuilder.php

@@ -152,34 +152,44 @@ function biscolabLaravelReCaptcha(token) {
 		     </script>';
         }
         elseif ($this->version == 'v3') {
+
             $action = array_get($configuration, 'action', 'homepage');
-            $js_then_callback = array_get($configuration, 'callback_then', '');
-            $js_callback_catch = array_get($configuration, 'callback_catch', '');
 
-            $js_then_callback = ($js_then_callback) ? "{$js_then_callback}(response)" : '';
-            $js_callback_catch = ($js_callback_catch) ? "{$js_callback_catch}(err)" : '';
+            $js_custom_validation = array_get($configuration, 'custom_validation', '');
+
+            // Check if set custom_validation. That function will override default fetch validation function
+            if($js_custom_validation) {
+
+                $validate_function = ($js_custom_validation) ? "{$js_custom_validation}(token);" : '';
+            }
+            else {
+
+                $js_then_callback = array_get($configuration, 'callback_then', '');
+                $js_callback_catch = array_get($configuration, 'callback_catch', '');
+
+                $js_then_callback = ($js_then_callback) ? "{$js_then_callback}(response)" : '';
+                $js_callback_catch = ($js_callback_catch) ? "{$js_callback_catch}(err)" : '';
+
+                $validate_function = "
+                fetch('/" . config('recaptcha.default_validation_route', 'biscolab-recaptcha/validate') . "?" . config('recaptcha.default_token_parameter_name', 'token') . "=' + token, {
+                    headers: {
+                        \"X-Requested-With\": \"XMLHttpRequest\",
+                        \"X-CSRF-TOKEN\": csrfToken.content
+                    }
+                })
+                .then(function(response) {
+                   	{$js_then_callback}
+                })
+                .catch(function(err) {
+                    {$js_callback_catch}
+                });";
+            }
 
             $html .= "<script>
                     var csrfToken = document.head.querySelector('meta[name=\"csrf-token\"]');
                   grecaptcha.ready(function() {
                       grecaptcha.execute('{$this->api_site_key}', {action: '{$action}'}).then(function(token) {
-                            fetch('/" . config('recaptcha.default_validation_route', 'biscolab-recaptcha/validate') . "?" . config('recaptcha.default_token_parameter_name', 'token') . "=' + token, {
-                                headers: {
-                                  \"X-Requested-With\": \"XMLHttpRequest\",
-                                  \"X-CSRF-TOKEN\": csrfToken.content
-                                }
-                              })
-         
-                            .then(function(response) {
-                            	{$js_then_callback}
-//                            	console.log(response.status);
-//                                    response.json().then(function(data){
-//                                    console.log(data);
-//                                });
-                            })
-                            .catch(function(err) {
-                                {$js_callback_catch}
-                            });
+                        {$validate_function}
                       });
                   });
 		     </script>";