return custom error from authz roundtripper

getsavvyinc · Jan 15, 2025 · 35163f1 · 35163f1
1 parent a1f0e1c
commit 35163f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/authz/roundtripper.go b/authz/roundtripper.go
@@ -6,15  6,20 @@ import (
 	"net/http"
 )
 
-var ErrInvalidClient = errors.New("invalid client")
 var ErrInvalidAuthzClient = errors.New("invalid authz client")
 
 type AuthorizedRoundTripper struct {
 	token        string
 	savvyVersion string
 	// wrap error returned by RoundTrip
 	wrapErr error
 }
 
-func NewRoundTripper(token, savvyVersion string) *AuthorizedRoundTripper {
-	return &AuthorizedRoundTripper{token: token, savvyVersion: savvyVersion}
 // NewRoundTripper returns a new AuthorizedRoundTripper
 //
 // Caller must provide non nil err to wrap the error returned by RoundTrip
 func NewRoundTripper(token, savvyVersion string, err error) *AuthorizedRoundTripper {
 	return &AuthorizedRoundTripper{token: token, savvyVersion: savvyVersion, wrapErr: err}
 }
 
 func (a *AuthorizedRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
@@ -26,14  31,14 @@ func (a *AuthorizedRoundTripper) RoundTrip(req *http.Request) (*http.Response, e
 	// Use the embedded Transport to perform the actual request
 	res, err := http.DefaultTransport.RoundTrip(clonedReq)
 	if err != nil {
-		err = fmt.Errorf("%w: %v", ErrInvalidClient, err)
 		err = fmt.Errorf("%w: %v", a.wrapErr, err)
 		return nil, err
 	}
 
 	// If we get a 401 Unauthorized, then the token is expired
 	// and we need to refresh it
 	if res.StatusCode == http.StatusUnauthorized {
-		return nil, fmt.Errorf("%w: invalid token", ErrInvalidClient)
 		return nil, fmt.Errorf("%w: invalid token", a.wrapErr)
 	}
 	return res, err
 }
diff --git a/client/client.go b/client/client.go
@@ -89,7  89,7 @@ func New() (Client, error) {
 	}
 
 	cl := &http.Client{
-		Transport: authz.NewRoundTripper(cfg.Token, config.Version()),
 		Transport: authz.NewRoundTripper(cfg.Token, config.Version(), ErrInvalidClient),
 	}
 
 	c := &client{