Fix api key issue

Author: andsala

ipdata/ipdata.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 	"net/url"
 	"strings"
@@ -13,7 +14,7 @@ type boolean bool
 
 // Client represent the wrapper for ipdata.co
 type Client struct {
-	baseURL    *url.URL
+	baseURL    string
 	httpClient *http.Client
 	UserAgent  string
 	APIKey     string
@@ -93,21 +94,20 @@ func NewClient(httpClient *http.Client) (*Client, error) {
 		httpClient = http.DefaultClient
 	}
 
-	baseURL, err := url.Parse("https://api.ipdata.co")
-	if err != nil {
-		return nil, err
-	}
-
 	client := &Client{
-		baseURL:    baseURL,
+		baseURL:    "https://api.ipdata.co",
 		httpClient: httpClient,
 	}
 	return client, nil
 }
 
 func (c *Client) newRequest(method, path string) (*http.Request, error) {
-	rel := &url.URL{Path: path}
-	u := c.baseURL.ResolveReference(rel)
+	params := url.Values{}
+	params.Add("api-key", c.APIKey)
+
+	u, _ := url.ParseRequestURI(c.baseURL)
+	u.Path = path
+	u.RawQuery = params.Encode()
 
 	req, err := http.NewRequest(method, u.String(), nil)
 	if err != nil {
@@ -117,7 +117,6 @@ func (c *Client) newRequest(method, path string) (*http.Request, error) {
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("User-Agent", c.UserAgent)
-	req.Header.Set("Api-Key", c.APIKey)
 
 	return req, nil
 }
@@ -150,17 +149,17 @@ func (c *Client) GetIPData(ip string) (*Data, error) {
 	resp, body, err := c.do(req, data)
 	if err != nil || resp.StatusCode != 200 {
 		var errorResponse = &Error{}
-		json.Unmarshal([]byte(*body), errorResponse)
+		_ = json.Unmarshal([]byte(*body), errorResponse)
 
 		switch resp.StatusCode {
 		case 400: // Bad Request
-			return nil, errors.New(*body)
-		case 403:
 			return nil, errors.New(errorResponse.Message)
+		case 401: // Unauthorized
+			return nil, errors.New(fmt.Sprintf("Unauthorized: %v", errorResponse.Message))
 		case 429: // Too Many Requests
 			return nil, errors.New("you have exceeded requests limit. See https://ipdata.co")
 		default:
-			return nil, err
+			return nil, errors.New(fmt.Sprintf("Unknown Error: %v", errorResponse.Message))
 		}
 	}
 	data.JSON = body

main.go

@@ -130,7 +130,10 @@ COPYRIGHT:
 
 	sort.Sort(cli.FlagsByName(app.Flags))
 
-	app.Run(os.Args)
+	err := app.Run(os.Args)
+	if err != nil {
+		fmt.Println(err)
+	}
 }
 
 func getFlagRepr(data ipdata.Data) string {