Make http client to not use resolver if request path is absolute.

Refactored custom token granter interface.

Renamed tenancy loader's fx annotation name.

Author: TimShi

pkg/integrate/httpclient/client.go

@@ -21,12 +21,15 @@ import (
 	"errors"
 	"fmt"
 	"github.com/cisco-open/go-lanai/pkg/discovery"
+	"github.com/cisco-open/go-lanai/pkg/utils"
 	"github.com/cisco-open/go-lanai/pkg/utils/order"
+	"net/url"
 	"time"
 )
 
 var (
 	insecureInstanceMatcher = discovery.InstanceWithTagKV("secure", "false", true)
+	supportedSchemes        = utils.NewStringSet("http", "https")
 )
 
 type clientDefaults struct {
@@ -105,17 +108,6 @@ func (c *client) WithBaseUrl(baseUrl string) (Client, error) {
 	return cp.WithConfig(defaultExtHostConfig()), nil
 }
 
-func (c *client) WithNoTargetResolver() (Client, error) {
-	endpointer, e := NewNoOpTargetResolver()
-	if e != nil {
-		return nil, NewNoEndpointFoundError(fmt.Errorf("cannot create client"), e)
-	}
-
-	cp := c.shallowCopy()
-	cp.resolver = endpointer
-	return cp.WithConfig(defaultExtHostConfig()), nil
-}
-
 func (c *client) WithConfig(config *ClientConfig) Client {
 	mergeConfig(config, c.config)
 	cp := c.shallowCopy()
@@ -214,9 +206,13 @@ func (c *client) shallowCopy() *client {
 
 func (c *client) executor(request *Request, resolver TargetResolver, dec DecodeResponseFunc) Retryable {
 	return func(ctx context.Context) (interface{}, error) {
-		target, e := resolver.Resolve(ctx, request)
-		if e != nil {
-			return nil, e
+		target, e := url.Parse(request.Path)
+		// only need to resolve the target if the request.Path is not absolute
+		if e != nil || !supportedSchemes.Has(target.Scheme) {
+			target, e = resolver.Resolve(ctx, request)
+			if e != nil {
+				return nil, e
+			}
 		}
 
 		req, e := request.CreateFunc(ctx, request.Method, target)

pkg/integrate/httpclient/client_test.go

@@ -394,8 +394,7 @@ func SubTestWithURLEncoded(di *TestDI) test.GomegaSubTestFunc {
 
 func SubTestWithAbsoluteUrl(di *TestDI) test.GomegaSubTestFunc {
 	return func(ctx context.Context, t *testing.T, g *gomega.WithT) {
-		client, e := di.HttpClient.WithNoTargetResolver()
-		g.Expect(e).To(Succeed(), "client without target resolver should be available")
+		client := di.HttpClient
 
 		random := utils.RandomString(20)
 		now := time.Now().Format(time.RFC3339)

pkg/integrate/httpclient/context.go

@@ -44,10 +44,7 @@ type Client interface {
 	// The returned client is responsible to perform retrying.
 	// The returned client is goroutine-safe and can be reused
 	WithBaseUrl(baseUrl string) (Client, error)
-
-	// WithNoTargetResolver expects the request to contain the absolute url
-	WithNoTargetResolver() (Client, error)
-
+	
 	// WithConfig create a shallow copy of the client with specified config.
 	// Service (with LB) or BaseURL cannot be changed with this method.
 	// If any field of provided config is zero value, this value is not applied.

pkg/integrate/httpclient/resolver_static.go

@@ -24,10 +24,3 @@ func NewStaticTargetResolver(baseUrl string) (TargetResolverFunc, error) {
 		return &uri, nil
 	}, nil
 }
-
-func NewNoOpTargetResolver() (TargetResolverFunc, error) {
-	return func(ctx context.Context, req *Request) (*url.URL, error) {
-		uri, e := url.Parse(req.Path)
-		return uri, e
-	}, nil
-}

pkg/security/config/authserver/config.go

@@ -270,10 +270,8 @@ func (c *Configuration) tokenGranter() auth.TokenGranter {
 
 		for _, custom := range c.CustomTokenGranter {
 			switch v := custom.(type) {
-			case auth.CustomizableTokenGranter:
-				v.Customize(func(o *auth.TokenGranterOption) {
-					o.AuthService = c.authorizationService()
-				})
+			case auth.AuthorizationServiceInjector:
+				v.Inject(c.authorizationService())
 			default:
 				// do nothing
 			}

pkg/security/config/testdata/custom_token_granter.go

@@ -36,6 +36,10 @@ type CustomTokenGranter struct {
 	authService auth.AuthorizationService
 }
 
+func (c *CustomTokenGranter) Inject(authService auth.AuthorizationService) {
+	c.authService = authService
+}
+
 func NewCustomTokenGranter() auth.TokenGranter {
 	return &CustomTokenGranter{}
 }
@@ -61,11 +65,3 @@ func (c *CustomTokenGranter) Grant(ctx context.Context, request *auth.TokenReque
 	})
 	return c.authService.CreateAccessToken(ctx, oauth)
 }
-
-func (c *CustomTokenGranter) Customize(options ...func(o *auth.TokenGranterOption)) {
-	config := &auth.TokenGranterOption{}
-	for _, opt := range options {
-		opt(config)
-	}
-	c.authService = config.AuthService
-}

pkg/security/oauth2/auth/granter.go

@@ -31,12 +31,8 @@ type TokenGranter interface {
 	Grant(ctx context.Context, request *TokenRequest) (oauth2.AccessToken, error)
 }
 
-type TokenGranterOption struct {
-	AuthService AuthorizationService
-}
-
-type CustomizableTokenGranter interface {
-	Customize(options ...func(o *TokenGranterOption))
+type AuthorizationServiceInjector interface {
+	Inject(authService AuthorizationService)
 }
 
 // CompositeTokenGranter implements TokenGranter

pkg/tenancy/loader/loader_test.go

@@ -83,7 +83,7 @@ func TestMain(m *testing.M) {
 type testDI struct {
 	fx.In
 	DB              *gorm.DB `optional:"true"`
-	InternalLoader  Loader   `name:"tenant_hierarchy/loader"`
+	InternalLoader  Loader   `name:"tenant-hierarchy/loader"`
 	ClientFactory   redis.ClientFactory
 	AppCtx          *bootstrap.ApplicationContext
 	TestTenantStore *TestTenantStore

pkg/tenancy/loader/package.go

@@ -38,7 +38,7 @@ var Module = &bootstrap.Module{
 }
 
 const (
-	fxNameLoader = "tenant_hierarchy/loader"
+	fxNameLoader = "tenant-hierarchy/loader"
 )
 
 func Use() {
@@ -81,7 +81,7 @@ func provideLoader(di loaderDI) Loader {
 type initDi struct {
 	fx.In
 	AppCtx          *bootstrap.ApplicationContext
-	EffectiveLoader Loader `name:"tenant_hierarchy/loader"`
+	EffectiveLoader Loader `name:"tenant-hierarchy/loader"`
 }
 
 func initializeTenantHierarchy(di initDi) error {