Merge pull request #1 from arcaptcha/co_version

mahdifarzadi · web-flow · commit 0b11258c0afb · 2022-08-04T09:51:58.000+04:30
Co version
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ Register on [Arcaptcha](https://arcaptcha.ir/), create website and get your own
 
 ```go
 website := arcaptcha.NewWebsite("YOUR_SITE_KEY", "YOUR_SECRET_KEY")
-//'arcaptcha-token' is created for each captcha
-//After you put captcha widget in your website, you can get 'arcaptcha-token' from form
-result, err := website.Verify("arcaptcha-token")
+//'arcaptcha-response' is created for each captcha
+//After you put captcha widget in your website, you can get 'arcaptcha-response' from form
+result, err := website.Verify("arcaptcha-response")
 if err != nil {
     // error in sending or receiving API request
     // handle error
@@ -66,8 +66,8 @@ func handler(w http.ResponseWriter, r *http.Request) {
 func verifyCaptcha(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		r.ParseForm()
-		token := r.FormValue("arcaptcha-token")
-		result, err := website.Verify(token)
+		response := r.FormValue("arcaptcha-response")
+		result, err := website.Verify(response)
 		if err != nil {
 			// error in sending or receiving API request
 			// handle error
diff --git a/arcaptcha.go b/arcaptcha.go
@@ -8,24 +8,27 @@ import (
 )
 
 // arcaptchaApi arcaptcha verify API for captcha V2
-const arcaptchaApi = "https://arcaptcha.ir/2/siteverify"
+const arcaptchaApi = "https://arcaptcha.co/2/siteverify"
 
 type Website struct {
 	SiteKey   string
 	SecretKey string
 }
 
 type verifyReq struct {
-	SiteKey     string `json:"site_key"`
-	SecretKey   string `json:"secret_key"`
-	ChallengeID string `json:"challenge_id"`
+	SiteKey   string `json:"sitekey"`
+	SecretKey string `json:"secret"`
+	Response  string `json:"response"`
+	RemoteIp  string `json:"remoteip"`
 }
 
 // VerifyResp represents verify API response
 // error codes are available in https://docs.arcaptcha.ir/en/API/Verify
 type VerifyResp struct {
-	Success    bool     `json:"success"`
-	ErrorCodes []string `json:"error-codes"`
+	Success     bool     `json:"success"`
+	ChallengeTS string   `json:"challenge_ts,omitempty"`
+	Hostname    string   `json:"hostname,omitempty"`
+	ErrorCodes  []string `json:"error-codes,omitempty"`
 }
 
 // NewWebsite creates a new Website
@@ -40,11 +43,11 @@ func NewWebsite(siteKey, secretKey string) *Website {
 //
 // if an error occurs while sending or receiving the request, returns error.
 // server side errors are available in VerifyResp.ErrorCodes.
-func (w *Website) Verify(token string) (VerifyResp, error) {
+func (w *Website) Verify(response string) (VerifyResp, error) {
 	data := &verifyReq{
-		SiteKey:     w.SiteKey,
-		SecretKey:   w.SecretKey,
-		ChallengeID: token,
+		SiteKey:   w.SiteKey,
+		SecretKey: w.SecretKey,
+		Response:  response,
 	}
 	var resp VerifyResp
 	err := sendRequest(http.MethodPost, arcaptchaApi, data, &resp)
diff --git a/examples/demo.html b/examples/demo.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
     <meta charset="UTF-8">
-    <title>Go Package Demo</title>
+    <title>ARCaptcha Go Demo</title>
     <script src="https://widget.arcaptcha.ir/2/api.js"></script>
 </head>
 <body>
diff --git a/examples/example.go b/examples/example.go
@@ -41,8 +41,8 @@ func handleDemo(w http.ResponseWriter, r *http.Request) {
 	submitted := r.FormValue("submitted")
 	if submitted != "" {
 		// verify captcha
-		token := r.FormValue("arcaptcha-token")
-		result, err := website.Verify(token)
+		response := r.FormValue("arcaptcha-response")
+		result, err := website.Verify(response)
 		if err != nil {
 			log.Fatal(err)
 		}
