use go-redis version from commit

Author: ndyakov

.githooks/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+goimports -l -w . # includes go fmt
+golangci-lint run # includes golint, go vet

go.mod

@@ -2,11 +2,9 @@ module github.com/redis-developer/go-redis-entraid
 
 go 1.18
 
-replace github.com/redis/go-redis/v9 => /Users/nedyalko.dyakov/go-redis/
-
 require (
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2
-	github.com/redis/go-redis/v9 v9.7.1
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0-beta.1
+	github.com/redis/go-redis/v9 v9.5.3-0.20250331212737-c248425ade4a
 	github.com/stretchr/testify v1.10.0
 )
 

go.sum

@@ -1,17 +1,15 @@
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0/go.mod h1:XCW7KnZet0Opnr7HccfUw1PLc4CjHqpcaxW8DHklNkQ=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 h1:F0gBpfdPLGsw+nsgk6aqqkZS1jiixa5WwFe3fk/T3Ys=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2/go.mod h1:SqINnQ9lVVdRlyC8cd1lCI0SdX4n2paeABd2K8ggfnE=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.3.2 h1:yz1bePFlP5Vws5+8ez6T3HWXPmwOK7Yvq8QxDBD3SKY=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0-beta.1 h1:iw4+KCeCoieuKodp1d5YhAa1TU/GgogCbw8RbGvsfLA=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0-beta.1/go.mod h1:AP8cDnDTGIVvayqKAhwzpcAyTJosXpvLYNmVFJb98x8=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache v0.2.3 h1:BAUsn6/icUFtvUalVwCO0+hSF7qgU9DwwcEfCvtILtw=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 h1:ywEEhmNahHBihViHepv3xPBn1663uRv2t2q/ESv9seY=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0/go.mod h1:iZDifYGJTIgIIkYRNWPENUnqx6bJ2xnSDFI2tjwZNuY=
 github.com/AzureAD/microsoft-authentication-extensions-for-go/cache v0.1.1 h1:WJTmL004Abzc5wDB5VtZG2PJk5ndYDgVacGqfirKxjM=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.4.1 h1:8BKxhZZLX/WosEeoCvWysmKUscfa9v8LIPEEU0JjE2o=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.4.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -25,6 +23,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/redis/go-redis/v9 v9.5.3-0.20250331212737-c248425ade4a h1:R5xgk8m+CF7lVE0EGr+tLkT1eM3Zfd39BJfnANQqpKA=
+github.com/redis/go-redis/v9 v9.5.3-0.20250331212737-c248425ade4a/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=

install-git-hook.sh

@@ -0,0 +1,2 @@
+chmod ug+x ./.githooks/*
+git config core.hooksPath ./.githooks

token.go

@@ -13,17 +13,17 @@ import (
 // The token is valid for a limited time and must be refreshed periodically.
 type Token struct {
 	// username is the username of the user.
-	username string `json:"username"`
+	username string
 	// password is the password of the user.
-	password string `json:"password"`
+	password string
 	// expiresOn is the expiration time of the token.
-	expiresOn time.Time `json:"expires_on"`
+	expiresOn time.Time
 	// ttl is the time to live of the token.
-	ttl int64 `json:"ttl"`
+	ttl int64
 	// rawToken is the authentication token.
-	rawToken string `json:"raw_token"`
+	rawToken string
 	// receivedAt is the time when the token was received.
-	receivedAt time.Time `json:"received_at"`
+	receivedAt time.Time
 }
 
 // BasicAuth returns the username and password for basic authentication.

token_manager.go

@@ -142,7 +142,7 @@ var defaultIdentityProviderResponseParser = func(response IdentityProviderRespon
 	if expiresOn.Before(time.Now()) {
 		return nil, fmt.Errorf("expires on is in the past")
 	}
-	if expiresOn.Sub(time.Now()) < MinTokenTTL {
+	if time.Until(expiresOn) < MinTokenTTL {
 		return nil, fmt.Errorf("expires on is less than minimum token TTL")
 	}
 	// parse token as jwt token and get claims
@@ -153,7 +153,7 @@ var defaultIdentityProviderResponseParser = func(response IdentityProviderRespon
 		rawToken,
 		expiresOn,
 		time.Now().UTC(),
-		int64(expiresOn.Sub(time.Now()).Seconds()),
+		int64(time.Until(expiresOn).Seconds()),
 	), nil
 }
 
@@ -309,6 +309,7 @@ func (e *entraidTokenManager) Start(listener TokenListener) (cancelFunc, error)
 				return
 			case <-time.After(e.durationToRenewal()):
 				// Token is about to expire, refresh it
+				delay := time.Duration(e.retryOptions.InitialDelayMs) * time.Millisecond
 				for i := 0; i < e.retryOptions.MaxAttempts; i++ {
 					select {
 					case <-e.closed:
@@ -325,30 +326,28 @@ func (e *entraidTokenManager) Start(listener TokenListener) (cancelFunc, error)
 					// check if err is retryable
 					if e.retryOptions.IsRetryable(err) {
 						// retryable error, continue to next attempt
+						// Exponential backoff
+						if i == e.retryOptions.MaxAttempts-1 {
+							// last attempt, call OnTokenError
+							listener.OnTokenError(err)
+							return
+						}
+
+						if delay < time.Duration(e.retryOptions.MaxDelayMs)*time.Millisecond {
+							delay = time.Duration(float64(delay) * e.retryOptions.BackoffMultiplier)
+						}
+
+						time.Sleep(delay)
+
+						if delay > time.Duration(e.retryOptions.MaxDelayMs)*time.Millisecond {
+							delay = time.Duration(e.retryOptions.MaxDelayMs) * time.Millisecond
+						}
 						continue
 					} else {
 						// not retryable
 						listener.OnTokenError(err)
 						return
 					}
-
-					// check if max attempts reached
-					if i == e.retryOptions.MaxAttempts-1 {
-						listener.OnTokenError(err)
-						return
-					}
-
-					// Exponential backoff
-					delay := time.Duration(e.retryOptions.InitialDelayMs) * time.Millisecond
-					if delay < time.Duration(e.retryOptions.MaxDelayMs)*time.Millisecond {
-						delay = time.Duration(float64(delay) * e.retryOptions.BackoffMultiplier)
-					}
-
-					time.Sleep(delay)
-
-					if delay > time.Duration(e.retryOptions.MaxDelayMs)*time.Millisecond {
-						delay = time.Duration(e.retryOptions.MaxDelayMs) * time.Millisecond
-					}
 				}
 			}
 		}