From ab0a98d6beb9fb233f24215e35053d322b946c38 Mon Sep 17 00:00:00 2001
From: Micheal Mand <micheal@kmdwebdesigns.com>
Date: Tue, 26 Jan 2021 10:36:36 -0700
Subject: [PATCH 1/3] Fix blade directives

Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>

#125 added the ability to add nonces to the scripts, but the implementation was not correct
---
 src/InvisibleReCaptcha.php                | 8 ++++++--
 src/InvisibleReCaptchaServiceProvider.php | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/InvisibleReCaptcha.php b/src/InvisibleReCaptcha.php
index ce1b67e..d21ec73 100644
--- a/src/InvisibleReCaptcha.php
+++ b/src/InvisibleReCaptcha.php
@@ -2,6 +2,7 @@
 
 namespace AlbertCht\InvisibleReCaptcha;
 
+use Illuminate\Support\Arr;
 use Symfony\Component\HttpFoundation\Request;
 use GuzzleHttp\Client;
 
@@ -92,7 +93,7 @@ public function render($lang = null, $nonce = null)
     {
         $html = $this->renderPolyfill();
         $html .= $this->renderCaptchaHTML();
-        $html .= $this->renderFooterJS($lang, $nonce);
+        $html .= $this->renderFooterJS([$lang, $nonce]);
         return $html;
     }
 
@@ -128,8 +129,11 @@ public function renderCaptchaHTML()
      *
      * @return string
      */
