Removed redirect, changed to a settable func. http client has a default setting anyway.

Author: thejoeker12

httpclient/client.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/deploymenttheory/go-api-http-client/concurrency"
-	"github.com/deploymenttheory/go-api-http-client/redirect"
 	"go.uber.org/zap"
 )
 
@@ -68,7 +67,7 @@ type ClientConfig struct {
 
 	// EnableCustomRedirectLogic allows the client to follow redirections when they're returned from a request.
 	// Toggleable for debug reasons only
-	EnableCustomRedirectLogic bool `json:"follow_redirects"`
+	CustomRedirectPolicy *func(req *http.Request, via []*http.Request) error
 
 	// MaxRedirects is the maximum amount of redirects the client will follow before throwing an error.
 	MaxRedirects int `json:"max_redirects"`
@@ -109,9 +108,8 @@ func (c *ClientConfig) Build() (*Client, error) {
 		Timeout: c.CustomTimeout,
 	}
 
-	// TODO refactor redirects
-	if c.EnableCustomRedirectLogic {
-		redirect.SetCustomRedirect(httpClient, c.MaxRedirects, c.Sugar)
+	if c.CustomRedirectPolicy != nil {
+		httpClient.CheckRedirect = *c.CustomRedirectPolicy
 	}
 
 	// TODO refactor concurrency

httpclient/config_validation.go

@@ -26,8 +26,6 @@ const (
 	DefaultCustomTimeout               = 5 * time.Second
 	DefaultTokenRefreshBufferPeriod    = 2 * time.Minute
 	DefaultTotalRetryDuration          = 5 * time.Minute
-	DefaultCustomRedirects             = true
-	DefaultMaxRedirects                = 5
 	DefaultEnableConcurrencyManagement = false
 )
 
@@ -71,8 +69,6 @@ func LoadConfigFromEnv() (*ClientConfig, error) {
 		CustomTimeout:               getEnvAsDuration("CUSTOM_TIMEOUT", DefaultCustomTimeout),
 		TokenRefreshBufferPeriod:    getEnvAsDuration("TOKEN_REFRESH_BUFFER_PERIOD", DefaultTokenRefreshBufferPeriod),
 		TotalRetryDuration:          getEnvAsDuration("TOTAL_RETRY_DURATION", DefaultTotalRetryDuration),
-		EnableCustomRedirectLogic:   getEnvAsBool("CUSTOM_REDIRECTS", DefaultCustomRedirects),
-		MaxRedirects:                getEnvAsInt("MAX_REDIRECTS", DefaultMaxRedirects),
 		EnableConcurrencyManagement: getEnvAsBool("ENABLE_CONCURRENCY_MANAGEMENT", DefaultEnableConcurrencyManagement),
 	}
 
@@ -134,12 +130,6 @@ func (c ClientConfig) validateClientConfig() error {
 
 	}
 
-	if c.EnableCustomRedirectLogic {
-		if DefaultMaxRedirects < 1 {
-			return errors.New("max redirects cannot be less than 1")
-		}
-	}
-
 	return nil
 }
 
@@ -152,7 +142,5 @@ func (c *ClientConfig) SetDefaultValuesClientConfig() {
 	setDefaultDuration(&c.CustomTimeout, DefaultCustomTimeout)
 	setDefaultDuration(&c.TokenRefreshBufferPeriod, DefaultTokenRefreshBufferPeriod)
 	setDefaultDuration(&c.TotalRetryDuration, DefaultTotalRetryDuration)
-	setDefaultBool(&c.EnableCustomRedirectLogic, DefaultCustomRedirects)
-	setDefaultInt(&c.MaxRedirects, DefaultMaxRedirects, 0)
 	setDefaultBool(&c.EnableConcurrencyManagement, DefaultEnableConcurrencyManagement)
 }