Skip to content

Add token refresh grace period #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mjcmtb merged 6 commits into from
Sep 23, 2024
Merged

Add token refresh grace period #54

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0fcd584
Add token within expiry grace period check
mjcmtb Sep 16, 2024
112f5ea
Migrate WithinGracePeriod
mjcmtb Sep 17, 2024
49e3237
Deassociate
mjcmtb Sep 17, 2024
8e9a56f
Not
mjcmtb Sep 17, 2024
05e651a
Unexport
mjcmtb Sep 18, 2024
8bd9ccf
Unexport var
mjcmtb Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion tokencache/cache_token_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@ package tokencache
import (
"context"
"fmt"
"time"

"github.com/pardot/oidc"
)

const (
tokenExpirationGracePeriod = time.Duration(30 * time.Second)
)

type cachingTokenSource struct {
src oidc.TokenSource
cache CredentialCache
Expand Down Expand Up @@ -87,7 +92,7 @@ func (c *cachingTokenSource) Token(ctx context.Context) (*oidc.Token, error) {
}

var newToken *oidc.Token
if token != nil && token.Valid() {
if token != nil && token.Valid() && !tokenWithinGracePeriod(token) {
return token, nil
} else if token != nil && token.RefreshToken != "" {
// we have an expired token, try and refresh if we can.
Expand All @@ -114,3 +119,8 @@ func (c *cachingTokenSource) Token(ctx context.Context) (*oidc.Token, error) {

return newToken, nil
}

func tokenWithinGracePeriod(token *oidc.Token) bool {
gracePeriodStart := token.Claims.Expiry.Time().Add(-tokenExpirationGracePeriod)
return gracePeriodStart.Before(time.Now()) && token.Valid()
}
Loading