Merge pull request #69 from michaelvs97/feature/v2-invisible-callbacks

Add expired-callback and error-callback to the V2 invisible widget
michaelvs97 · Jul 20, 2024 · 2286edd · 2286edd
2 parents 1cfe488 + f8dd5df
commit 2286edd
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 7 deletions.
diff --git a/AspNetCore.ReCaptcha.Tests/ReCaptchaGeneratorTests.cs b/AspNetCore.ReCaptcha.Tests/ReCaptchaGeneratorTests.cs
@@ -12,14 +12,19 @@ public void ReCaptchaGeneratorReturnsReCaptchaForV2()
             var result = ReCaptchaGenerator.ReCaptchaV2(new Uri("https://www.google.com/recaptcha/"), "test", "test", "test", "test", "test", "test", "test", false, "nonce");
 
             Assert.NotNull(result);
+            Assert.Equal(@"<div class=""g-recaptcha"" data-sitekey=""test"" data-size=""test"" data-theme=""test"" data-callback=""test"" data-error-callback=""test"" data-expired-callback=""test""></div>
+<script src=""https://www.google.com/recaptcha/api.js?hl=test"" defer></script>",
+                result.ToHtmlString());
         }
 
         [Fact]
         public void ReCaptchaGeneratorReturnsReCaptchaForV2Invisible()
         {
-            var result = ReCaptchaGenerator.ReCaptchaV2Invisible(new Uri("https://www.google.com/recaptcha/"), "test", "test", "test", "test", "test", "test");
+            var result = ReCaptchaGenerator.ReCaptchaV2Invisible(new Uri("https://www.google.com/recaptcha/"), "test", "test", "test", "test", "test", "test", "test", "test");
 
             Assert.NotNull(result);
+            Assert.Equal(@"<button class=""g-recaptcha test"" data-sitekey=""test"" data-badge=""test"" data-callback=""test"" data-expired-callback=""test"" data-error-callback=""test"">test</button>
+<script src=""https://www.google.com/recaptcha/api.js?hl=test"" defer></script>", result.ToHtmlString());
         }
 
         [Fact]
@@ -28,6 +33,10 @@ public void ReCaptchaGeneratorReturnsReCaptchaForV3()
             var result = ReCaptchaGenerator.ReCaptchaV3(new Uri("https://www.google.com/recaptcha/"), "test", "test", "test", "test", 1, "nonce");
 
             Assert.NotNull(result);
+            Assert.Equal(
+                @"<input id=""g-recaptcha-response-1"" name=""g-recaptcha-response"" type=""hidden"" value="""" /><script src=""https://www.google.com/recaptcha/api.js?render=test&hl=test""></script><script nonce=""nonce"">function updateReCaptcha1() {grecaptcha.execute('test', {action: 'test'}).then(function(token){document.getElementById('g-recaptcha-response-1').value = token;});}grecaptcha.ready(function() {setInterval(updateReCaptcha1, 100000); updateReCaptcha1()});</script>
+",
+                result.ToHtmlString());
         }
 
         [Theory]

diff --git a/AspNetCore.ReCaptcha/AspNetCore.ReCaptcha.csproj b/AspNetCore.ReCaptcha/AspNetCore.ReCaptcha.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <PackageId>AspNetCore.ReCaptcha</PackageId>
-    <Version>1.8.1</Version>
+    <Version>1.8.2</Version>
     <Authors>Michaelvs97,sleeuwen</Authors>
     <Description>Google ReCAPTCHA v2/v3 Library for .NET 6 and above</Description>
     <PackageDescription>Google ReCAPTCHA v2/v3 Library for .NET 6 and above</PackageDescription>

diff --git a/AspNetCore.ReCaptcha/ReCaptchaGenerator.cs b/AspNetCore.ReCaptcha/ReCaptchaGenerator.cs
@@ -67,13 +67,21 @@ public static IHtmlContent ReCaptchaV2(Uri baseUrl, string siteKey, string size,
             return content;
         }
 
-        public static IHtmlContent ReCaptchaV2Invisible(Uri baseUrl, string siteKey, string text, string className, string language, string callback, string badge)
+        public static IHtmlContent ReCaptchaV2Invisible(Uri baseUrl, string siteKey, string text, string className, string language, string callback, string errorCallback, string expiredCallback, string badge)
         {
             var content = new HtmlContentBuilder();
             content.AppendFormat(@"<button class=""g-recaptcha {0}""", className);
             content.AppendFormat(@" data-sitekey=""{0}""", siteKey);
-            content.AppendFormat(@" data-callback=""{0}""", callback);
-            content.AppendFormat(@" data-badge=""{0}""", badge);
+
+            if (!string.IsNullOrEmpty(badge))
+                content.AppendFormat(@" data-badge=""{0}""", badge);
+            if (!string.IsNullOrEmpty(callback))
+                content.AppendFormat(@" data-callback=""{0}""", callback);
+            if (!string.IsNullOrEmpty(expiredCallback))
+                content.AppendFormat(@" data-expired-callback=""{0}""", expiredCallback);
+            if (!string.IsNullOrEmpty(errorCallback))
+                content.AppendFormat(@" data-error-callback=""{0}""", errorCallback);
+
             content.AppendFormat(@">{0}</button>", text);
             content.AppendLine();
 

diff --git a/AspNetCore.ReCaptcha/ReCaptchaHelper.cs b/AspNetCore.ReCaptcha/ReCaptchaHelper.cs
@@ -136,7 +136,7 @@ public static IHtmlContent ReCaptcha(
                 case ReCaptchaVersion.V2:
                     return ReCaptchaGenerator.ReCaptchaV2(staticSettings.RecaptchaBaseUrl, settings.SiteKey, size, theme, language, callback, errorCallback, expiredCallback, autoTheme, nonce);
                 case ReCaptchaVersion.V2Invisible:
-                    return ReCaptchaGenerator.ReCaptchaV2Invisible(staticSettings.RecaptchaBaseUrl, settings.SiteKey, text, className, language, callback, badge);
+                    return ReCaptchaGenerator.ReCaptchaV2Invisible(staticSettings.RecaptchaBaseUrl, settings.SiteKey, text, className, language, callback, errorCallback, expiredCallback, badge);
                 case ReCaptchaVersion.V3:
                     return ReCaptchaGenerator.ReCaptchaV3(staticSettings.RecaptchaBaseUrl, settings.SiteKey, action, language, callback, ReCaptchaGenerator.GenerateId(helper.ViewContext), nonce);
             }

diff --git a/AspNetCore.ReCaptcha/ReCaptchaTagHelper.cs b/AspNetCore.ReCaptcha/ReCaptchaTagHelper.cs
@@ -57,7 +57,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
 
             var content = settings.Version switch
             {
-                ReCaptchaVersion.V2Invisible => ReCaptchaGenerator.ReCaptchaV2Invisible(settings.RecaptchaBaseUrl, settings.SiteKey, Text, ClassName, Language, Callback, Badge),
+                ReCaptchaVersion.V2Invisible => ReCaptchaGenerator.ReCaptchaV2Invisible(settings.RecaptchaBaseUrl, settings.SiteKey, Text, ClassName, Language, Callback, ErrorCallback, ExpiredCallback, Badge),
                 ReCaptchaVersion.V3 => ReCaptchaGenerator.ReCaptchaV3(settings.RecaptchaBaseUrl, settings.SiteKey, Action, Language, Callback, ReCaptchaGenerator.GenerateId(ViewContext), Nonce),
                 _ => ReCaptchaGenerator.ReCaptchaV2(settings.RecaptchaBaseUrl, settings.SiteKey, Size, Theme, Language, Callback, ErrorCallback, ExpiredCallback, AutoTheme, Nonce),
             };