update validate captcha and verify response

Author: mahdifarzadi

arcaptcha.go

@@ -11,8 +11,8 @@ import (
 const arcaptchaApi = "https://arcaptcha.ir/2/siteverify"
 
 type Website struct {
-	SiteKey   string `json:"site_key"`
-	SecretKey string `json:"secret_key"`
+	SiteKey   string
+	SecretKey string
 }
 
 func NewWebsite(siteKey, secretKey string) *Website {
@@ -21,7 +21,8 @@ func NewWebsite(siteKey, secretKey string) *Website {
 		SecretKey: secretKey,
 	}
 }
-func (w *Website) ValidateCaptcha(challengeID string) error {
+
+func (w *Website) ValidateCaptcha(challengeID string) (success bool, err error) {
 
 	data := &verifyCaptchaRequest{
 		SiteKey:     w.SiteKey,
@@ -30,7 +31,7 @@ func (w *Website) ValidateCaptcha(challengeID string) error {
 	}
 	bin, err := json.Marshal(data)
 	if err != nil {
-		return err
+		return
 	}
 
 	req, err := http.NewRequest(
@@ -39,32 +40,30 @@ func (w *Website) ValidateCaptcha(challengeID string) error {
 		bytes.NewBuffer(bin),
 	)
 	if err != nil {
-		return err
+		return
 	}
 
 	req.Header.Add("Content-Type", "application/json")
 	req.Header.Add("Content-Length", strconv.Itoa(len(string(bin))))
 
 	res, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return err
+		return
 	}
 	defer func() {
 		_ = res.Body.Close()
 	}()
 
 	bin, err = ioutil.ReadAll(res.Body)
 	if err != nil {
-		return err
-	}
-	var errRes Error
-	if err = json.Unmarshal(bin, &errRes); err != nil {
-		return err
+		return
 	}
 
-	if res.StatusCode != http.StatusOK {
-		return errRes
+	var response VerifyCaptchaResponse
+	if err = json.Unmarshal(bin, &response); err != nil {
+		return
 	}
-	return nil
 
+	success = response.Success
+	return
 }

entity.go

@@ -1,18 +1,12 @@
 package arcaptcha
 
-import "fmt"
-
 type verifyCaptchaRequest struct {
 	SiteKey     string `json:"site_key"`
 	SecretKey   string `json:"secret_key"`
 	ChallengeID string `json:"challenge_id"`
 }
 
-type Error struct {
-	Status  int    `json:"status"`
-	Message string `json:"message"`
-}
-
-func (e Error) Error() string {
-	return fmt.Sprintf("return status %v: %v", e.Status, e.Message)
+type VerifyCaptchaResponse struct {
+	Success    bool     `json:"success"`
+	ErrorCodes []string `json:"error-codes"`
 }