ctreminiom
diff --git a/‎README.md‎
Lines changed: 463 additions & 263 deletions b/‎README.md‎
Lines changed: 463 additions & 263 deletions
diff --git a/‎admin/api_client_impl.go‎
Lines changed: 109 additions & 2 deletions b/‎admin/api_client_impl.go‎
Lines changed: 109 additions & 2 deletions
diff --git a/‎assets/api_client_impl.go‎
Lines changed: 113 additions & 1 deletion b/‎assets/api_client_impl.go‎
Lines changed: 113 additions & 1 deletion
@@ -11,14 +11,112 @@ import (
 
 	"github.com/ctreminiom/go-atlassian/v2/admin/internal"
 	model "github.com/ctreminiom/go-atlassian/v2/pkg/infra/models"
+	"github.com/ctreminiom/go-atlassian/v2/pkg/infra/oauth2"
 	"github.com/ctreminiom/go-atlassian/v2/service/common"
 )
 
 const defaultAPIEndpoint = "https://api.atlassian.com/"
 
+// ClientOption is a function that configures a Client
+type ClientOption func(*Client) error
+
+// WithOAuth configures the client with OAuth 2.0 support
+func WithOAuth(config *common.OAuth2Config) ClientOption {
+	return func(c *Client) error {
+		if config == nil {
+			return fmt.Errorf("oauth config cannot be nil")
+		}
+		
+		oauthService, err := oauth2.NewOAuth2Service(c.HTTP, config)
+		if err != nil {
+			return fmt.Errorf("failed to create OAuth service: %w", err)
+		}
+		
+		c.OAuth = oauthService
+		return nil
+	}
+}
+
+// WithAutoRenewalToken enables automatic OAuth token renewal with the provided token.
+// This option requires WithOAuth to be configured first or used together.
+func WithAutoRenewalToken(token *common.OAuth2Token) ClientOption {
+	return func(c *Client) error {
+		if token == nil {
+			return fmt.Errorf("token cannot be nil for auto-renewal")
+		}
+		
+		if c.OAuth == nil {
+			return fmt.Errorf("OAuth must be configured before enabling auto-renewal (use WithOAuth first)")
+		}
+		
+		// Create token sources with storage support if configured
+		_, reuseSource, err := oauth2.SetupTokenSourcesWithStorage(
+			context.Background(),
+			token,
+			c.OAuth,
+			c.HTTP,
+		)
+		if err != nil {
+			return fmt.Errorf("failed to setup token sources: %w", err)
+		}
+		
+		// Extract base transport and restore original HTTP client if wrapped
+		base := oauth2.ExtractBaseTransport(c.HTTP)
+		if wrapper, ok := oauth2.ExtractWrapper(c.HTTP); ok {
+			c.HTTP = wrapper.OriginalClient
+		}
+		
+		// Create OAuth transport
+		c.HTTP = oauth2.CreateOAuthTransport(reuseSource, base, c.Auth)
+		
+		// Set initial token
+		c.Auth.SetBearerToken(token.AccessToken)
+		
+		return nil
+	}
+}
+
+// WithOAuthWithAutoRenewal is a convenience option that combines WithOAuth and WithAutoRenewalToken.
+// It configures OAuth support and enables automatic token renewal in one step.
+func WithOAuthWithAutoRenewal(config *common.OAuth2Config, token *common.OAuth2Token) ClientOption {
+	return func(c *Client) error {
+		// First configure OAuth
+		if err := WithOAuth(config)(c); err != nil {
+			return err
+		}
+		
+		// Then enable auto-renewal
+		return WithAutoRenewalToken(token)(c)
+	}
+}
+
+// WithTokenStore configures the client to use external token storage
+func WithTokenStore(store oauth2.TokenStore) ClientOption {
+	return func(c *Client) error {
+		if store == nil {
+			return fmt.Errorf("token store cannot be nil")
+		}
+		
+		c.HTTP = oauth2.WrapHTTPClient(c.HTTP).WithStore(store)
+		return nil
+	}
+}
+
+// WithTokenCallback configures the client to use a callback for token refresh events
+func WithTokenCallback(callback oauth2.TokenCallback) ClientOption {
+	return func(c *Client) error {
+		if callback == nil {
+			return fmt.Errorf("token callback cannot be nil")
+		}
+		
+		c.HTTP = oauth2.WrapHTTPClient(c.HTTP).WithCallback(callback)
+		return nil
+	}
+}
+
 // New creates a new instance of Client.
