Client requires explicit userame for geonames portal

Author: qba73

README.md

@@ -24,17 +24,15 @@ import github.com/qba73/geonames
 
 Export ENV Var ```GEONAMES_USER```
 ```go
-client, err := geonames.NewClient()
+client, err := geonames.NewClient(os.Getenv("GEONAMES_USER"))
 if err != nil {
     // handle error
 }
 ```
 
-Provide username :
+Provide username directly:
 ```go
-client, err := geonames.NewClient(
-    geonames.WithUserName("dummy_user")
-)
+client, err := geonames.NewClient("dummy_user")
 if err != nil {
     // handle error
 }

examples/postal/main.go

@@ -3,13 +3,14 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
 
 	"github.com/qba73/geonames"
 )
 
 func main() {
 	// We exported valid "GEONAMES_USER" env var
-	geo, err := geonames.NewClient()
+	geo, err := geonames.NewClient(os.Getenv("GEONAMES_USER"))
 	if err != nil {
 		panic(err)
 	}

examples/wikipedia/main.go

@@ -3,13 +3,14 @@ package main
 import (
 	"fmt"
 	"log"
+	"os"
 
 	"github.com/qba73/geonames"
 )
 
 func main() {
 	// We exported valid "GEONAMES_USER" env var
-	geo, err := geonames.NewClient()
+	geo, err := geonames.NewClient(os.Getenv("GEONAMES_USER"))
 	if err != nil {
 		panic(err)
 	}

geonames.go

@@ -7,7 +7,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"time"
 )
 
@@ -48,16 +47,6 @@ func WithHTTPHeaders(header http.Header) option {
 	}
 }
 
-func WithUserName(username string) option {
-	return func(c *Client) error {
-		if username == "" {
-			return errors.New("nil username")
-		}
-		c.userName = username
-		return nil
-	}
-}
-
 // Client is a client used for communicating with GeoNames web service.
 type Client struct {
 	userName   string
@@ -72,9 +61,12 @@ type Client struct {
 // NewClient knows how to create a client for GeoNames Web service.
 // The username has to be registered at the GeoNames.org website.
 // HTTP requests without a valid username will return 403 HTTP errors.
-func NewClient(options ...option) (*Client, error) {
+func NewClient(username string, options ...option) (*Client, error) {
+	if username == "" {
+		return nil, errors.New("nil geonames user")
+	}
 	c := Client{
-		userName:  os.Getenv("GEONAMES_USER"),
+		userName:  username,
 		userAgent: userAgent,
 		baseURL:   "http://api.geonames.org",
 		httpClient: &http.Client{
@@ -84,7 +76,6 @@ func NewClient(options ...option) (*Client, error) {
 			"User-Agent":   {userAgent},
 			"Content-Type": {"application/json"}},
 	}
-
 	for _, opt := range options {
 		if err := opt(&c); err != nil {
 			return nil, fmt.Errorf("creating geonames client: %w", err)

geonames_test.go

@@ -69,10 +69,7 @@ func TestWikipediaResolvesGeoNameOnValidInput(t *testing.T) {
 	defer ts.Close()
 
 	name, country := "Castlebar", "IE"
-	client, err := geonames.NewClient(
-		geonames.WithUserName("DummyUser"),
-		geonames.WithBaseURL(ts.URL),
-	)
+	client, err := geonames.NewClient("DummyUser", geonames.WithBaseURL(ts.URL))
 	if err != nil {
 		t.Fatal(err)
 	}

postal_test.go

@@ -18,10 +18,7 @@ func TestGetPostalCodes_ReturnsSingleValueOnValidInput(t *testing.T) {
 	)
 	defer ts.Close()
 
-	client, err := geonames.NewClient(
-		geonames.WithUserName("DummyUser"),
-		geonames.WithBaseURL(ts.URL),
-	)
+	client, err := geonames.NewClient("DummyUser", geonames.WithBaseURL(ts.URL))
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -64,10 +61,7 @@ func TestGetPostalCodes_ReturnsMultipleValuesOnValidInput(t *testing.T) {
 	)
 	defer ts.Close()
 
-	client, err := geonames.NewClient(
-		geonames.WithUserName("DummyUser"),
-		geonames.WithBaseURL(ts.URL),
-	)
+	client, err := geonames.NewClient("DummyUser", geonames.WithBaseURL(ts.URL))
 	if err != nil {
 		t.Fatal(err)
 	}

wikipedia_test.go

@@ -15,10 +15,7 @@ func TestGetPlace_RetrievesSingleGeoNameOnValidInput(t *testing.T) {
 	ts := newTestServer(testFile, wantReqURI, t)
 	defer ts.Close()
 
-	client, err := geonames.NewClient(
-		geonames.WithUserName("DummyUser"),
-		geonames.WithBaseURL(ts.URL),
-	)
+	client, err := geonames.NewClient("DummyUser", geonames.WithBaseURL(ts.URL))
 	if err != nil {
 		t.Fatal(err)
 	}