Change NodeAuthenticator to RequestInterceptor

README.md

@@ -91,6 +91,13 @@ the send subcommand sends funds to an address.
 ACCOUNT_INDEX is an optional parameter, which must be a number between 0
 and 4,294,967,295. It allows you to use multiple accounts derived from
 the same seed. By default the account with index 0 is chosen.
+
+Environment:
+	ATTO_BASIC_AUTH_USERNAME  The username for HTTP Basic Authentication.
+	                          If set, HTTP Basic Authentication will be
+	                          used when making requests to the node.
+	ATTO_BASIC_AUTH_PASSWORD  The password to use for HTTP Basic
+	                          Authentication.
 ```
 
 # Technical details

cmd/atto-safesign/README.md

@@ -84,4 +84,11 @@ Nano network.
 ACCOUNT_INDEX is an optional parameter, which allows you to use
 different accounts derived from the given seed. By default the account
 with index 0 is chosen.
+
+Environment:
+        ATTO_BASIC_AUTH_USERNAME  The username for HTTP Basic Authentication.
+                                  If set, HTTP Basic Authentication will be
+                                  used when making requests to the node.
+        ATTO_BASIC_AUTH_PASSWORD  The password to use for HTTP Basic
+                                  Authentication.
 ```

cmd/atto-safesign/main.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io"
 	"math/big"
+	"net/http"
 	"os"
 
 	"github.com/codesoap/atto"
@@ -47,6 +48,13 @@ Nano network.
 ACCOUNT_INDEX is an optional parameter, which allows you to use
 different accounts derived from the given seed. By default the account
 with index 0 is chosen.
+
+Environment:
+	ATTO_BASIC_AUTH_USERNAME  The username for HTTP Basic Authentication.
+	                          If set, HTTP Basic Authentication will be
+	                          used when making requests to the node.
+	ATTO_BASIC_AUTH_PASSWORD  The password to use for HTTP Basic
+	                          Authentication.
 `
 
 var accountIndexFlag uint
@@ -80,6 +88,18 @@ func init() {
 		flag.Usage()
 		os.Exit(1)
 	}
+	setUpNodeAuthentication()
+}
+
+func setUpNodeAuthentication() {
+	if os.Getenv("ATTO_BASIC_AUTH_USERNAME") != "" {
+		username := os.Getenv("ATTO_BASIC_AUTH_USERNAME")
+		password := os.Getenv("ATTO_BASIC_AUTH_PASSWORD")
+		atto.RequestInterceptor = func(request *http.Request) error {
+			request.SetBasicAuth(username, password)
+			return nil
+		}
+	}
 }
 
 func main() {

cmd/atto/main.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"math/big"
+	"net/http"
 	"os"
 
 	"github.com/codesoap/atto"
@@ -83,9 +84,11 @@ func init() {
 
 func setUpNodeAuthentication() {
 	if os.Getenv("ATTO_BASIC_AUTH_USERNAME") != "" {
-		atto.DefaultNodeAuthenticator = atto.NodeBasicAuth{
-			Username: os.Getenv("ATTO_BASIC_AUTH_USERNAME"),
-			Password: os.Getenv("ATTO_BASIC_AUTH_PASSWORD"),
+		username := os.Getenv("ATTO_BASIC_AUTH_USERNAME")
+		password := os.Getenv("ATTO_BASIC_AUTH_PASSWORD")
+		atto.RequestInterceptor = func(request *http.Request) error {
+			request.SetBasicAuth(username, password)
+			return nil
 		}
 	}
 }

request_interceptor.go

@@ -0,0 +1,10 @@
+package atto
+
+import "net/http"
+
+// The RequestInterceptor is a function that is used to modify all HTTP
+// requests that are sent to a node. If it is nil, requests are not
+// modified.
+//
+// May be used, for example, to authenticate requests.
+var RequestInterceptor func(request *http.Request) error

util.go

@@ -112,8 +112,11 @@ func doRPC(requestBody, node string) (responseBytes []byte, err error) {
 		return
 	}
 	req.Header.Add("Content-Type", "application/json")
-	if DefaultNodeAuthenticator != nil {
-		DefaultNodeAuthenticator.Authenticate(req)
+	if RequestInterceptor != nil {
+		if err = RequestInterceptor(req); err != nil {
+			err = fmt.Errorf("request interceptor failed: %v", err)
+			return
+		}
 	}
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {