@@ -142,7 +142,7 @@ var defaultIdentityProviderResponseParser = func(response IdentityProviderRespon
142142 if expiresOn .Before (time .Now ()) {
143143 return nil , fmt .Errorf ("expires on is in the past" )
144144 }
145- if expiresOn . Sub ( time .Now () ) < MinTokenTTL {
145+ if time .Until ( expiresOn ) < MinTokenTTL {
146146 return nil , fmt .Errorf ("expires on is less than minimum token TTL" )
147147 }
148148 // parse token as jwt token and get claims
@@ -153,7 +153,7 @@ var defaultIdentityProviderResponseParser = func(response IdentityProviderRespon
153153 rawToken ,
154154 expiresOn ,
155155 time .Now ().UTC (),
156- int64 (expiresOn . Sub ( time .Now () ).Seconds ()),
156+ int64 (time .Until ( expiresOn ).Seconds ()),
157157 ), nil
158158}
159159
@@ -309,6 +309,7 @@ func (e *entraidTokenManager) Start(listener TokenListener) (cancelFunc, error)
309309 return
310310 case <- time .After (e .durationToRenewal ()):
311311 // Token is about to expire, refresh it
312+ delay := time .Duration (e .retryOptions .InitialDelayMs ) * time .Millisecond
312313 for i := 0 ; i < e .retryOptions .MaxAttempts ; i ++ {
313314 select {
314315 case <- e .closed :
@@ -325,30 +326,28 @@ func (e *entraidTokenManager) Start(listener TokenListener) (cancelFunc, error)
325326 // check if err is retryable
326327 if e .retryOptions .IsRetryable (err ) {
327328 // retryable error, continue to next attempt
329+ // Exponential backoff
330+ if i == e .retryOptions .MaxAttempts - 1 {
331+ // last attempt, call OnTokenError
332+ listener .OnTokenError (err )
333+ return
334+ }
335+
336+ if delay < time .Duration (e .retryOptions .MaxDelayMs )* time .Millisecond {
337+ delay = time .Duration (float64 (delay ) * e .retryOptions .BackoffMultiplier )
338+ }
339+
340+ time .Sleep (delay )
341+
342+ if delay > time .Duration (e .retryOptions .MaxDelayMs )* time .Millisecond {
343+ delay = time .Duration (e .retryOptions .MaxDelayMs ) * time .Millisecond
344+ }
328345 continue
329346 } else {
330347 // not retryable
331348 listener .OnTokenError (err )
332349 return
333350 }
334-
335- // check if max attempts reached
336- if i == e .retryOptions .MaxAttempts - 1 {
337- listener .OnTokenError (err )
338- return
339- }
340-
341- // Exponential backoff
342- delay := time .Duration (e .retryOptions .InitialDelayMs ) * time .Millisecond
343- if delay < time .Duration (e .retryOptions .MaxDelayMs )* time .Millisecond {
344- delay = time .Duration (float64 (delay ) * e .retryOptions .BackoffMultiplier )
345- }
346-
347- time .Sleep (delay )
348-
349- if delay > time .Duration (e .retryOptions .MaxDelayMs )* time .Millisecond {
350- delay = time .Duration (e .retryOptions .MaxDelayMs ) * time .Millisecond
351- }
352351 }
353352 }
354353 }
0 commit comments