Just prepare to release the 1.1.1 version.

dotnetvn · Apr 1, 2015 · a3a23c3 · a3a23c3
1 parent 8c14a3a
commit a3a23c3
Show file tree

Hide file tree

Showing 38 changed files with 39 additions and 6 deletions.
diff --git a/GoogleRecaptcha.WebForms/Default.aspx b/GoogleRecaptcha.WebForms/Default.aspx
@@ -5,12 +5,12 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title></title>
+    <title>Test the Google Recapcha V2 Server Control</title>
 </head>
 <body>
     <form id="frm" runat="server">
 		<div>
-			<asp:RecaptchaV2Control SiteKey="6LeF-QMTAAAAAPBTi98JAMFTF1lBzKrbyCri0JB_" SecretKey="6LeF-QMTAAAAAOw8M2RTtxoY6ifOhhUb4GlXpdB3" runat="server"/>
+			<asp:RecaptchaV2Control ID="gRecapcha" SiteKey="6LeF-QMTAAAAAPBTi98JAMFTF1lBzKrbyCri0JB_" SecretKey="6LeF-QMTAAAAAOw8M2RTtxoY6ifOhhUb4GlXpdB3" runat="server"/>
 		</div>
 		<asp:Button ID="btnVerify" runat="server" Text="Submit" OnClick="btnVerify_OnClick"/>
     </form>

diff --git a/GoogleRecaptcha.WebForms/Default.aspx.designer.cs b/GoogleRecaptcha.WebForms/Default.aspx.designer.cs
diff --git a/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.WebForms.dll b/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.WebForms.dll
diff --git a/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.WebForms.pdb b/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.WebForms.pdb
diff --git a/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.dll b/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.dll
diff --git a/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.pdb b/GoogleRecaptcha.WebForms/bin/GoogleRecaptcha.pdb
diff --git a/GoogleRecaptcha.WebForms/bin/GoogleRecaptchaWebForms.dll b/GoogleRecaptcha.WebForms/bin/GoogleRecaptchaWebForms.dll
diff --git a/GoogleRecaptcha.WebForms/bin/GoogleRecaptchaWebForms.pdb b/GoogleRecaptcha.WebForms/bin/GoogleRecaptchaWebForms.pdb
diff --git a/...ecaptcha.WebForms/obj/Debug/GoogleRecaptcha.WebForms.csprojResolveAssemblyReference.cache b/...ecaptcha.WebForms/obj/Debug/GoogleRecaptcha.WebForms.csprojResolveAssemblyReference.cache
diff --git a/GoogleRecaptcha.WebForms/obj/Debug/GoogleRecaptcha.WebForms.dll b/GoogleRecaptcha.WebForms/obj/Debug/GoogleRecaptcha.WebForms.dll
diff --git a/GoogleRecaptcha.WebForms/obj/Debug/GoogleRecaptcha.WebForms.pdb b/GoogleRecaptcha.WebForms/obj/Debug/GoogleRecaptcha.WebForms.pdb
diff --git a/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.WebMvc.dll b/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.WebMvc.dll
diff --git a/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.WebMvc.pdb b/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.WebMvc.pdb
diff --git a/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.dll b/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.dll
diff --git a/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.pdb b/GoogleRecaptcha.WebMvc/bin/GoogleRecaptcha.pdb
diff --git a/GoogleRecaptcha.WebMvc/bin/GoogleRecaptchaMvc.dll b/GoogleRecaptcha.WebMvc/bin/GoogleRecaptchaMvc.dll
diff --git a/GoogleRecaptcha.WebMvc/bin/GoogleRecaptchaMvc.pdb b/GoogleRecaptcha.WebMvc/bin/GoogleRecaptchaMvc.pdb
diff --git a/GoogleRecaptcha.WebMvc/obj/Debug/GoogleRecaptcha.WebMvc.csprojResolveAssemblyReference.cache b/GoogleRecaptcha.WebMvc/obj/Debug/GoogleRecaptcha.WebMvc.csprojResolveAssemblyReference.cache
diff --git a/GoogleRecaptcha.WebMvc/obj/Debug/GoogleRecaptcha.WebMvc.dll b/GoogleRecaptcha.WebMvc/obj/Debug/GoogleRecaptcha.WebMvc.dll
diff --git a/GoogleRecaptcha.WebMvc/obj/Debug/GoogleRecaptcha.WebMvc.pdb b/GoogleRecaptcha.WebMvc/obj/Debug/GoogleRecaptcha.WebMvc.pdb
diff --git a/GoogleRecaptcha.v12.suo b/GoogleRecaptcha.v12.suo
diff --git a/GoogleRecaptcha/RecaptchaV2Data.cs b/GoogleRecaptcha/RecaptchaV2Data.cs
@@ -13,15 +13,15 @@ public class RecaptchaV2Data
 		public string Secret { get; set; }
 
 		/// <summary>
