Merge pull request #2 from i-pva/error-handler

bugfix: improvement for response

Author: viplifes

liqpay.go

@@ -6,15 +6,14 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"html/template"
 	"net/http"
 	"net/url"
 )
 
 const liqpayURL = "https://www.liqpay.ua/api/"
 
-var defaultClient = http.Client{}
-
 type formData struct {
 	Data      string
 	Signature string
@@ -33,7 +32,7 @@ type Response map[string]interface{}
 func New(pubKey string, privKey string, client *http.Client) *Client {
 	var c *http.Client
 	if client == nil {
-		c = &defaultClient
+		c = &http.Client{}
 	} else {
 		c = client
 	}
@@ -64,15 +63,22 @@ func (c Client) Send(apiUrl string, req Request) (Response, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		return nil, errors.New(fmt.Sprintf("bad response status code, status code is %d", resp.StatusCode))
+	}
+
 	var res Response
 	if err := json.NewDecoder(resp.Body).Decode(&res); err != nil {
 		return nil, err
 	}
-	errMsg := res["err_description"].(string)
-	if resp.StatusCode != 200 {
-		return res, errors.New(errMsg)
-	} else if res["status"] == "error" {
-		return res, errors.New(errMsg)
+
+	if res["status"] == "error" {
+		errMsg, ok := res["err_description"].(string)
+		if ok {
+			return nil, errors.New(errMsg)
+		}
+		return nil, errors.New("response body has status error but didn't get error description")
 	}
 
 	return res, nil

liqpay_test.go

@@ -3,6 +3,7 @@ package liqpay
 import (
 	"encoding/base64"
 	"encoding/json"
+	"errors"
 	"net/http"
 	"reflect"
 	"testing"
@@ -22,7 +23,7 @@ func TestClient_Send(t *testing.T) {
 		name    string
 		fields  fields
 		args    args
-		want    Response
+		want    error
 		wantErr bool
 	}{
 		{
@@ -39,13 +40,7 @@ func TestClient_Send(t *testing.T) {
 					"num": 124.0,
 				},
 			},
-			want: Response{
-				"result":          "error",
-				"status":          "error",
-				"code":            "public_key_not_found",
-				"err_code":        "public_key_not_found",
-				"err_description": "Не найден public_key",
-			},
+			want:    errors.New("Не найден public_key"),
 			wantErr: true,
 		},
 	}
@@ -61,7 +56,7 @@ func TestClient_Send(t *testing.T) {
 				t.Errorf("Client.Send() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
-			if !reflect.DeepEqual(got, tt.want) {
+			if !reflect.DeepEqual(err, tt.want) {
 				t.Errorf("Client.Send() = %v, want %v", got, tt.want)
 			}
 		})