-    public function renderFooterJS($lang = null, $nonce = null)
+    public function renderFooterJS($arguments)
     {
+        $lang = Arr::get($arguments, 0);
+        $nonce = Arr::get($arguments, 1);
+
         $html = '<script src="' . $this->getCaptchaJs($lang) . '" async defer';
         if (isset($nonce) && ! empty($nonce)) {
             $html .= ' nonce="' . $nonce . '"';
diff --git a/src/InvisibleReCaptchaServiceProvider.php b/src/InvisibleReCaptchaServiceProvider.php
index 5ad8421..3cc7721 100644
--- a/src/InvisibleReCaptchaServiceProvider.php
+++ b/src/InvisibleReCaptchaServiceProvider.php
@@ -72,8 +72,8 @@ public function provides()
      */
     public function addBladeDirective(BladeCompiler $blade)
     {
-        $blade->directive('captcha', function ($lang) {
-            return "<?php echo app('captcha')->render({$lang}); ?>";
+        $blade->directive('captcha', function ($arguments) {
+            return "<?php echo app('captcha')->render({$arguments}); ?>";
         });
         $blade->directive('captchaPolyfill', function () {
             return "<?php echo app('captcha')->renderPolyfill(); ?>";
@@ -81,8 +81,8 @@ public function addBladeDirective(BladeCompiler $blade)
         $blade->directive('captchaHTML', function () {
             return "<?php echo app('captcha')->renderCaptchaHTML(); ?>";
         });
-        $blade->directive('captchaScripts', function ($lang, $nonce) {
-            return "<?php echo app('captcha')->renderFooterJS({$lang}, {$nonce}); ?>";
+        $blade->directive('captchaScripts', function ($arguments) {
+            return "<?php echo app('captcha')->renderFooterJS({$arguments}); ?>";
         });
     }
 }

From 789df408ae6798a80bb5c2a1d8bc24590bd69b4f Mon Sep 17 00:00:00 2001
From: Micheal Mand <micheal@kmdwebdesigns.com>
Date: Tue, 26 Jan 2021 10:44:28 -0700
Subject: [PATCH 2/3] Fix @captcha directive

Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>
---
 src/InvisibleReCaptcha.php                | 10 ++++++++++
 src/InvisibleReCaptchaServiceProvider.php |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/InvisibleReCaptcha.php b/src/InvisibleReCaptcha.php
index d21ec73..4095a73 100644
--- a/src/InvisibleReCaptcha.php
+++ b/src/InvisibleReCaptcha.php
@@ -97,6 +97,16 @@ public function render($lang = null, $nonce = null)
         return $html;
     }
 
+    /**
+     * Render HTML reCaptcha from directive.
+     *
+     * @return string
+     */
+    public function renderCaptcha($arguments)
+    {
+        return $this->render($arguments);
+    }
+
     /**
      * Render the polyfill JS components only.
      *
diff --git a/src/InvisibleReCaptchaServiceProvider.php b/src/InvisibleReCaptchaServiceProvider.php
index 3cc7721..cc0237b 100644
--- a/src/InvisibleReCaptchaServiceProvider.php
+++ b/src/InvisibleReCaptchaServiceProvider.php
@@ -73,7 +73,7 @@ public function provides()
     public function addBladeDirective(BladeCompiler $blade)
     {
         $blade->directive('captcha', function ($arguments) {
-            return "<?php echo app('captcha')->render({$arguments}); ?>";
+            return "<?php echo app('captcha')->renderCaptcha({$arguments}); ?>";
         });
         $blade->directive('captchaPolyfill', function () {
             return "<?php echo app('captcha')->renderPolyfill(); ?>";

From e359b551fa2374c201f267e6b90b5d4d66d07770 Mon Sep 17 00:00:00 2001
From: Micheal Mand <micheal@kmdwebdesigns.com>
Date: Tue, 26 Jan 2021 11:03:46 -0700
Subject: [PATCH 3/3] Fix tests

Signed-off-by: Micheal Mand <micheal@kmdwebdesigns.com>
---
 .travis.yml                |  1 +
 src/InvisibleReCaptcha.php |  6 ++---
 tests/CaptchaTest.php      | 45 +++++++++++++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d5f6b0a..32f657b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: php
 php:
   - '7.2'
   - '7.3'
+  - '7.4'
 
 install:
   - travis_retry composer install --no-interaction --prefer-dist --no-suggest
diff --git a/src/InvisibleReCaptcha.php b/src/InvisibleReCaptcha.php
index 4095a73..c1912de 100644
--- a/src/InvisibleReCaptcha.php
+++ b/src/InvisibleReCaptcha.php
@@ -102,9 +102,9 @@ public function render($lang = null, $nonce = null)
      *
      * @return string
      */
-    public function renderCaptcha($arguments)
+    public function renderCaptcha(...$arguments)
     {
-        return $this->render($arguments);
+        return $this->render(...$arguments);
     }
 
     /**
@@ -139,7 +139,7 @@ public function renderCaptchaHTML()
      *
      * @return string
      */
-    public function renderFooterJS($arguments)
+    public function renderFooterJS(...$arguments)
     {
         $lang = Arr::get($arguments, 0);
         $nonce = Arr::get($arguments, 1);
diff --git a/tests/CaptchaTest.php b/tests/CaptchaTest.php
index 559c2ef..11e5231 100644
--- a/tests/CaptchaTest.php
+++ b/tests/CaptchaTest.php
@@ -59,6 +59,11 @@ public function testGetCaptchaJs()
         $this->assertEquals($js . '?hl=us', $this->captcha->getCaptchaJs('us'));
     }
 
+    public function testJavascriptHasNonce()
+    {
+        $this->assertStringContainsString('nonce="nonce-ASDFGHJKL"', $this->captcha->renderFooterJS('us', 'nonce-ASDFGHJKL'));
+    }
+
     public function testGetPolyfillJs()
     {
         $js = 'https://cdn.polyfill.io/v2/polyfill.min.js';
@@ -79,10 +84,44 @@ public function testBladeDirective()
         $serviceProvider = new InvisibleReCaptchaServiceProvider($app);
         $serviceProvider->addBladeDirective($blade);
 
-        $result = $blade->compileString('@captcha()');
         $this->assertEquals(
-            "<?php echo app('captcha')->render(); ?>",
-            $result
+            "<?php echo app('captcha')->renderCaptcha(); ?>",
+            $blade->compileString('@captcha()')
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderCaptcha('us'); ?>",
+            $blade->compileString("@captcha('us')")
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderCaptcha('us', 'nonce-ASDFGHJKL'); ?>",
+            $blade->compileString("@captcha('us', 'nonce-ASDFGHJKL')")
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderPolyfill(); ?>",
+            $blade->compileString('@captchaPolyfill()')
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderCaptchaHTML(); ?>",
+            $blade->compileString('@captchaHTML()')
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderFooterJS(); ?>",
+            $blade->compileString('@captchaScripts()')
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderFooterJS('us'); ?>",
+            $blade->compileString("@captchaScripts('us')")
+        );
+
+        $this->assertEquals(
+            "<?php echo app('captcha')->renderFooterJS('us', 'nonce-ASDFGHJKL'); ?>",
+            $blade->compileString("@captchaScripts('us', 'nonce-ASDFGHJKL')")
         );
     }
 }