-// It takes a common.HTTPClient as input and returns a pointer to Client and an error.
-func New(httpClient common.HTTPClient) (*Client, error) {
+// It takes a common.HTTPClient and optional configuration options as input and returns a pointer to Client and an error.
+func New(httpClient common.HTTPClient, options ...ClientOption) (*Client, error) {
 
 	// If no HTTP client is provided, use the default HTTP client.
 	if httpClient == nil {
@@ -56,6 +154,13 @@ func New(httpClient common.HTTPClient) (*Client, error) {
 	// Initialize the User service with a user token service.
 	client.User = internal.NewUserService(client, internal.NewUserTokenService(client))
 
+	// Apply client options
+	for _, option := range options {
+		if err := option(client); err != nil {
+			return nil, err
+		}
+	}
+
 	return client, nil
 }
 
@@ -67,6 +172,8 @@ type Client struct {
 	Site *url.URL
 	// Auth is the authentication service.
 	Auth common.Authentication
+	// OAuth is the OAuth 2.0 service.
+	OAuth common.OAuth2Service
 	// Organization is the service for organization-related operations.
 	Organization *internal.OrganizationService
 	// User is the service for user-related operations.
 
@@ -11,14 +11,112 @@ import (
 
 	"github.com/ctreminiom/go-atlassian/v2/assets/internal"
 	model "github.com/ctreminiom/go-atlassian/v2/pkg/infra/models"
+	"github.com/ctreminiom/go-atlassian/v2/pkg/infra/oauth2"
 	"github.com/ctreminiom/go-atlassian/v2/service/common"
 )
 
 const DefaultAssetsSite = "https://api.atlassian.com/"
 
+// ClientOption is a function that configures a Client
+type ClientOption func(*Client) error
+
+// WithOAuth configures the client with OAuth 2.0 support
+func WithOAuth(config *common.OAuth2Config) ClientOption {
+	return func(c *Client) error {
+		if config == nil {
+			return fmt.Errorf("oauth config cannot be nil")
+		}
+		
+		oauthService, err := oauth2.NewOAuth2Service(c.HTTP, config)
+		if err != nil {
+			return fmt.Errorf("failed to create OAuth service: %w", err)
+		}
+		
+		c.OAuth = oauthService
+		return nil
+	}
+}
+
+// WithAutoRenewalToken enables automatic OAuth token renewal with the provided token.
+// This option requires WithOAuth to be configured first or used together.
+func WithAutoRenewalToken(token *common.OAuth2Token) ClientOption {
+	return func(c *Client) error {
+		if token == nil {
+			return fmt.Errorf("token cannot be nil for auto-renewal")
+		}
+		
+		if c.OAuth == nil {
+			return fmt.Errorf("OAuth must be configured before enabling auto-renewal (use WithOAuth first)")
+		}
+		
+		// Create token sources with storage support if configured
+		_, reuseSource, err := oauth2.SetupTokenSourcesWithStorage(
+			context.Background(),
+			token,
+			c.OAuth,
+			c.HTTP,
+		)
+		if err != nil {
+			return fmt.Errorf("failed to setup token sources: %w", err)
+		}
+
+		// Extract base transport and restore original HTTP client if wrapped
+		base := oauth2.ExtractBaseTransport(c.HTTP)
+		if wrapper, ok := oauth2.ExtractWrapper(c.HTTP); ok {
+			c.HTTP = wrapper.OriginalClient
+		}
+
+		// Create OAuth transport
+		c.HTTP = oauth2.CreateOAuthTransport(reuseSource, base, c.Auth)
+		
+		// Set initial token
+		c.Auth.SetBearerToken(token.AccessToken)
+		
+		return nil
+	}
+}
+
+// WithOAuthWithAutoRenewal is a convenience option that combines WithOAuth and WithAutoRenewalToken.
+// It configures OAuth support and enables automatic token renewal in one step.
+func WithOAuthWithAutoRenewal(config *common.OAuth2Config, token *common.OAuth2Token) ClientOption {
+	return func(c *Client) error {
+		// First configure OAuth
+		if err := WithOAuth(config)(c); err != nil {
+			return err
+		}
+		
+		// Then enable auto-renewal
+		return WithAutoRenewalToken(token)(c)
+	}
+}
+
+// WithTokenStore configures the client to use external token storage
+func WithTokenStore(store oauth2.TokenStore) ClientOption {
+	return func(c *Client) error {
+		if store == nil {
+			return fmt.Errorf("token store cannot be nil")
+		}
+		
+		c.HTTP = oauth2.WrapHTTPClient(c.HTTP).WithStore(store)
+		return nil
+	}
+}
+
+// WithTokenCallback configures the client to use a callback for token refresh events
+func WithTokenCallback(callback oauth2.TokenCallback) ClientOption {
+	return func(c *Client) error {
+		if callback == nil {
+			return fmt.Errorf("token callback cannot be nil")
+		}
+		
+		c.HTTP = oauth2.WrapHTTPClient(c.HTTP).WithCallback(callback)
+		return nil
+	}
+}
+
 // New creates a new instance of Client.
 // It takes a common.HTTPClient and a site URL as inputs and returns a pointer to Client and an error.
-func New(httpClient common.HTTPClient, site string) (*Client, error) {
+func New(httpClient common.HTTPClient, site string, options ...ClientOption) (*Client, error) {
 
 	// If no HTTP client is provided, use the default HTTP client.
 	if httpClient == nil {
@@ -53,6 +151,13 @@ func New(httpClient common.HTTPClient, site string) (*Client, error) {
 	client.ObjectType = internal.NewObjectTypeService(client)
 	client.ObjectTypeAttribute = internal.NewObjectTypeAttributeService(client)
 
+	// Apply client options
+	for _, option := range options {
+		if err := option(client); err != nil {
+			return nil, err
+		}
+	}
+
 	return client, nil
 }
 
@@ -64,6 +169,8 @@ type Client struct {
 	Site *url.URL
 	// Auth is the authentication service.
 	Auth common.Authentication
+	// OAuth is the OAuth 2.0 service.
+	OAuth common.OAuth2Service
 	// AQL is the service for AQL-related operations.
 	AQL *internal.AQLService
 	// Icon is the service for icon-related operations.
@@ -120,6 +227,11 @@ func (c *Client) NewRequest(ctx context.Context, method, urlStr, contentType str
 		req.SetBasicAuth(c.Auth.GetBasicAuth())
 	}
 
+	// Add the Bearer token if available and not using Basic Auth.
+	if c.Auth.GetBearerToken() != "" && !c.Auth.HasBasicAuth() {
+		req.Header.Add("Authorization", fmt.Sprintf("Bearer %v", c.Auth.GetBearerToken()))
+	}
+
 	// Set the User-Agent header if available.
 	if c.Auth.HasUserAgent() {
 		req.Header.Set("User-Agent", c.Auth.GetUserAgent())