Merge pull request #2 from maliming/dev

maliming · web-flow · commit bf5998787622 · 2020-04-11T16:05:23.000+08:00
0.3.0
diff --git a/demo/reCAPTCHA.Demo/Pages/Error.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/Error.cshtml.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace reCAPTCHA.Tests.Pages
+namespace reCAPTCHA.Demo.Pages
 {
     [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
     public class ErrorModel : PageModel
diff --git a/demo/reCAPTCHA.Demo/Pages/Index.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/Index.cshtml.cs
@@ -1,12 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+﻿using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace reCAPTCHA.Tests.Pages
+namespace reCAPTCHA.Demo.Pages
 {
     public class IndexModel : PageModel
     {
diff --git a/demo/reCAPTCHA.Demo/Pages/Privacy.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/Privacy.cshtml.cs
@@ -1,12 +1,7 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+﻿using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Logging;
 
-namespace reCAPTCHA.Tests.Pages
+namespace reCAPTCHA.Demo.Pages
 {
     public class PrivacyModel : PageModel
     {
diff --git a/demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml b/demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml
@@ -1,5 +1,5 @@
 ﻿@page
-@model reCAPTCHA.Tests.Pages.V2_CheckboxModel
+@model reCAPTCHA.Demo.Pages.V2_CheckboxModel
 @{
     ViewData["Title"] = "V2_Checkbox";
 }
diff --git a/demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V2_Checkbox.cshtml.cs
@@ -1,9 +1,10 @@
 ﻿using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Newtonsoft.Json;
-using reCAPTCHA.v2;
+using Owl.reCAPTCHA;
+using Owl.reCAPTCHA.v2;
 
-namespace reCAPTCHA.Tests.Pages
+namespace reCAPTCHA.Demo.Pages
 {
     public class V2_CheckboxModel : PageModel
     {
diff --git a/demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml b/demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml
@@ -1,5 +1,5 @@
-﻿@page
-@model reCAPTCHA.Tests.Pages.V2_InvisibleModel
+@page
+@model reCAPTCHA.Demo.Pages.V2_InvisibleModel
 @{
     ViewData["Title"] = "V2_Invisible";
 }
diff --git a/demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V2_Invisible.cshtml.cs
@@ -1,9 +1,10 @@
 ﻿using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Newtonsoft.Json;
-using reCAPTCHA.v2;
+using Owl.reCAPTCHA;
+using Owl.reCAPTCHA.v2;
 
-namespace reCAPTCHA.Tests.Pages
+namespace reCAPTCHA.Demo.Pages
 {
     public class V2_InvisibleModel : PageModel
     {
diff --git a/demo/reCAPTCHA.Demo/Pages/V3.cshtml b/demo/reCAPTCHA.Demo/Pages/V3.cshtml
@@ -1,7 +1,7 @@
-﻿@page
+@page
 @using Microsoft.Extensions.Options
-@using reCAPTCHA.v3
-@model reCAPTCHA.Tests.Pages.V3Model
+@using Owl.reCAPTCHA
+@model reCAPTCHA.Demo.Pages.V3Model
 @inject IOptions<reCAPTCHAOptions> Options
 @{
     ViewData["Title"] = "V3";
diff --git a/demo/reCAPTCHA.Demo/Pages/V3.cshtml.cs b/demo/reCAPTCHA.Demo/Pages/V3.cshtml.cs
@@ -1,9 +1,10 @@
 ﻿using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc.RazorPages;
 using Newtonsoft.Json;
-using reCAPTCHA.v3;
+using Owl.reCAPTCHA;
+using Owl.reCAPTCHA.v3;
 
-namespace reCAPTCHA.Tests.Pages
+namespace reCAPTCHA.Demo.Pages
 {
     public class V3Model : PageModel
     {
diff --git a/demo/reCAPTCHA.Demo/Pages/_ViewImports.cshtml b/demo/reCAPTCHA.Demo/Pages/_ViewImports.cshtml
@@ -1,4 +1,3 @@
-@using reCAPTCHA.Tests
-@namespace reCAPTCHA.Tests.Pages
+@namespace reCAPTCHA.Demo.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
 @addTagHelper *, Owl.reCAPTCHA
diff --git a/demo/reCAPTCHA.Demo/Program.cs b/demo/reCAPTCHA.Demo/Program.cs
@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Hosting;
 
-namespace reCAPTCHA.Tests
+namespace reCAPTCHA.Demo
 {
     public class Program
     {
diff --git a/demo/reCAPTCHA.Demo/Startup.cs b/demo/reCAPTCHA.Demo/Startup.cs
@@ -3,8 +3,9 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
+using Owl.reCAPTCHA;
 
-namespace reCAPTCHA.Tests
+namespace reCAPTCHA.Demo
 {
     public class Startup
     {
diff --git a/src/Owl.reCAPTCHA/CultureInforeCAPTCHALanguageCodeProvider.cs b/src/Owl.reCAPTCHA/CultureInforeCAPTCHALanguageCodeProvider.cs
@@ -1,6 +1,6 @@
 ﻿using System.Globalization;
 
-namespace reCAPTCHA
+namespace Owl.reCAPTCHA
 {
     public class CultureInforeCAPTCHALanguageCodeProvider : IreCAPTCHALanguageCodeProvider
     {
diff --git a/src/Owl.reCAPTCHA/IreCAPTCHALanguageCodeProvider.cs b/src/Owl.reCAPTCHA/IreCAPTCHALanguageCodeProvider.cs
@@ -1,4 +1,4 @@
-﻿namespace reCAPTCHA
+﻿namespace Owl.reCAPTCHA
 {
     public interface IreCAPTCHALanguageCodeProvider
     {
diff --git a/src/Owl.reCAPTCHA/Owl.reCAPTCHA.csproj b/src/Owl.reCAPTCHA/Owl.reCAPTCHA.csproj
@@ -9,10 +9,11 @@
     <PackageProjectUrl>https://github.com/maliming/reCAPTCHA</PackageProjectUrl>
     <RepositoryUrl>https://github.com/maliming/reCAPTCHA</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Version>0.2.0</Version>
+    <Version>0.3.0</Version>
     <IsPackable>true</IsPackable>
     <OutputType>Library</OutputType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <!-- including PDB files in NuGet for source link because symbolsource.org does not support portable PDBs -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
diff --git a/src/Owl.reCAPTCHA/ServiceCollectionExtensions.cs b/src/Owl.reCAPTCHA/ServiceCollectionExtensions.cs
@@ -1,10 +1,10 @@
 ﻿using System;
 using System.Net.Http;
 using Microsoft.Extensions.DependencyInjection;
-using reCAPTCHA.v2;
-using reCAPTCHA.v3;
+using Owl.reCAPTCHA.v2;
+using Owl.reCAPTCHA.v3;
 
-namespace reCAPTCHA
+namespace Owl.reCAPTCHA
 {
     public static class ServiceCollectionExtensions
     {
diff --git a/src/Owl.reCAPTCHA/StringExtensions.cs b/src/Owl.reCAPTCHA/StringExtensions.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using System.Linq;
 
-namespace reCAPTCHA
+namespace Owl.reCAPTCHA
 {
     public static class StringExtensions
     {
diff --git a/src/Owl.reCAPTCHA/reCAPTCHAConsts.cs b/src/Owl.reCAPTCHA/reCAPTCHAConsts.cs
@@ -1,4 +1,4 @@
-﻿namespace reCAPTCHA
+﻿namespace Owl.reCAPTCHA
 {
     public static class reCAPTCHAConsts
     {
diff --git a/src/Owl.reCAPTCHA/reCAPTCHAOptions.cs b/src/Owl.reCAPTCHA/reCAPTCHAOptions.cs
@@ -1,4 +1,4 @@
-﻿namespace reCAPTCHA
+﻿namespace Owl.reCAPTCHA
 {
     public class reCAPTCHAOptions
     {
diff --git a/src/Owl.reCAPTCHA/reCAPTCHASiteVerifyRequest.cs b/src/Owl.reCAPTCHA/reCAPTCHASiteVerifyRequest.cs
@@ -1,4 +1,4 @@
-﻿namespace reCAPTCHA
+﻿namespace Owl.reCAPTCHA
 {
     public class reCAPTCHASiteVerifyRequest
     {
diff --git a/src/Owl.reCAPTCHA/reCAPTCHASiteVerifyResponse.cs b/src/Owl.reCAPTCHA/reCAPTCHASiteVerifyResponse.cs
@@ -1,7 +1,7 @@
 ﻿using System;
 using Newtonsoft.Json;
 
-namespace reCAPTCHA
+namespace Owl.reCAPTCHA
 {
     public class reCAPTCHASiteVerifyResponse
     {
diff --git a/src/Owl.reCAPTCHA/v2/IreCAPTCHASiteVerifyV2.cs b/src/Owl.reCAPTCHA/v2/IreCAPTCHASiteVerifyV2.cs
@@ -1,6 +1,6 @@
 ﻿using System.Threading.Tasks;
 
-namespace reCAPTCHA.v2
+namespace Owl.reCAPTCHA.v2
 {
     public interface IreCAPTCHASiteVerifyV2
     {
diff --git a/src/Owl.reCAPTCHA/v2/TagHelpers/reCAPTCHAV2DivTagHelper.cs b/src/Owl.reCAPTCHA/v2/TagHelpers/reCAPTCHAV2DivTagHelper.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-namespace reCAPTCHA.V2.TagHelpers
+namespace Owl.reCAPTCHA.v2.TagHelpers
 {
     [HtmlTargetElement("recaptcha-div-v2", TagStructure = TagStructure.WithoutEndTag)]
     public class reCAPTCHAV2DivTagHelper : TagHelper
diff --git a/src/Owl.reCAPTCHA/v2/TagHelpers/reCAPTCHAV2ElementTagHelper.cs b/src/Owl.reCAPTCHA/v2/TagHelpers/reCAPTCHAV2ElementTagHelper.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-namespace reCAPTCHA.V2.TagHelpers
+namespace Owl.reCAPTCHA.v2.TagHelpers
 {
     [HtmlTargetElement("*", Attributes = BadgeAttributeName)]
     [HtmlTargetElement("*", Attributes = ThemeAttributeName)]
diff --git a/src/Owl.reCAPTCHA/v2/TagHelpers/reCAPTCHAV2ScriptTagHelper.cs b/src/Owl.reCAPTCHA/v2/TagHelpers/reCAPTCHAV2ScriptTagHelper.cs
@@ -1,11 +1,9 @@
 ﻿using System;
-using System.Globalization;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
-using reCAPTCHA.v3;
 
-namespace reCAPTCHA.V2.TagHelpers
+namespace Owl.reCAPTCHA.v2.TagHelpers
 {
     [HtmlTargetElement("recaptcha-script-v2", TagStructure = TagStructure.WithoutEndTag)]
     public class reCAPTCHAV2ScriptTagHelper : TagHelper
diff --git a/src/Owl.reCAPTCHA/v2/reCAPTCHASiteVerifyV2.cs b/src/Owl.reCAPTCHA/v2/reCAPTCHASiteVerifyV2.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
-namespace reCAPTCHA.v2
+namespace Owl.reCAPTCHA.v2
 {
     public class reCAPTCHASiteVerifyV2 : IreCAPTCHASiteVerifyV2
     {
diff --git a/src/Owl.reCAPTCHA/v3/IreCAPTCHASiteVerifyV3.cs b/src/Owl.reCAPTCHA/v3/IreCAPTCHASiteVerifyV3.cs
@@ -1,6 +1,6 @@
 ﻿using System.Threading.Tasks;
 
-namespace reCAPTCHA.v3
+namespace Owl.reCAPTCHA.v3
 {
     public interface IreCAPTCHASiteVerifyV3
     {
diff --git a/src/Owl.reCAPTCHA/v3/TagHelpers/reCAPTCHAV3ScriptJsTagHelper.cs b/src/Owl.reCAPTCHA/v3/TagHelpers/reCAPTCHAV3ScriptJsTagHelper.cs
@@ -1,7 +1,7 @@
 ﻿using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-namespace reCAPTCHA.v3.TagHelpers
+namespace Owl.reCAPTCHA.v3.TagHelpers
 {
     [HtmlTargetElement("recaptcha-script-v3-js", TagStructure = TagStructure.WithoutEndTag)]
     public class reCAPTCHAV3ScriptJsTagHelper : TagHelper
@@ -21,20 +21,25 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
         {
             /*
             grecaptcha.ready(function() {
-                grecaptcha.execute('_reCAPTCHA_site_key_', {action: 'homepage'}).then(function(token) {
+                grecaptcha.reExecute = function(){
+                    grecaptcha.execute('_reCAPTCHA_site_key_', {action: 'homepage'}).then(function(token) {
                    ...
-                });
+                })();
+                }
             });
             */
 
             output.TagName = "script";
             output.TagMode = TagMode.StartTagAndEndTag;
 
             var script = "grecaptcha.ready(function(){ " +
+                         "grecaptcha.reExecute = function(){" +
                              "grecaptcha.execute('" + _options.SiteKey + "'" + (string.IsNullOrWhiteSpace(Action) ? "" : ",{action:'" + Action + "'}") + ")" +
                                  ".then(function(token){" +
                                     Callback + "(token)" +
                                  "})" +
+                            "};" +
+                           "grecaptcha.reExecute()" +
                          "});";
             output.Content.SetHtmlContent(script);
         }
diff --git a/src/Owl.reCAPTCHA/v3/TagHelpers/reCAPTCHAV3ScriptTagHelper.cs b/src/Owl.reCAPTCHA/v3/TagHelpers/reCAPTCHAV3ScriptTagHelper.cs
@@ -1,10 +1,9 @@
 ﻿using System;
-using System.Globalization;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.Options;
 
-namespace reCAPTCHA.v3.TagHelpers
+namespace Owl.reCAPTCHA.v3.TagHelpers
 {
     [HtmlTargetElement("recaptcha-script-v3", TagStructure = TagStructure.WithoutEndTag)]
     public class reCAPTCHAV3ScriptTagHelper : TagHelper
diff --git a/src/Owl.reCAPTCHA/v3/reCAPTCHASiteVerifyV3.cs b/src/Owl.reCAPTCHA/v3/reCAPTCHASiteVerifyV3.cs
@@ -5,7 +5,7 @@
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 
-namespace reCAPTCHA.v3
+namespace Owl.reCAPTCHA.v3
 {
     public class reCAPTCHASiteVerifyV3 : IreCAPTCHASiteVerifyV3
     {
diff --git a/src/Owl.reCAPTCHA/v3/reCAPTCHASiteVerifyV3Response.cs b/src/Owl.reCAPTCHA/v3/reCAPTCHASiteVerifyV3Response.cs
@@ -1,4 +1,4 @@
-﻿namespace reCAPTCHA.v3
+﻿namespace Owl.reCAPTCHA.v3
 {
     public class reCAPTCHASiteVerifyV3Response : reCAPTCHASiteVerifyResponse
     {

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,7 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Threading.Tasks;`
`5`		`-using Microsoft.AspNetCore.Mvc;`
`6`		`-using Microsoft.AspNetCore.Mvc.RazorPages;`
	`1`	`+using Microsoft.AspNetCore.Mvc.RazorPages;`
`7`	`2`	`using Microsoft.Extensions.Logging;`
`8`	`3`
`9`		`-namespace reCAPTCHA.Tests.Pages`
	`4`	`+namespace reCAPTCHA.Demo.Pages`
`10`	`5`	`{`
`11`	`6`	`public class IndexModel : PageModel`
`12`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`@page`
`2`		`-@model reCAPTCHA.Tests.Pages.V2_CheckboxModel`
	`2`	`+@model reCAPTCHA.Demo.Pages.V2_CheckboxModel`
`3`	`3`	`@{`
`4`	`4`	`ViewData["Title"] = "V2_Checkbox";`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,10 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`	`2`	`using Microsoft.AspNetCore.Mvc.RazorPages;`
`3`	`3`	`using Newtonsoft.Json;`
`4`		`-using reCAPTCHA.v2;`
	`4`	`+using Owl.reCAPTCHA;`
	`5`	`+using Owl.reCAPTCHA.v2;`
`5`	`6`
`6`		`-namespace reCAPTCHA.Tests.Pages`
	`7`	`+namespace reCAPTCHA.Demo.Pages`
`7`	`8`	`{`
`8`	`9`	`public class V2_CheckboxModel : PageModel`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-@page`
`2`		`-@model reCAPTCHA.Tests.Pages.V2_InvisibleModel`
	`1`	`+@page`
	`2`	`+@model reCAPTCHA.Demo.Pages.V2_InvisibleModel`
`3`	`3`	`@{`
`4`	`4`	`ViewData["Title"] = "V2_Invisible";`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using Microsoft.AspNetCore.Hosting;`
`2`	`2`	`using Microsoft.Extensions.Hosting;`
`3`	`3`
`4`		`-namespace reCAPTCHA.Tests`
	`4`	`+namespace reCAPTCHA.Demo`
`5`	`5`	`{`
`6`	`6`	`public class Program`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,9 @@`
`3`	`3`	`using Microsoft.Extensions.Configuration;`
`4`	`4`	`using Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`using Microsoft.Extensions.Hosting;`
	`6`	`+using Owl.reCAPTCHA;`
`6`	`7`
`7`		`-namespace reCAPTCHA.Tests`
	`8`	`+namespace reCAPTCHA.Demo`
`8`	`9`	`{`
`9`	`10`	`public class Startup`
`10`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System.Globalization;`
`2`	`2`
`3`		`-namespace reCAPTCHA`
	`3`	`+namespace Owl.reCAPTCHA`
`4`	`4`	`{`
`5`	`5`	`public class CultureInforeCAPTCHALanguageCodeProvider : IreCAPTCHALanguageCodeProvider`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace reCAPTCHA`
	`1`	`+namespace Owl.reCAPTCHA`
`2`	`2`	`{`
`3`	`3`	`public interface IreCAPTCHALanguageCodeProvider`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Net.Http;`
`3`	`3`	`using Microsoft.Extensions.DependencyInjection;`
`4`		`-using reCAPTCHA.v2;`
`5`		`-using reCAPTCHA.v3;`
	`4`	`+using Owl.reCAPTCHA.v2;`
	`5`	`+using Owl.reCAPTCHA.v3;`
`6`	`6`
`7`		`-namespace reCAPTCHA`
	`7`	`+namespace Owl.reCAPTCHA`
`8`	`8`	`{`
`9`	`9`	`public static class ServiceCollectionExtensions`
`10`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`	`3`
`4`		`-namespace reCAPTCHA`
	`4`	`+namespace Owl.reCAPTCHA`
`5`	`5`	`{`
`6`	`6`	`public static class StringExtensions`
`7`	`7`	`{`