#2 Compliance with the new invisible captcha

Version 1.4.0, added suport for Invisible Captcha.
henriqb · Apr 20, 2017 · f7554e8 · f7554e8
1 parent e24c45a
commit f7554e8
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 3 deletions.
diff --git a/binary/net45/hbehr.recaptcha.dll b/binary/net45/hbehr.recaptcha.dll
diff --git a/binary/net451/hbehr.recaptcha.dll b/binary/net451/hbehr.recaptcha.dll
diff --git a/binary/net452/hbehr.recaptcha.dll b/binary/net452/hbehr.recaptcha.dll
diff --git a/binary/net46/hbehr.recaptcha.dll b/binary/net46/hbehr.recaptcha.dll
diff --git a/binary/net461/hbehr.recaptcha.dll b/binary/net461/hbehr.recaptcha.dll
diff --git a/binary/net462/hbehr.recaptcha.dll b/binary/net462/hbehr.recaptcha.dll
diff --git a/src/hbehr.recaptcha.unittest/UnitTests.cs b/src/hbehr.recaptcha.unittest/UnitTests.cs
@@ -160,5 +160,14 @@ public void AssertScriptDivIsCorrectWithLanguageOverrideConfiguration()
             string captchaString = captcha.ToHtmlString();
             Assert.AreEqual("<div class='g-recaptcha' data-sitekey='my-public-key'></div><script src='https://www.google.com/recaptcha/api.js?hl=pt-BR'></script>", captchaString);
         }
+
+        [Test]
+        public void AssertScriptInvisibleDivIsCorrectWithLanguageOverrideConfiguration()
+        {
+            ReCaptcha.Configure("my-public-key", "my-secret-key", ReCaptchaLanguage.EnglishUs);
+            IHtmlString captcha = ReCaptcha.GetInvisibleCaptcha("callback", "SUBMIT",ReCaptchaLanguage.PortugueseBrazil);
+            string captchaString = captcha.ToHtmlString();
+            Assert.AreEqual("<button class='g-recaptcha' data-sitekey='my-public-key' data-callback='callback'>SUBMIT</button><script src='https://www.google.com/recaptcha/api.js?hl=pt-BR'></script>", captchaString);
+        }
     }
 }
diff --git a/src/hbehr.recaptcha/Properties/AssemblyInfo.cs b/src/hbehr.recaptcha/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.1.*")]
-[assembly: AssemblyFileVersion("1.3.1.0")]
+[assembly: AssemblyVersion("1.4.0.*")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
diff --git a/src/hbehr.recaptcha/ReCaptcha.cs b/src/hbehr.recaptcha/ReCaptcha.cs
@@ -47,6 +47,11 @@ public static IHtmlString GetCaptcha(ReCaptchaLanguage? language = null)
             return _reCaptcha.GetCaptcha(language);
         }
 
+        public static IHtmlString GetInvisibleCaptcha(string callback, string buttonText, ReCaptchaLanguage? language = null)
+        {
+            return _reCaptcha.GetInvisibleCaptcha(callback, buttonText, language);
+        }
+
         public static bool ValidateCaptcha(string response, WebProxy proxy = null)
         {
             return _reCaptcha.ValidateResponse(new GoogleWebPost(), response, proxy);

diff --git a/src/hbehr.recaptcha/ReCaptchaObject.cs b/src/hbehr.recaptcha/ReCaptchaObject.cs
@@ -34,7 +34,7 @@ namespace hbehr.recaptcha
 {
     internal class ReCaptchaObject
     {
-        private string _captchaDiv, _secretKey, _language;
+        private string _captchaDiv, _invisibleCaptchaDiv, _secretKey, _language;
         private bool _configured;
 
         internal ReCaptchaObject()
@@ -84,6 +84,7 @@ private void Initialize(string publicKey, string secretKey, ReCaptchaLanguage? d
             _configured = true;
             _secretKey = secretKey;
             _captchaDiv = string.Format("<div class='g-recaptcha' data-sitekey='{0}'></div><script src='https://www.google.com/recaptcha/api.js{{0}}'></script>", publicKey);
+            _invisibleCaptchaDiv = string.Format("<button class='g-recaptcha' data-sitekey='{0}' data-callback='{{1}}'>{{2}}</button><script src='https://www.google.com/recaptcha/api.js{{0}}'></script>", publicKey);
         }
 
         private string GetHlCode(ReCaptchaLanguage? language)
@@ -104,6 +105,12 @@ internal IHtmlString GetCaptcha(ReCaptchaLanguage? language)
             return new HtmlString(string.Format(_captchaDiv, GetHlCode(language)));
         }
 
+        internal IHtmlString GetInvisibleCaptcha(string callback, string buttonText, ReCaptchaLanguage? language)
+        {
+            CheckIfIamConfigured();
+            return new HtmlString(string.Format(_invisibleCaptchaDiv, GetHlCode(language), callback, buttonText));
+        }
+
         internal bool ValidateResponse(IReChaptaWebInterface webInterface, string response)
         {
             CheckIfIamConfigured();