use token instead of authCredentials

Author: ndyakov

credentials.go

@@ -1,27 +1 @@
 package entraid
-
-import (
-	auth "github.com/redis/go-redis/v9/auth"
-)
-
-// authCredentials implements the auth.Credentials interface.
-var _ auth.Credentials = (*authCredentials)(nil)
-
-// authCredentials represents the authentication credentials used to access the Entraid API.
-// It contains the username, password, and raw credentials.
-// The authCredentials struct is used to store the authentication credentials
-type authCredentials struct {
-	username       string
-	password       string
-	rawCredentials string
-}
-
-// BasicAuth returns the username and password for basic authentication.
-func (a *authCredentials) BasicAuth() (username string, password string) {
-	return a.username, a.password
-}
-
-// RawCredentials returns the raw credentials for authentication.
-func (a *authCredentials) RawCredentials() string {
-	return a.rawCredentials
-}

credentials_provider.go

@@ -31,11 +31,7 @@ func (e *entraidCredentialsProvider) onTokenNext(token *Token) {
 	defer e.rwLock.RUnlock()
 	// Notify all listeners with the new token.
 	for _, listener := range e.listeners {
-		listener.OnNext(&authCredentials{
-			username:       token.Username,
-			password:       token.Password,
-			rawCredentials: token.RawToken,
-		})
+		listener.OnNext(token)
 	}
 }
 
@@ -78,15 +74,8 @@ func (e *entraidCredentialsProvider) Subscribe(listener auth.CredentialsListener
 		return nil, nil, err
 	}
 
-	// Create a new credentials object.
-	credentials := &authCredentials{
-		username:       token.Username,
-		password:       token.Password,
-		rawCredentials: token.RawToken,
-	}
-
 	// Notify the listener with the credentials.
-	listener.OnNext(credentials)
+	listener.OnNext(token)
 
 	cancel := func() error {
 		// Remove the listener from the list of listeners.

token.go

@@ -2,6 +2,8 @@ package entraid
 
 import (
 	"time"
+
+	"github.com/redis/go-redis/v9/auth"
 )
 
 // Token represents the authentication token used to access the Entraid API.
@@ -53,6 +55,9 @@ func (t *Token) ExpirationOn() time.Time {
 	return t.expiresOn
 }
 
+// Token implements the auth.Credentials interface.
+var _ auth.Credentials = (*Token)(nil)
+
 // NewToken creates a new token with the specified username, password, raw token, expiration time, received at time, and time to live.
 func NewToken(username, password, rawToken string, expiresOn, receivedAt time.Time, ttl int64) *Token {
 	return &Token{