feat: simplified auth

Author: ldez

auth.go

@@ -88,6 +88,7 @@ import (
 	"io"
 	"net/http"
 	"net/http/httptest"
+	"net/url"
 	"os"
 	"path/filepath"
 	"testing"
@@ -128,11 +129,8 @@ func setupFakeAPI(t *testing.T, dir, operation string) *Client {
 		}
 	})
 
-	transport, err := NewTokenTransport("1234")
-	require.NoError(t, err)
-
-	client := NewClient(transport.Client())
-	client.Endpoint = server.URL
+	client := NewClient("1234")
+	client.Endpoint, _ = url.Parse(server.URL)
 
 	return client
 }

gen/gen_test.go

@@ -4,9 +4,9 @@ package namesilo
 import (
 	"context"
 	"errors"
-	"fmt"
 	"net/http"
 	"net/url"
+	"time"
 
 	querystring "github.com/google/go-querystring/query"
 )
@@ -31,59 +31,63 @@ const (
 
 // Client the Namesilo client.
 type Client struct {
-	Endpoint   string
+	apiKey string
+
+	Endpoint   *url.URL
 	HTTPClient *http.Client
 }
 
 // NewClient Creates a Namesilo client.
-func NewClient(httpClient *http.Client) *Client {
-	if httpClient == nil {
-		httpClient = http.DefaultClient
-	}
+func NewClient(apiKey string) *Client {
+	endpoint, _ := url.Parse(DefaultAPIEndpoint)
 
 	return &Client{
-		Endpoint:   DefaultAPIEndpoint,
-		HTTPClient: httpClient,
+		apiKey:     apiKey,
+		Endpoint:   endpoint,
+		HTTPClient: &http.Client{Timeout: 10 * time.Second},
 	}
 }
 
 func (c *Client) get(ctx context.Context, name string, params any) (*http.Response, error) {
-	uri, err := url.Parse(fmt.Sprintf("%s/%s", c.Endpoint, name))
-	if err != nil {
-		return nil, err
-	}
+	endpoint := c.Endpoint.JoinPath(name)
 
 	if params != nil {
 		var v url.Values
 
-		v, err = querystring.Values(params)
+		v, err := querystring.Values(params)
 		if err != nil {
 			return nil, err
 		}
 
-		uri.RawQuery = v.Encode()
+		endpoint.RawQuery = v.Encode()
 	}
 
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, uri.String(), http.NoBody)
+	query := endpoint.Query()
+	query.Set("version", "1")
+	query.Set("type", "xml")
+	query.Set("key", c.apiKey)
+	endpoint.RawQuery = query.Encode()
+
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint.String(), http.NoBody)
 	if err != nil {
 		return nil, err
 	}
 
 	return c.HTTPClient.Do(req)
 }
 
-func GetEndpoint(prod, ote bool) (string, error) {
+func GetEndpoint(prod, ote bool) (*url.URL, error) {
 	if prod && ote {
-		return "", errors.New("prod and ote are mutually exclusive")
+		return nil, errors.New("prod and ote are mutually exclusive")
 	}
 
 	if prod {
-		return DefaultAPIEndpoint, nil
+		return url.Parse(DefaultAPIEndpoint)
 	}
 
 	if ote {
-		return OTEAPIEndpoint, nil
+		return url.Parse(OTEAPIEndpoint)
 	}
 
-	return SandboxAPIEndpoint, nil
+	return url.Parse(SandboxAPIEndpoint)
 }

namesilo.go

@@ -22,12 +22,7 @@ import (
 )
 
 func main() {
-	transport, err := namesilo.NewTokenTransport("1234")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	client := namesilo.NewClient(transport.Client())
+	client := namesilo.NewClient("1234")
 
 	params := &namesilo.AddAccountFundsParams{
 		Amount:    "1000000",
@@ -55,12 +50,7 @@ import (
 )
 
 func main() {
-	transport, err := namesilo.NewTokenTransport("1234")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	client := namesilo.NewClient(transport.Client())
+	client := namesilo.NewClient("1234")
 
 	// Set the endpoint to use the OTE endpoint.
 	endpoint, err := namesilo.GetEndpoint(false, true)