update http.RoundTripper used by Auth client

desktop/app/app.go

@@ -40,7 +40,6 @@ import (
 	"github.com/getlantern/lantern-client/internalsdk/common"
 	proclient "github.com/getlantern/lantern-client/internalsdk/pro"
 	"github.com/getlantern/lantern-client/internalsdk/protos"
-	"github.com/getlantern/lantern-client/internalsdk/webclient"
 )
 
 var (
@@ -165,9 +164,7 @@ func (app *App) Run(ctx context.Context) {
 		userConfig := func() common.UserConfig {
 			return settings.UserConfig(app.Settings())
 		}
-		proClient := proclient.NewClient(fmt.Sprintf("https://%s", common.ProAPIHost), &webclient.Opts{
-			UserConfig: userConfig,
-		})
+		proClient := proclient.NewClient(fmt.Sprintf("https://%s", common.ProAPIHost), userConfig)
 		authClient := auth.NewClient(fmt.Sprintf("https://%s", common.DFBaseUrl), userConfig)
 
 		app.mu.Lock()

internalsdk/auth/auth.go

@@ -3,7 +3,6 @@ package auth
 import (
 	"context"
 
-	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -12,7 +11,6 @@ import (
 	"github.com/getlantern/golog"
 
 	"github.com/getlantern/lantern-client/internalsdk/common"
-	"github.com/getlantern/lantern-client/internalsdk/pro"
 	"github.com/getlantern/lantern-client/internalsdk/protos"
 	"github.com/getlantern/lantern-client/internalsdk/webclient"
 
@@ -51,35 +49,39 @@ type AuthClient interface {
 	Healthz(ctx context.Context) (bool, error)
 }
 
-// NewClient creates a new instance of AuthClient
-func NewClient(baseURL string, userConfig func() common.UserConfig) AuthClient {
-	// The default http.RoundTripper is ChainedNonPersistent which proxies requests through chained servers
-	// and does not use keep alive connections. Since no root CA is specified, we do not need to check for an error.
-
-	var httpClient *http.Client
+type serialTransport []http.RoundTripper
 
-	if baseURL == fmt.Sprintf("https://%s", common.APIBaseUrl) {
-		log.Debug("using proxied.Fronted")
-		//this is ios version
-		httpClient = &http.Client{
-			Transport: proxied.Fronted("auth_fronted_roundtrip", 30*time.Second),
+func (tr serialTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
+	for _, rt := range tr {
+		resp, err = rt.RoundTrip(req)
+		if err == nil {
+			return
 		}
-	} else {
-		log.Debug("using proxied.ChainedNonPersistent")
-		rt, _ := proxied.ChainedNonPersistent("")
-		httpClient = pro.NewHTTPClient(rt, 30*time.Second)
+		log.Debugf("Error roundtripping request to %v, continuing to next transport", req.URL)
 	}
+	log.Errorf("Unable to roundtrip request to %v, out of transports", req.URL)
+	return
+}
 
+// NewClient creates a new instance of AuthClient
+func NewClient(baseURL string, userConfig func() common.UserConfig) AuthClient {
+	chained, err := proxied.ChainedNonPersistent("")
+	if err != nil {
+		log.Fatal(err)
+	}
+	frt := proxied.Fronted("auth_fronted_roundtrip", 10*time.Second)
 	rc := webclient.NewRESTClient(&webclient.Opts{
 		BaseURL: baseURL,
 		OnBeforeRequest: func(client *resty.Client, req *http.Request) error {
 			prepareUserRequest(req, userConfig())
 			return nil
 		},
-		HttpClient: httpClient,
+		HttpClient: &http.Client{
+			Transport: serialTransport{chained, frt},
+			Timeout:   30 * time.Second,
+		},
 		UserConfig: userConfig,
 	})
-
 	return &authClient{rc}
 }
 

internalsdk/pro/pro.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/getlantern/errors"
 	"github.com/getlantern/flashlight/v7/proxied"
@@ -55,22 +56,22 @@ type ProClient interface {
 }
 
 // NewClient creates a new instance of ProClient
-func NewClient(baseURL string, opts *webclient.Opts) ProClient {
-	if opts.HttpClient == nil {
-		// The default http.RoundTripper used by the ProClient is ParallelForIdempotent which
-		// attempts to send requests through both chained and direct fronted routes in parallel
-		// for HEAD and GET requests and ChainedThenFronted for all others.
-		opts.HttpClient = NewHTTPClient(proxied.ParallelForIdempotent(), opts.Timeout)
-	}
-	if opts.OnBeforeRequest == nil {
-		opts.OnBeforeRequest = func(client *resty.Client, req *http.Request) error {
-			prepareProRequest(req, common.ProAPIHost, opts.UserConfig())
-			return nil
-		}
-	}
+func NewClient(baseURL string, userConfig func() common.UserConfig) ProClient {
 	return &proClient{
-		userConfig: opts.UserConfig,
-		RESTClient: webclient.NewRESTClient(opts),
+		userConfig: userConfig,
+		RESTClient: webclient.NewRESTClient(&webclient.Opts{
+			// The default http.RoundTripper used by the ProClient is ParallelForIdempotent which
+			// attempts to send requests through both chained and direct fronted routes in parallel
+			// for HEAD and GET requests and ChainedThenFronted for all others.
+			HttpClient: &http.Client{
+				Transport: proxied.ParallelForIdempotent(),
+				Timeout:   30 * time.Second,
+			},
+			OnBeforeRequest: func(client *resty.Client, req *http.Request) error {
+				prepareProRequest(req, common.ProAPIHost, userConfig())
+				return nil
+			},
+		}),
 	}
 }