fix(oauth): GetAccessToken returns *oauth2.Token rather than a token source.

Author: spbsoluble

auth_providers/auth_oauth.go

@@ -441,7 +441,7 @@ func (b *CommandConfigOauth) GetServerConfig() *Server {
 }
 
 // GetAccessToken returns the OAuth2 token source for the given configuration.
-func (b *CommandConfigOauth) GetAccessToken() (oauth2.TokenSource, error) {
+func (b *CommandConfigOauth) GetAccessToken() (*oauth2.Token, error) {
 	if b == nil {
 		return nil, fmt.Errorf("CommandConfigOauth is nil")
 	}
@@ -450,13 +450,11 @@ func (b *CommandConfigOauth) GetAccessToken() (oauth2.TokenSource, error) {
 
 	if b.AccessToken != "" && (b.ClientID == "" || b.ClientSecret == "" || b.TokenURL == "") {
 		log.Printf("[DEBUG] Access token is explicitly set, and no client credentials are provided. Using static token source.")
-		return oauth2.StaticTokenSource(
-			&oauth2.Token{
-				AccessToken: b.AccessToken,
-				TokenType:   DefaultTokenPrefix,
-				Expiry:      b.Expiry,
-			},
-		), nil
+		return &oauth2.Token{
+			AccessToken: b.AccessToken,
+			TokenType:   DefaultTokenPrefix,
+			Expiry:      b.Expiry,
+		}, nil
 	}
 
 	log.Printf("[DEBUG] Getting OAuth2 token source for client ID: %s", b.ClientID)
@@ -492,7 +490,7 @@ func (b *CommandConfigOauth) GetAccessToken() (oauth2.TokenSource, error) {
 		return nil, fmt.Errorf("received empty OAuth token for client ID: %s", b.ClientID)
 	}
 
-	return tokenSource, nil
+	return token, nil
 }
 
 // RoundTrip executes a single HTTP transaction, adding the OAuth2 token to the request

auth_providers/auth_oauth_test.go

@@ -26,7 +26,6 @@ import (
 	"testing"
 
 	"github.com/Keyfactor/keyfactor-auth-client-go/auth_providers"
-	"golang.org/x/oauth2"
 )
 
 func TestOAuthAuthenticator_GetHttpClient(t *testing.T) {
@@ -397,19 +396,8 @@ func authOauthTest(
 					t.FailNow()
 					return
 				}
-				if oauthToken == nil {
-					t.Errorf("oAuth auth test '%s' failed to get token source", testName)
-					t.FailNow()
-					return
-				}
-				var at *oauth2.Token
-				var tkErr error
-				at, tkErr = oauthToken.Token()
-				if tkErr != nil {
-					t.Errorf("oAuth auth test '%s' failed to get token source", testName)
-					t.FailNow()
-				}
-				if at == nil || at.AccessToken == "" {
+
+				if oauthToken == nil || oauthToken.AccessToken == "" {
 					t.Errorf("oAuth auth test '%s' failed to get token source", testName)
 					t.FailNow()
 					return