-		/// Gets or sets the Response property. This property indicates that this is the response returned from the server.
+		/// Gets the Response property. This property indicates that this is the response returned from the server.
 		/// </summary>
 		public string Response
 		{
 			get { return HttpContext.Current.Request.Form["g-recaptcha-response"]; }
 		}
 
 		/// <summary>
-		/// Gets or sets the RemoteIp property. This property indicates that this is remote ip address from the client.
+		/// Gets the RemoteIp property. This property indicates that this is remote ip address from the client.
 		/// </summary>
 		public string RemoteIp
 		{

diff --git a/GoogleRecaptcha/bin/Debug/GoogleRecaptcha.dll b/GoogleRecaptcha/bin/Debug/GoogleRecaptcha.dll
diff --git a/GoogleRecaptcha/bin/Debug/GoogleRecaptcha.pdb b/GoogleRecaptcha/bin/Debug/GoogleRecaptcha.pdb
diff --git a/GoogleRecaptcha/obj/Debug/GoogleRecaptcha.dll b/GoogleRecaptcha/obj/Debug/GoogleRecaptcha.dll
diff --git a/GoogleRecaptcha/obj/Debug/GoogleRecaptcha.pdb b/GoogleRecaptcha/obj/Debug/GoogleRecaptcha.pdb
diff --git a/GoogleRecaptchaMvc/bin/Debug/GoogleRecaptchaMvc.dll b/GoogleRecaptchaMvc/bin/Debug/GoogleRecaptchaMvc.dll
diff --git a/GoogleRecaptchaMvc/bin/Debug/GoogleRecaptchaMvc.pdb b/GoogleRecaptchaMvc/bin/Debug/GoogleRecaptchaMvc.pdb
diff --git a/GoogleRecaptchaMvc/obj/Debug/GoogleRecaptchaMvc.dll b/GoogleRecaptchaMvc/obj/Debug/GoogleRecaptchaMvc.dll
diff --git a/GoogleRecaptchaMvc/obj/Debug/GoogleRecaptchaMvc.pdb b/GoogleRecaptchaMvc/obj/Debug/GoogleRecaptchaMvc.pdb
diff --git a/GoogleRecaptchaWebForms/RecaptchaV2Control.cs b/GoogleRecaptchaWebForms/RecaptchaV2Control.cs
@@ -88,9 +88,33 @@ public void Validate()
 				new RecaptchaV2Data() { Secret = SecretKey });
 			var result = recaptcha.Verify();
 			IsValid = result.Success;
-			if(!IsValid && result.ErrorCodes.Length > 0)
+			if (IsValid) return;
+			if(result.ErrorCodes.Length > 0)
 			{
-				ErrorMessage = result.ErrorCodes[0];
+				ErrorMessage = String.Empty;
+				foreach (var errorCode in result.ErrorCodes)
+				{
+					switch (errorCode)
+					{
+						case "missing-input-secret":
+							ErrorMessage += "The secret parameter is missing - ";
+							break;
+						case "invalid-input-secret":
+							ErrorMessage += "The secret parameter is invalid or malformed - ";
+							break;
+						case "missing-input-response":
+							ErrorMessage += "The response parameter is missing - ";
+							break;
+						case "invalid-input-response":
+							ErrorMessage += "The response parameter is invalid or malformed - ";
+							break;
+					}
+					ErrorMessage = ErrorMessage.TrimEnd(' ', '-');
+				}
+			}
+			else
+			{
+				ErrorMessage = "Oops! Unknown error!";
 			}
 		}
 	}

diff --git a/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptcha.dll b/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptcha.dll
diff --git a/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptcha.pdb b/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptcha.pdb
diff --git a/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptchaWebForms.dll b/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptchaWebForms.dll
diff --git a/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptchaWebForms.pdb b/GoogleRecaptchaWebForms/bin/Debug/GoogleRecaptchaWebForms.pdb
diff --git a/...eRecaptchaWebForms/obj/Debug/GoogleRecaptchaWebForms.csprojResolveAssemblyReference.cache b/...eRecaptchaWebForms/obj/Debug/GoogleRecaptchaWebForms.csprojResolveAssemblyReference.cache
diff --git a/GoogleRecaptchaWebForms/obj/Debug/GoogleRecaptchaWebForms.dll b/GoogleRecaptchaWebForms/obj/Debug/GoogleRecaptchaWebForms.dll
diff --git a/GoogleRecaptchaWebForms/obj/Debug/GoogleRecaptchaWebForms.pdb b/GoogleRecaptchaWebForms/obj/Debug/GoogleRecaptchaWebForms.pdb